Commit Graph

5637 Commits

Author SHA1 Message Date
Slic3rPE
247b9bb38f Fixed Command character on OSX in ImGUI 2020-03-19 16:10:16 +01:00
enricoturri1966
7e1189ce92 Fixed tooltip reappering after leaving imgui dialog 2020-03-19 15:12:18 +01:00
enricoturri1966
ad3a504a3f Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-19 14:06:49 +01:00
enricoturri1966
a6d47d15fd Modified mouse events handling for gizmobar
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip

The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
bubnikv
c31c9bd32b ImGUI characters for OSX keyboard keyboard modifiers are only contained
in the CJK fonts, not in the regular fonts. Load them from CJK fonts
even for non CJK languages.
2020-03-19 13:32:34 +01:00
bubnikv
2ba86fcc2b Fixing spurious deselection of objects when switching from 3d path
preview to plater using the bottom tool bar & left mouse click.
This is result of the recent commits refactoring the mouse focus
over toolbars handling. 739d8131ab
2020-03-19 12:39:25 +01:00
Lukas Matena
3549c9c884 WIP 2020-03-19 12:04:05 +01:00
Lukas Matena
350e50bcff WIP: FDM supports gizmo now works with multiple part objects into some extent 2020-03-19 11:15:17 +01:00
Lukas Matena
6ad80a60ae WIP: FDM gizmo: triangles not facing the camera are no more selected with fdm selection tool 2020-03-19 11:15:17 +01:00
Lukas Matena
2e20e029e8 WIP: Optimized the triangle selection so it does not iterate over all the triangles 2020-03-19 11:15:17 +01:00
Lukas Matena
744927413b WIP: Added a circle cursor and naive logic to select triangles inside
Deselection is possible when holding shift
Triangles obscured by the mesh are selected nonetheless (so far)
2020-03-19 11:15:17 +01:00
Lukas Matena
1ef8886391 WIP: First working implementation of the triangle selector for the FDM support gizmo 2020-03-19 11:15:17 +01:00
Lukas Matena
264e8522d1 WIP: Duplicated the SLA gizmo for the FDM, removed what was not needed
Clipping plane and the m_model_object pointer keeping was duplicated
2020-03-19 11:15:17 +01:00
Enrico Turri
df8360fe34 Added readme.md file for imgui 2020-03-19 10:43:48 +01:00
bubnikv
a56d48b277 Adding special OS characters for keyboard shortcuts to ImGUI font map. 2020-03-19 09:52:24 +01:00
enricoturri1966
cf53ca27cb Modified mouse events handling for toolbar
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
bubnikv
90df0aa04a Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:28:54 +01:00
bubnikv
262cc4aea9 Hiding the tooltip when the window gets deactivated and reactivated. 2020-03-18 14:28:43 +01:00
enricoturri1966
5260158e92 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:27:02 +01:00
enricoturri1966
1dc94927a9 Fixed conflicts after merge with master 2020-03-18 14:26:44 +01:00
enricoturri1966
5cbafd9fcc Canvas tooltip constrained inside canvas 2020-03-18 14:13:50 +01:00
Lukas Matena
8f219e8e81 Tooltips are rendered unformatted so percent signs in them do not break rendering 2020-03-18 13:50:08 +01:00
enricoturri1966
bbd5c00ea2 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 13:36:01 +01:00
enricoturri1966
5e58272af1 Refactoring 2020-03-18 13:35:46 +01:00
bubnikv
9dedecbecd Suppress tooltips when the mouse is processed by an ImGUI dialog. 2020-03-18 13:23:07 +01:00
enricoturri1966
6d9ec8f7a1 Fixed interference between tooltips and imgui dialogs 2020-03-18 10:46:46 +01:00
enricoturri1966
4053084fac #3858 - Added missing reset for fan speed visualization 2020-03-18 08:10:05 +01:00
enricoturri1966
ce896e7ca7 Attempt to fix build on Linux 2020-03-17 15:47:49 +01:00
enricoturri1966
a4c476c97a Initial delay for ImGUI-based tooltip 2020-03-17 14:35:56 +01:00
enricoturri1966
57526d5fd3 Canvas' tooltip using ImGUI 2020-03-17 13:01:38 +01:00
enricoturri1966
0700dc5cff Attempt to fix gizmos tooltip on Mac 2020-03-17 11:02:32 +01:00
bubnikv
1e141fb7c0 Fix of Wipe to Infill causes severe overextrusion (thicker walls & infill) (#3842)
Regressinon in regard to PrusaSlicer 2.2.1 due to Vojtech's refactorings
for efficiency.
2020-03-17 09:41:54 +01:00
enricoturri1966
566ec6d9bd Fixed gizmos' tooltips 2020-03-17 09:41:54 +01:00
enricoturri1966
2c4b61acd9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-17 07:59:10 +01:00
YuSanka
254814d6e5 Fix of #3303
+ Fixed wrong update of selection in object and scene, when change selection in ObjectList after editing of values in Height range modifiers.
Repro:
 1. Add 2 objects
 2. Add Height range modifiers for one of them
 3. Select range
 4. Edit some of values
 5. Select other object.

Expected behavior:
 1. Edited value is saved
 2. New object is selected in object list and on the 3D scene_selection

Real behavior:
 1. New object is selected in object list and on the 3D scene_selection
 But:
 2. Every next selection in object list has no update on the scene or "temporary" panel
 3. Selection from the scene updates selection in ObjectList
 But:
 4. Next editing of layer range and press "Enter" causes a crash
2020-03-16 21:32:48 +01:00
enricoturri1966
17d79211b3 Generate gizmos' tooltip on demand 2020-03-16 16:37:22 +01:00
tamasmeszaros
4f5033fead Fix arrangement with items larger or equal to bed dimesions.
fixes #2897 
fixes #1186
2020-03-16 14:37:54 +01:00
bubnikv
84c1c019e1 Revert "#3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview"
It is too late before 2.2.0-final.

This reverts commit 350a85cf43.
2020-03-16 14:25:05 +01:00
enricoturri1966
1e23a9bbb0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-16 14:19:30 +01:00
enricoturri1966
373ce3d849 ENABLE_SLOPE_RENDERING - Do not apply slope shading to modifiers and small refactoring 2020-03-16 14:17:19 +01:00
enricoturri1966
ecc94a0534 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-16 13:35:15 +01:00
enricoturri1966
c665354c70 #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview 2020-03-16 13:34:53 +01:00
YuSanka
f9bea22a0a Sidebar can be hidden/shown from menu "View/Collapse sidebar" 2020-03-16 12:51:55 +01:00
enricoturri1966
0eb46d09b9 Fixed gizmos' tooltips 2020-03-16 12:45:39 +01:00
bubnikv
87d08eb85c Fix of
"Print settings reloaded with 0.05 layer and fill percentage changed
after click on modified profile #3755"

Combo box callback was not removing the "(modified)" suffix.
2020-03-16 09:57:20 +01:00
enricoturri1966
abfbcd5d17 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
bubnikv
763f8e3fd6 Updated the "Remove user profiles" message at the install wizard to
indicate that it does nothing to user profiles.
2020-03-15 12:19:56 +01:00
bubnikv
5aeadfb026 The import of system profiles was improved to not inherit
the "renamed_from" field as it is specific to a concrete profile.

Prusa Research system profile was annotated with "renamed_from"
to indicate that the PETG profiles were renamed from PET somewhere
after PrusaSlicer 2.2.1 release.
2020-03-15 08:38:17 +01:00
bubnikv
5137b169a2 Fixed conversion of installed presets from PrusaSlicer 2.1.1 to 2.2.0 2020-03-14 20:18:31 +01:00
bubnikv
9494d82d88 Reworked filaments / SLA materials in installation wizard:
1) When the wizard is initialized, filament and SLA profile names
   are verified and current names of renamed profiles are resolved.
   Fixes "Add/Remove Filaments is not hiding all of the un-checked filaments #3835"
2) When adding a printer model, default materials are installed in case
   the printer model has no default material installed.
3) When leaving the Filaments or SLA materials page, and some printer models
   have no material installed, those Printer Models are listed
   in a message box and only for those printer models the default
   materials are installed.
2020-03-14 18:35:42 +01:00