Commit Graph

10171 Commits

Author SHA1 Message Date
YuSanka
eced3dcea8 Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-11 16:00:28 +02:00
YuSanka
a6a5b94155 Added suppress_snapshots() and allow_snapshots() for avoid of excess "snapshoting" 2019-07-11 16:00:01 +02:00
Enrico Turri
4c6c608342 GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri
f964f5e99a Deactivate undo/redo toolbar items by pressing Esc key 2019-07-11 07:54:33 +02:00
Enrico Turri
dbf0eacfa7 Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it 2019-07-11 07:46:40 +02:00
YuSanka
5cbaa7b081 FreqChangedParams : workaround for right border alignment 2019-07-10 17:50:24 +02:00
YuSanka
1dc0439a31 Fixed margins for FreqChangedParams 2019-07-10 15:55:53 +02:00
Enrico Turri
1b5ab100bd GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos 2019-07-10 14:08:14 +02:00
Enrico Turri
14dad5039a Imgui dialogs for undo/redo centered on their toolbar item icon 2019-07-10 13:45:25 +02:00
Enrico Turri
40a1f31e84 Disable remaining toolbar items when one of them is toggable and pressed 2019-07-10 11:59:25 +02:00
YuSanka
baece78390 Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-10 11:38:52 +02:00
YuSanka
99df9f56c4 Added take_snapshot() for adding of settings 2019-07-10 11:28:11 +02:00
Enrico Turri
46e295407b Modified toolbar to call RenderCallback only when the item is toggable and pressed 2019-07-10 10:52:12 +02:00
YuSanka
3720e6a3a3 Fixed redo_to() function and code cleaning from redundant options 2019-07-10 10:15:07 +02:00
YuSanka
f985f5190c Completed undo/redo from a toolbar 2019-07-09 20:45:00 +02:00
YuSanka
3dd1bc753c Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-09 19:41:37 +02:00
YuSanka
1347e655c2 Next improvements of an undo/redo from a toolbar 2019-07-09 19:39:36 +02:00
Enrico Turri
1f74d7fdfc Added color number in legend texture for color prints 2019-07-09 15:47:34 +02:00
Enrico Turri
52dc8547ac Reverder order of rendering of color print time estimates 2019-07-09 15:08:34 +02:00
Enrico Turri
29dfa786ff Merge branch 'et_color_print_times' of https://github.com/prusa3d/PrusaSlicer 2019-07-09 14:24:24 +02:00
tamasmeszaros
a37ca1c26a Merge branch 'tm_builtin_pad' 2019-07-09 14:00:24 +02:00
tamasmeszaros
af89bcee53 Merge branch 'master' into tm_builtin_pad 2019-07-09 13:21:26 +02:00
tamasmeszaros
18fcb64681 Fixing broken SLA slicing: SPE-984 2019-07-09 13:12:55 +02:00
Enrico Turri
d4914441f3 Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
tamasmeszaros
386a42b4c5 Disable dep_libigl in deps. Include dir collisions... 2019-07-09 10:15:40 +02:00
Enrico Turri
36049788ac Fixed reset of bed 3d model 2019-07-09 08:24:23 +02:00
YuSanka
fbf14b42e9 Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +02:00
Enrico Turri
4ba7dfb6dd Refactoring of functions thick_lines_to_indexed_vertex_array() to reduce the amount of produced vertices while reducing visual artifacts in gcode toolpaths due to averaged normals 2019-07-08 15:30:59 +02:00
YuSanka
7b6229289d Added undo/redo to the "Edit" menu 2019-07-08 10:57:35 +02:00
Enrico Turri
9ba5568539 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
Enrico Turri
ad5329253e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_color_print_times 2019-07-08 08:45:11 +02:00
Enrico Turri
25d916f144 Color change time estimates 2019-07-08 08:40:20 +02:00
bubnikv
fb725502b7 Undo / Redo: Bound Ctrl-V/Ctrl-Z to the side panel. 2019-07-05 20:27:44 +02:00
bubnikv
45a5487e51 Fix of compilation on clang 2019-07-05 20:09:30 +02:00
bubnikv
270fec84d3 Fix of the Undo / Redo for Cut.
Added some more operations (for example Rotation) to the Undo / Redo.
2019-07-05 19:46:48 +02:00
bubnikv
4e2fda3315 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
bubnikv
6a3fc5bde3 Documented the cereal library manual patching (FIXME!) 2019-07-05 11:42:36 +02:00
bubnikv
357e578a84 Fixed includes on OSX 2019-07-05 10:46:42 +02:00
bubnikv
7c732c7482 Trying to fix some Linux & OSX compilation issues. 2019-07-04 23:34:18 +02:00
bubnikv
211d1ee1e3 Trying to make all C++ of the platforms happy. 2019-07-04 22:52:33 +02:00
bubnikv
9fd0c55eb8 Simplified the "cereal" includes to not clash with Perl includes 2019-07-04 22:09:14 +02:00
bubnikv
3d420db531 Fix of perl bindings 2019-07-04 21:28:57 +02:00
bubnikv
497b01f24a Trying to fix some template resolution on Linux 2019-07-04 21:02:08 +02:00
bubnikv
b1420283b6 Fixed merge issues. 2019-07-04 20:49:46 +02:00
bubnikv
3a24fb2f47 Yet another compilation fix. 2019-07-04 20:25:52 +02:00
bubnikv
c7cc760067 Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
bubnikv
1070991149 Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo 2019-07-04 20:15:50 +02:00
bubnikv
b5b7463dc5 Testing code for serialization of DynamicPrintConfig 2019-07-04 20:14:38 +02:00
bubnikv
3e5f9b5a22 Removed some junk templates, which pass compilation on Windows
even if they are invalid.
2019-07-04 19:59:45 +02:00
bubnikv
70c6558a4c Fix of compilation on Linux 2019-07-04 19:48:00 +02:00