Commit graph

2330 commits

Author SHA1 Message Date
Enrico Turri
0a04a6d92a 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
Enrico Turri
1f083ac1ee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-24 09:47:11 +02:00
Enrico Turri
18965f5c22 Do not store into undo/redo stack remove all from selection command 2019-07-24 09:47:01 +02:00
YuSanka
7bc893d99a Update all extriders nozzle diameters according to the single_extruder_multi_material flag 2019-07-23 16:12:52 +02:00
Enrico Turri
1f24e82690 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-23 15:34:38 +02:00
Lukas Matena
0ae46b0635 SLA gizmo and undo/redo: 'autogenerated points' state is now correctly undone/redone 2019-07-23 15:23:38 +02:00
Enrico Turri
9a127ed016 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-23 15:14:19 +02:00
Enrico Turri
0d10d8aba7 1st installment for selection's undo/redo snapshots 2019-07-23 15:14:08 +02:00
Lukas Matena
91a5d70a62 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
Enrico Turri
3fe355509c Fixed undo/redo snapshot when opening a project using the recent files list 2019-07-23 12:57:58 +02:00
Lukas Matena
2c6e4b4e5b Fixed a missing include in UndoRedo.cpp 2019-07-23 09:40:07 +02:00
bubnikv
b34252bf0f Fixed compilation on clang. 2019-07-22 17:26:06 +02:00
bubnikv
bed21b1e2d Undo / Redo refactoring: Moved the snapshot flags definition
to SnapshotData
2019-07-22 17:00:50 +02:00
bubnikv
a5c64e8477 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
YuSanka
9d59d65fad Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-22 13:39:16 +02:00
YuSanka
7dd63b2c00 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
tamasmeszaros
a59e782e85 Update Arrange tooltip: [Shift+A] 2019-07-22 11:36:56 +02:00
tamasmeszaros
dcb073d4fd Merge branch 'tm_arrange_selection' 2019-07-22 11:14:34 +02:00
YuSanka
fb39516c65 Added checking for a extruder value in ObjectList. Set value to "default" if "0" is selected. 2019-07-22 10:28:25 +02:00
YuSanka
f6633df57b 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
enricoturri1966
b60b44ed5e Added additional tooltip to toolbar items and use it for undo/redo items 2019-07-20 14:03:34 +02:00
enricoturri1966
33c0683d11 Reworked rendering of toolbars background texture 2019-07-20 12:02:29 +02:00
tamasmeszaros
8d66b51e8c Merge branch 'master' into tm_arrange_selection 2019-07-19 18:17:58 +02:00
tamasmeszaros
10e86a06cc Dont do force_full_scene_refresh after arrange. 2019-07-19 18:16:36 +02:00
tamasmeszaros
63fada9469 Arrange selection if shift is pressed. Remove first item centering 2019-07-19 18:10:10 +02:00
Vojtech Kral
99e2fe20a5 Fix a memory access bug in ObjectManipulation 2019-07-19 17:58:46 +02:00
bubnikv
47df9506bb Fix of OSX Imgui Undo / Redo pull down list scaling issue. 2019-07-19 17:16:20 +02:00
bubnikv
07a3072622 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
bubnikv
ba997be812 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:59:35 +02:00
bubnikv
152c2fe0c0 Undo / Redo pull down menu scaling fix on OSX Retina 2019-07-19 15:59:23 +02:00
Enrico Turri
3285bf7945 Fixed conflicts after pulling from master 2019-07-19 15:47:10 +02:00
Enrico Turri
91d574f8ad Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-19 15:37:10 +02:00
Enrico Turri
81d3669a25 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
bubnikv
dbc1918193 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +02:00
bubnikv
2de6d95322 Memory statistics (total memory, memory usage, Undo / Redo stack size)
into the System INfo dialog.
2019-07-19 11:12:38 +02:00
bubnikv
d9c325c7f0 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
bubnikv
4049f33609 Fix of osx builds 2019-07-18 18:19:40 +02:00
bubnikv
a0ea96968d 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
tamasmeszaros
6ae50a710a Further refactoring 2019-07-18 17:31:27 +02:00
tamasmeszaros
e3ca95152c Minor refactor 2019-07-18 16:30:32 +02:00
bubnikv
631a952f94 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 13:08:48 +02:00
tamasmeszaros
6b8c72944d Merge branch 'master' into tm_arrange_selection 2019-07-18 12:59:40 +02:00
Enrico Turri
44d7462bdb Partially revert 8febd88e80 2019-07-18 12:03:41 +02:00
bubnikv
cd95b52dcd Undo / Redo memory conservation strategy: Release recoverable data
starting from the objects of lowest ObjectID.
(convex hulls are recoverable as well as the indexed triangle sets
inside the TriangleMeshes or the triangle connectivity information).

Now the top most snapshot (the temp one taken before Undo jump) will
never be released.
2019-07-18 11:51:06 +02:00
Enrico Turri
8febd88e80 Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
tamasmeszaros
6949543912 Fixes after merge with master. 2019-07-17 18:10:08 +02:00
tamasmeszaros
a695dec51a Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
bubnikv
cc1338ce6a Fix after merge 2019-07-17 16:00:09 +02:00
bubnikv
7176599a34 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-17 15:54:57 +02:00
bubnikv
3a74e7ab69 WIP: Undo / Redo memory limiting by releasing the least recently
used snapshots. Memory limit set to 10% of physical system memory.
2019-07-17 15:48:53 +02:00