a46a225cf1
Merge remote-tracking branch 'origin/master' into ys_search
2020-03-20 14:56:05 +01:00
ec381c5854
Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed
2020-03-20 13:45:37 +01:00
f912fecad5
3DConnexion devices: added option to swap y/z translations
2020-03-20 13:09:42 +01:00
5b24a0fb91
Fixed conflicts after merge with master
2020-03-20 10:55:37 +01:00
e188893c28
Start to implement "Search through options"
2020-03-20 10:30:55 +01:00
b4a7822098
Fixed Command character on OSX in ImGUI
2020-03-19 16:10:16 +01:00
cd5154b8e1
Fixed tooltip reappering after leaving imgui dialog
2020-03-19 15:12:18 +01:00
5b3ca3e4b7
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-19 14:06:49 +01:00
2501cf64c0
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
be2fd7164c
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
966b2ce371
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
6d23c08d00
WIP
2020-03-19 12:04:05 +01:00
f275461354
WIP: FDM supports gizmo now works with multiple part objects into some extent
2020-03-19 11:15:17 +01:00
1b05ecae8c
WIP: FDM gizmo: triangles not facing the camera are no more selected with fdm selection tool
2020-03-19 11:15:17 +01:00
590569e8f6
WIP: Optimized the triangle selection so it does not iterate over all the triangles
2020-03-19 11:15:17 +01:00
2e71dcefc3
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
08daddb5de
WIP: First working implementation of the triangle selector for the FDM support gizmo
2020-03-19 11:15:17 +01:00
7afe7326b6
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
8f762168ba
Adding special OS characters for keyboard shortcuts to ImGUI font map.
2020-03-19 09:52:24 +01:00
739d8131ab
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
a901b17d33
Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:28:54 +01:00
79951630ec
Hiding the tooltip when the window gets deactivated and reactivated.
2020-03-18 14:28:43 +01:00
9da16aeaa9
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:27:02 +01:00
61f3b53ef8
Fixed conflicts after merge with master
2020-03-18 14:26:44 +01:00
cd55b235ad
Canvas tooltip constrained inside canvas
2020-03-18 14:13:50 +01:00
37be82c8aa
Tooltips are rendered unformatted so percent signs in them do not break rendering
2020-03-18 13:50:08 +01:00
c5552843ab
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 13:36:01 +01:00
8a824bb8c2
Refactoring
2020-03-18 13:35:46 +01:00
067e128651
Suppress tooltips when the mouse is processed by an ImGUI dialog.
2020-03-18 13:23:07 +01:00
1c1a6b933a
Fixed interference between tooltips and imgui dialogs
2020-03-18 10:46:46 +01:00
a85a2b2e2a
Attempt to fix build on Linux
2020-03-17 15:47:49 +01:00
166389e6a8
Initial delay for ImGUI-based tooltip
2020-03-17 14:35:56 +01:00
7a1fa3d847
Canvas' tooltip using ImGUI
2020-03-17 13:01:38 +01:00
12c0170e3c
Attempt to fix gizmos tooltip on Mac
2020-03-17 11:02:32 +01:00
df6170b9bd
Fixed gizmos' tooltips
2020-03-17 09:41:54 +01:00
2ab8a474c2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader
2020-03-17 07:59:10 +01:00
8233a910b9
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
a0ed240af1
Generate gizmos' tooltip on demand
2020-03-16 16:37:22 +01:00
6bace46be1
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
505181ddfd
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader
2020-03-16 14:19:30 +01:00
abcd01d64a
ENABLE_SLOPE_RENDERING - Do not apply slope shading to modifiers and small refactoring
2020-03-16 14:17:19 +01:00
19d93b3b01
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2020-03-16 13:35:15 +01:00
350a85cf43
#3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview
2020-03-16 13:34:53 +01:00
ea0cb4d761
Sidebar can be hidden/shown from menu "View/Collapse sidebar"
2020-03-16 12:51:55 +01:00
ffe404fc5b
Fixed gizmos' tooltips
2020-03-16 12:45:39 +01:00
c1e92a5759
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
ac4d9ea172
Fixed conflicts after merge with master
2020-03-16 08:09:52 +01:00
6bf56d5cb4
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
2e1aef87a1
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
7f3ac39757
Fixed conversion of installed presets from PrusaSlicer 2.1.1 to 2.2.0
2020-03-14 20:18:31 +01:00
