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
Lukas Matena
fca5562c6c
Process start_filament_gcode in case of usual single extruder printer
...
Reported in https://github.com/prusa3d/PrusaSlicer/issues/2652
2019-07-19 10:02:52 +02:00
Enrico Turri
84d61e28fd
Tech ENABLE_TEXTURES_FROM_SVG set as default
2019-07-19 09:52:01 +02:00
Enrico Turri
3344650255
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-19 09:18:32 +02:00
Enrico Turri
ba4bc8ac82
Render custom bed textures in png format on prusa beds
2019-07-19 09:18:09 +02:00
bubnikv
4049f33609
Fix of osx builds
2019-07-18 18:19:40 +02:00
bubnikv
d669a00980
Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2
2019-07-18 17:42:10 +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
b2867f9227
Merge branch 'master' into tm_arrange_selection
2019-07-18 16:33:16 +02:00
tamasmeszaros
76b1fbc5bf
Eliminate some igl warnings on msvc
2019-07-18 16:32:04 +02:00
tamasmeszaros
e3ca95152c
Minor refactor
2019-07-18 16:30:32 +02:00
Enrico Turri
1c5ff3c72d
Small refactoring
2019-07-18 15:03:05 +02:00
Enrico Turri
f61d43de07
Render custom bed textures in svg format on prusa beds
2019-07-18 14:39:19 +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
tamasmeszaros
99b8e08e67
Remove arrange cache.
2019-07-18 12:58:28 +02:00
Enrico Turri
af3cb890d1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-18 12:57:12 +02:00
Enrico Turri
de383b1809
Added selection of custom bed model to bed shape dialog
2019-07-18 12:56:52 +02:00
bubnikv
69ef6cf806
Fix for compilation on clang: Forward declarations of templates.
2019-07-18 12:07:50 +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
Enrico Turri
1e796b82e1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-18 11:12:30 +02:00
Enrico Turri
08d37aad06
Added selection of custom bed texture to bed shape dialog
2019-07-18 11:12:11 +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
tamasmeszaros
c82fb9c84f
libnest2d: Remove old preload method from selector interface
2019-07-17 17:19:42 +02:00
tamasmeszaros
aff1863aed
Really fix build for msvc
2019-07-17 16:47:09 +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
Lukas Matena
2b9d285a16
'Place on face' gizmo fix (it used invalid pointer after undo/redo was implemented)
2019-07-17 15:39:58 +02:00
Lukas Matena
81dde630ea
SLA support points edits are now pushed onto undo/redo stack
2019-07-17 15:39:58 +02:00
Enrico Turri
75c53a53b6
Refactoring of BedShapePanel and BedShapeDialog
2019-07-17 14:53:02 +02:00
tamasmeszaros
c74e6513d9
Fix for msvc build.
2019-07-17 14:34:28 +02:00
Enrico Turri
ce5618fb27
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-17 14:28:12 +02:00
Enrico Turri
f97a61cdcf
Fixed use of translate macros
2019-07-17 14:13:50 +02:00
tamasmeszaros
2728f41123
Solved issue with virtual bed management.
...
libnest2d: Fix for unclosed polygons after merge.
2019-07-17 13:32:31 +02:00
Enrico Turri
ba7df2a64e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-17 13:17:50 +02:00
Enrico Turri
401707a6fe
Another refactoring of GLGizmosManager
2019-07-17 12:43:27 +02:00
Enrico Turri
da1fa0b6e3
Refactoring of GLGizmosXX classes to cleanup their interface
2019-07-17 12:06:23 +02:00
Enrico Turri
0a530ab7bc
Added undo/redo snapshot for layers height editing
2019-07-17 10:03:00 +02:00
Enrico Turri
832dada931
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-17 08:38:58 +02:00
Enrico Turri
21624f5305
Framework to serialize gizmos into undo/redo stack
...
Serialization into undo/redo of Cut gizmo
Refactoring of GLGizmosManager
2019-07-17 08:38:48 +02:00
tamasmeszaros
44801f4429
Priority for wipe tower, Increased safety distance from bed edges.
...
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
2019-07-16 18:33:42 +02:00
Lukas Matena
52ab8a5f19
Wipe tower fix (do not skip the first toolchange when printing without the wipe tower)
...
Also, test multi.t updated so it matches new logic of inserting custom gcodes
2019-07-16 13:10:09 +02:00
bubnikv
4865240a9c
Fixed compilation issue
2019-07-16 09:19:00 +02:00
tamasmeszaros
5446167c11
Fixes for arranging wipe tower
2019-07-15 18:18:34 +02:00
tamasmeszaros
1b0e192046
Arrange cache in ModeInstance and logical bed remembered.
2019-07-15 17:30:44 +02:00
Lukas Matena
dc80616bf6
Fixed a use-after-free problem in object list
...
this was uncovered by ASAN when attempting to Delete All objects with multiple instances
2019-07-15 17:09:06 +02:00
bubnikv
72ba890091
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-15 15:51:31 +02:00
bubnikv
d2a3a36013
Fix of the SLA Undo
2019-07-15 15:51:25 +02:00
Lukas Matena
004e2719b1
Merge branch 'master' into lm_warnings
2019-07-15 13:26:55 +02:00
bubnikv
35b691d28c
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-15 12:00:10 +02:00
bubnikv
a492360d19
Fix of the merge - missing Undo / Redo toolbar buttons.
2019-07-15 11:59:54 +02:00
Lukas Matena
63cf5edf28
Updated tooltips on custom gcodes to match actual PrusaSlicer behaviour to reflect recent changes
2019-07-15 11:49:30 +02:00
bubnikv
ab7ecc1819
Merge remote-tracking branch 'remotes/origin/vb_undo_redo'
2019-07-15 11:34:18 +02:00
Lukas Matena
e674c586b0
Merge branch 'lm_improving_wipe_tower'. Summary of changes:
...
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
2019-07-15 10:25:38 +02:00
Enrico Turri
610e0f7ee6
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-15 08:19:58 +02:00
YuSanka
44f0e387dc
Fix of #2621
2019-07-13 10:38:10 +02:00
tamasmeszaros
df7bb94daf
Not handling logical beds in arrange()
2019-07-12 21:17:11 +02:00
Enrico Turri
077d4aa3d7
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-12 15:36:11 +02:00
Enrico Turri
de88db5918
#2616 - Added Recent projects item to File menu
2019-07-12 15:36:01 +02:00
YuSanka
4d8a028262
Finally fix for settings item selection
2019-07-12 13:56:56 +02:00
YuSanka
6826e31e2a
Some code refactoring for settings items
2019-07-12 13:56:56 +02:00
YuSanka
aed6acc073
Add take_snapshot for layers range editing actions
2019-07-12 13:56:56 +02:00
Lukas Matena
45db42ca3b
Merge branch 'lm_drop_to_bed'
2019-07-12 13:38:18 +02:00
Lukas Matena
2ee572bd31
GCodeAnalyzer now recognizes tool-changing commands with MakerWare and Sailfish flavor
...
These firmwares use M135 Tn and M108 Tn commands for changing active tool, which the analyzer did not recognize. The toolpaths were then rendered in wrong color, extruder offset etc. This surfaced in issue https://github.com/prusa3d/PrusaSlicer/issues/2566
2019-07-12 12:56:41 +02:00
Enrico Turri
cc70c8dff9
Tech ENABLE_SVG_ICONS set as default
2019-07-12 10:13:35 +02:00
Enrico Turri
2f57f756e5
Follow-up of 4c6c608342
-> refactoring
2019-07-12 09:26:19 +02:00
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
Enrico Turri
e8461f65df
Refactoring in class BedShapePanel
2019-07-09 13:33:15 +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
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