Commit Graph

2290 Commits

Author SHA1 Message Date
dc396946d2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 13:44:02 +02:00
450ae17d59 Add remove all from selection command to undo/redo stack only when the redo stack is empty 2019-07-24 13:51:39 +02:00
ba998a20e9 Fix for 0592ae65ee 2019-07-24 12:32:38 +02:00
9aeb100de5 Completed setting of the item focus in ObjectList after undo/redo 2019-07-24 11:25:04 +02:00
1467381e60 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-24 09:47:11 +02:00
58c862e742 Do not store into undo/redo stack remove all from selection command 2019-07-24 09:47:01 +02:00
4dac86261d Fixed ObjectList::last_volume_is_deleted() to avoid clearing volume[0].config after undo/redo 2019-07-23 17:30:32 +02:00
a8029bf57c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-23 16:18:14 +02:00
08bda3885e Added SETTINGS_SELECTED_ON_SIDEBAR flag to undo/redo 2019-07-23 16:17:37 +02:00
f47589a14b Update all extriders nozzle diameters according to the single_extruder_multi_material flag 2019-07-23 16:12:52 +02:00
9dac6c7c28 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-23 15:34:38 +02:00
e2f1bf777a SLA gizmo and undo/redo: 'autogenerated points' state is now correctly undone/redone 2019-07-23 15:23:38 +02:00
c6e23cdc82 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-23 15:14:19 +02:00
d14e0d2c90 1st installment for selection's undo/redo snapshots 2019-07-23 15:14:08 +02:00
073fcc3ac9 Fixed a few warnings in headers (meaning they were reported once for each include)
Fixed an identification of CXX compiler in cmake so that 'AppleClang' is recognized
2019-07-23 14:02:20 +02:00
1f13f67ce1 Fixed undo/redo snapshot when opening a project using the recent files list 2019-07-23 12:57:58 +02:00
10d3600a23 Undo / Redo refactoring: Moved the snapshot flags definition
to SnapshotData
2019-07-22 17:00:50 +02:00
53c06f5a84 Refactoring of the Undo / Redo stack interface:
The Snapshot specific data, which is fully provided from the outside
of the Undo / Redo stack is now stored as an StackData structure.
The StackData structure may be extended with small size data,
like the cursor position in the side bar.
2019-07-22 16:52:47 +02:00
3447a57e03 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-22 13:39:16 +02:00
d64881a9b2 Added takesnapshot() call for:
- split of the instances,
- renaming of the Object/Volume item
- changing of the additional settings.
2019-07-22 13:38:53 +02:00
538280748d Update Arrange tooltip: [Shift+A] 2019-07-22 11:36:56 +02:00
71f08c797e Merge branch 'tm_arrange_selection' 2019-07-22 11:14:34 +02:00
72158e78c9 Added checking for a extruder value in ObjectList. Set value to "default" if "0" is selected. 2019-07-22 10:28:25 +02:00
2f50c02285 Fix of SPE-987 (Slicer crash when layers are selected in right panel and settings is added) 2019-07-22 09:41:34 +02:00
10212a1042 Added additional tooltip to toolbar items and use it for undo/redo items 2019-07-20 14:03:34 +02:00
3924f14452 Reworked rendering of toolbars background texture 2019-07-20 12:02:29 +02:00
124aa9a8ef Merge branch 'master' into tm_arrange_selection 2019-07-19 18:17:58 +02:00
6224c2e460 Dont do force_full_scene_refresh after arrange. 2019-07-19 18:16:36 +02:00
31ca157cdf Arrange selection if shift is pressed. Remove first item centering 2019-07-19 18:10:10 +02:00
3a30c45348 Fix a memory access bug in ObjectManipulation 2019-07-19 17:58:46 +02:00
83d6589be1 Fix of OSX Imgui Undo / Redo pull down list scaling issue. 2019-07-19 17:16:20 +02:00
d99da4b01b Simplified loading of the SLA support structures into the scene.
Fixed referesh of SLA support structures after Undo / Redo
and when moving an object outside / inside the build volume.
2019-07-19 17:14:37 +02:00
8eba63c697 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:59:35 +02:00
2824a1531e Undo / Redo pull down menu scaling fix on OSX Retina 2019-07-19 15:59:23 +02:00
9f741dd46b Fixed conflicts after pulling from master 2019-07-19 15:47:10 +02:00
e59454652b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-19 15:37:10 +02:00
53dc2efea5 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
5945c13ae6 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +02:00
1f727bca37 Memory statistics (total memory, memory usage, Undo / Redo stack size)
into the System INfo dialog.
2019-07-19 11:12:38 +02:00
f4fa4ff6e4 Adding a generic bitmap "flags" attrib to the Undo / Redo snapshot.
using this new "flags" attrib to store & recover the "Layers editing active"
flag and restoring the "Layers editing" tool state.
2019-07-19 10:29:06 +02:00
e103460386 Storing the active printer technology onto the Undo / Redo stack,
remembering the last selected Printer profile for the SLA and FDM
technologies separately, and activating them on Undo / Redo.

When switching the technologies, user is asked whether to discard
the modified profiles or not.
2019-07-18 17:41:47 +02:00
698c2de245 Further refactoring 2019-07-18 17:31:27 +02:00
58581347c9 Minor refactor 2019-07-18 16:30:32 +02:00
701a94bdb6 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 13:08:48 +02:00
3202db0943 Merge branch 'master' into tm_arrange_selection 2019-07-18 12:59:40 +02:00
8603f6eeb3 Partially revert 8febd88e80 2019-07-18 12:03:41 +02:00
3869be533f Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
af93cc0e20 Fixes after merge with master. 2019-07-17 18:10:08 +02:00
d55dbf437c Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
5a24b6af21 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-17 15:54:57 +02:00