Commit Graph

2822 Commits

Author SHA1 Message Date
Enrico Turri
d6f03a2f52 Bed model placed into the scene so that its origin goes into shape center 2019-07-25 11:34:42 +02:00
Enrico Turri
bc680b8376 Draw lighter gridlines when rendering default procedural texture on print bed when seen from above and custom model is present 2019-07-25 10:38:18 +02:00
Enrico Turri
9625fe8f5b Render custom bed model on custom beds 2019-07-25 09:45:43 +02:00
Enrico Turri
48dc2bb762 Fixed positioning of bed model into the scene and changed bundled bed models 2019-07-25 08:43:21 +02:00
Enrico Turri
1483a7fd51 Render custom bed model on prusa beds 2019-07-24 14:02:36 +02:00
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
YuSanka
ab2519cde4 Merge remote-tracking branch 'origin/master' into ys_overrides 2019-07-24 12:47:00 +02:00
YuSanka
1a3fc0994b Fix for 0592ae65ee 2019-07-24 12:32:38 +02:00
YuSanka
0592ae65ee Completed setting of the item focus in ObjectList after undo/redo 2019-07-24 11:25:04 +02:00
Enrico Turri
395e794b9e Refactoring in Bed3D 2019-07-24 11:04:04 +02:00
Enrico Turri
f7d238cb2d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-24 10:11:28 +02:00
Enrico Turri
7e7550b416 Custom bed texture applied to custom bed shapes 2019-07-24 10:11:17 +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
62f997d167 Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-24 09:29:10 +02:00
YuSanka
804e1b1939 Fixed ObjectList::last_volume_is_deleted() to avoid clearing volume[0].config after undo/redo 2019-07-23 17:30:32 +02:00
YuSanka
a121253520 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-23 16:18:14 +02:00
YuSanka
4245b61afc Added SETTINGS_SELECTED_ON_SIDEBAR flag to undo/redo 2019-07-23 16:17:37 +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
1b5ba6c823 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-23 15:36:39 +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
bubnikv
3b1a44c084 WIP: Nullable configuration value concept, implemented for
ConfigOptionFloatsNullable, ConfigOptionIntsNullable,
ConfigOptionPercentsNullable, ConfigOptionBoolsNullable.

retract override values were added to the Filament profile:
vector of floats: "retract_length", "retract_lift", "retract_lift_above",
	"retract_lift_below", "retract_speed", "deretract_speed",
	"retract_restart_extra", "retract_before_travel",
vector of bools: "retract_layer_change", "wipe"
vector of percents: "retract_before_wipe"
2019-07-23 14:15:42 +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
bubnikv
356166ad86 Merge branch 'master' into ys_overrides 2019-07-22 16:27:00 +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
Enrico Turri
7749677b27 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:57:17 +02:00
tamasmeszaros
a59e782e85 Update Arrange tooltip: [Shift+A] 2019-07-22 11:36:56 +02:00
Enrico Turri
c1dee0e87d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:26:02 +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
bubnikv
8112d80fa2 Merge branch 'master' into ys_overrides 2019-07-22 09:36:55 +02:00
Enrico Turri
9cb1a584e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 08:21:40 +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
Enrico Turri
37f2362aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 11:36:07 +02:00
Enrico Turri
749bb2bfed Refactoring in GLTexture 2019-07-19 11:18:19 +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
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
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
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
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
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
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
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
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
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
d2a3a36013 Fix of the SLA Undo 2019-07-15 15:51:25 +02:00
bubnikv
a492360d19 Fix of the merge - missing Undo / Redo toolbar buttons. 2019-07-15 11:59:54 +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
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
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
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
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
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
b1420283b6 Fixed merge issues. 2019-07-04 20:49:46 +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
YuSanka
a29cc9e242 Update object list after undo/redo 2019-07-04 19:46:46 +02:00
bubnikv
e586475bc3 WIP Undo / Redo: Optional debug print outs. 2019-07-04 17:14:15 +02:00
bubnikv
1798e2a84c WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
YuSanka
f617d74729 Merge remote-tracking branch 'origin/ys_default_presets' into ys_new_features 2019-07-04 14:30:54 +02:00
YuSanka
e4d8c5410c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +02:00
YuSanka
74f9a5432f Reset previous layers range selection before selection Layers Item 2019-07-04 14:25:40 +02:00
bubnikv
5a2ace1a6e WIP Undo / Redo: First Undo in the history of PrusaSlicer! 2019-07-04 10:45:41 +02:00
tamasmeszaros
e81f8a5fd9 WIP still with arrange return value. 2019-07-03 19:24:41 +02:00
YuSanka
040f1fedff Added UI-prototype for FilamentSettings->Overrides page 2019-07-03 15:32:17 +02:00
bubnikv
e2a670218b WIP Undo / Redo: Serializing the configs of ModelObject / ModelVolume
/ ModelMaterial as separate objects to conserve memory.
2019-07-03 13:43:54 +02:00
Enrico Turri
2c0f0c85a5 Fixed bed shape dialog layout 2019-07-03 10:06:22 +02:00
Enrico Turri
7a7316fcbf Fixed compile warnings in Bed3D 2019-07-03 09:19:07 +02:00
Enrico Turri
d101ed709c Button 'Load shape from STL' centered into its panel in bed shape dialog 2019-07-03 08:58:05 +02:00
bubnikv
4125519863 WIP Undo / Redo: Capturing of the triangle meshes. 2019-07-02 17:56:38 +02:00
bubnikv
5e846112ee WIP UndoRedo: Added Undo/Redo stack, added Platter::take_snapshot(),
experimental snapshots on loading STLs and increasing / decreasing
model instances.
2019-07-02 16:42:23 +02:00
Enrico Turri
90daffccf2 View dependent order of rendering for layers editing visual hints to keep the correct transparency 2019-07-02 15:49:18 +02:00
YuSanka
0bcad2a5c5 Fix for the last commit 2019-07-02 15:26:11 +02:00
Enrico Turri
2a71665de9 Follow-up of d07b3fb08b -> Show current bed shape for custom bed in bed shape dialog 2019-07-02 15:10:59 +02:00
YuSanka
136e5156bc Fixed colot_print issues:
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
2019-07-02 14:06:58 +02:00
Enrico Turri
d15698e21e GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call 2019-07-02 12:55:55 +02:00
Enrico Turri
b835075fd6 Visual hints for layers editing enabled whenever a layer is selected into the objects list 2019-07-02 10:34:30 +02:00
tamasmeszaros
253ec07cb2 Still WIP 2019-07-01 18:22:07 +02:00
YuSanka
e5e7496cea Some changes for options tooltips 2019-07-01 16:56:38 +02:00
YuSanka
a934c2e79c Changed a behavior logic of a value reverting for presets, derived from default.
LOCKs and ARROWs work now in a same way like for presets, derived from system presets.
2019-07-01 14:56:28 +02:00
Enrico Turri
2356fe5a13 Added member BoundingBoxf3 m_bounding_box to GLIndexedVertexArray and removed member BoundingBoxf3 bounding_box from GLVolume 2019-07-01 13:26:06 +02:00
Enrico Turri
4269c8b23c Removed GLVolume non-VBO rendering 2019-07-01 12:28:16 +02:00
Vojtech Kral
1a529cb778 PresetUpdater: Fix: Index installed too early 2019-07-01 11:35:02 +02:00
Enrico Turri
d7c418ef84 Modified function thick_lines_to_indexed_vertex_array() to remove visual artifacts on paths in gcode preview 2019-07-01 08:33:40 +02:00
YuSanka
125f474f02 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-29 12:38:03 +02:00
tamasmeszaros
cb3a586deb Adapt find_new_position is WIP. Cleaning up comments. 2019-06-28 18:27:15 +02:00
tamasmeszaros
299e4f74c7 Arranging with new structure. 2019-06-28 17:03:50 +02:00
tamasmeszaros
f0ac54ba32 Merge branch 'master' into tm_builtin_pad 2019-06-28 16:51:55 +02:00
tamasmeszaros
4c69a855a1 Merge branch 'master' into tm_builtin_pad 2019-06-28 15:29:26 +02:00
Vojtech Kral
61080bcff6 Merge branch 'bugfixes': avrdude warnings cleanup 2019-06-28 15:21:45 +02:00
tamasmeszaros
19e6bf58dd WIP on structuring arrange inputs 2019-06-27 21:13:44 +02:00
YuSanka
0b940ec089 Some code improvements 2019-06-27 16:07:32 +02:00
Enrico Turri
6cfb9bec36 Removed memory leaks due to Plater::priv::config not being deleted 2019-06-27 15:23:03 +02:00
Enrico Turri
97bb4a80cc Removed memory leaks due to Sidebar::priv::object_manipulation, Sidebar::priv::object_settings and Sidebar::priv::frequently_changed_parameters not being deleted 2019-06-27 15:16:36 +02:00
Enrico Turri
26c8eed1ae Removed memory leaks due to GUI_App::app_config, GUI_App::preset_bundle and GUI_App::preset_updater not being deleted 2019-06-27 14:42:55 +02:00
YuSanka
dd1fb286c3 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
Enrico Turri
1058721dba Added visual hints in 3D scene for layers editing 2019-06-27 13:42:50 +02:00
Enrico Turri
90d1ac2c8f Tech ENABLE_RENDER_PICKING_PASS extended so that user can switch between picking pass texture rendering and regular rendering by pressing [T] key 2019-06-27 11:25:04 +02:00
bubnikv
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
enricoturri1966
d16c670ed1
Merge pull request #2569 from BeldrothTheGold/master
Add debug preprocessor directive in Technologies.hpp to render picking pass to window.
2019-06-27 09:44:48 +02:00
tamasmeszaros
96f6fd2d9f Merge branch 'master' into tm_arrange_selection 2019-06-27 09:33:32 +02:00
tamasmeszaros
e1d612d05f work in progress on new ModelArrange interface 2019-06-26 17:09:26 +02:00
Enrico Turri
070c9f03fe Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-26 14:25:26 +02:00
Enrico Turri
a07088a8d9 #2561 - Fixed freezing of perspective camera when zooming-in 2019-06-26 14:25:05 +02:00
YuSanka
1525a864c5 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-26 13:33:05 +02:00
YuSanka
104a289cfe Implemented interface for updating 3DScene after set a focus to some editor 2019-06-26 13:30:20 +02:00
bubnikv
a710e7e7e4 WIP: Undo / Redo stack.
Integration of the "cereal" serialization library.
Serialization / deserialization of the DynamicConfig / DynamicPrintConfig.
DynamicPrintConfig serializes ordinal identifiers instead
of the option key strings to conserve space.
2019-06-26 13:26:49 +02:00
Lukas Matena
d2136ab625 ObjectList no longer caps number of extruders to 9 (fixes https://github.com/prusa3d/PrusaSlicer/issues/2558) 2019-06-26 13:12:25 +02:00
Lukas Matena
d845332de1 Fixed a crash when using place to bed function with the layer editing active
This was caused by trying to render a deleted layer height profile. Other gizmos were
not affected because they are not dragging at the time of their action, so the profile
was correctly recalculated for them.
2019-06-26 11:51:18 +02:00
YuSanka
1de06a9461 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-26 09:49:33 +02:00
YuSanka
ac82cbe0cc Fix of #2548 2019-06-26 09:48:52 +02:00
BeldrothTheGold
d818d1b429 Add debug option to display picking pass to screen 2019-06-25 19:25:03 -06:00
Vojtech Kral
4fb904357f Warnings cleanup in BonjourDialog, ConfigWizard, FirmwareDialog,
GLGizmoCut, ImGuiWrapper
2019-06-25 18:16:53 +02:00
Enrico Turri
2f806dedc7 Fixed rendering of selection rectangle with perspective camera 2019-06-25 09:51:43 +02:00
Enrico Turri
3d755e1bbe Removed 'Use legacy OpenGL 1.1 rendering' option 2019-06-25 09:20:58 +02:00
bubnikv
27cc66eb54 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-25 08:57:03 +02:00
bubnikv
d689195bda Fix of the previous commit on color change fix. 2019-06-25 08:56:53 +02:00
Enrico Turri
992170c5f6 1) Perspective camera set as default camera type
2) Camera type selection added to Preferences dialog
2019-06-24 15:55:14 +02:00
YuSanka
c198d826af Setting min_z bigger than max_z cause an increase of the max_z 2019-06-24 15:43:16 +02:00
bubnikv
5320ed9374 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-24 15:27:43 +02:00
bubnikv
198600543d Fix of incorrect color print preview due to the tbb::parallel_for
not respecting the grain size exactly.
Also the tool path generation has been optimized to launch less
threads and to produce larger vertex buffers.
2019-06-24 15:27:32 +02:00
YuSanka
daac165a44 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-24 13:56:35 +02:00
YuSanka
e737f15bfa Fix of OSX build 2019-06-24 13:47:03 +02:00
Enrico Turri
53d1ff879c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-24 13:21:14 +02:00
Enrico Turri
7aaba25520 Do not allow to copy/paste volumes when using sla printer 2019-06-24 13:21:05 +02:00
YuSanka
0f35a95d75 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-24 13:13:34 +02:00
YuSanka
14d8621ffe Color_print issues :
- fixed #1933
 - implemented thumb moving to the mouse click position
 - implemented "discard color changes" button
2019-06-24 13:11:18 +02:00
Enrico Turri
6b0d75127b #2428
1) Reworked logic for pasting volumes

2) Fixed paste of volumes into different objects

3) Do not apply offset when pasting into the copied object

4) Keep source transformation matrix and relative positions when copy/pasting volumes into another object
2019-06-24 12:26:11 +02:00
Vojtech Kral
1eb7634af7 Merge branch 'updating': Index installation 2019-06-24 11:09:55 +02:00
Vojtech Kral
767dcb9607 Merge branch 'bugfixes': Fixes in fw updater UI 2019-06-24 11:09:07 +02:00
Enrico Turri
5766e9e915 Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
Enrico Turri
00b9a3ad32 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
Enrico Turri
8b3d88bc0a Adaptive perspective camera frustrum 2019-06-24 09:38:46 +02:00
Enrico Turri
301eda7369 ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default 2019-06-24 09:27:19 +02:00
Enrico Turri
96276394d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-24 08:15:41 +02:00
bubnikv
27459a9072 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-20 16:15:26 +02:00
bubnikv
35b3fd3176 Integrated the new layer height spans with configs into the backend.
Fixed some compiler warnings.
2019-06-20 16:15:09 +02:00
Vojtech Kral
503212181c Updating: Index installation
Prevents cancelled updates from popping up repeatedly
on each application startup
2019-06-20 14:26:29 +02:00
YuSanka
fe395546f0 Added "info" tooltip for a LockButton on Manipulation panel (#2539) 2019-06-20 12:56:23 +02:00
Vojtech Kral
8208da0a7b Firmware updater: Fix MMU flashing in GUI 2019-06-20 11:17:35 +02:00
Vojtech Kral
09da7a84b5 Firmware updater: Prevent empty flashing jobs 2019-06-20 11:17:35 +02:00
Enrico Turri
e5be8adadf Fixed build on MacOS 2019-06-20 11:05:05 +02:00
tamasmeszaros
c82fd692c3 Merge branch 'master' into tm_builtin_pad 2019-06-20 10:04:17 +02:00
Enrico Turri
b7f67369c9 Serialized camera type and fixed Mac build 2019-06-20 10:02:52 +02:00
Enrico Turri
6af69667a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-20 08:51:08 +02:00
YuSanka
09f4831f4e Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-19 16:32:40 +02:00
YuSanka
7f8bb94a55 Fixed wxEVT_CHAR handling for DoubleSlider 2019-06-19 16:28:56 +02:00
Lukas Matena
82de7bedb1 WipeTowerDialog.cpp - wxEXPAND conflicted with wxALIGN_CENTER_HORIZONTAL (triggered a wxWidgets assert) 2019-06-19 14:52:42 +02:00
Enrico Turri
5dcc6c7f36 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 14:33:31 +02:00
Enrico Turri
b91b94ad3c Key K set as camera type toggle and updated keyboard shortcuts dialog 2019-06-19 14:33:09 +02:00
Enrico Turri
da8179d9c7 More camera related functionalities moved from GLCanvas3D to Camera 2019-06-19 14:18:51 +02:00
tamasmeszaros
1e7b5c5a81 Merge branch 'tm_rotcalipers' 2019-06-19 13:11:18 +02:00
Enrico Turri
a3e6412113 Enabled perspective camera 2019-06-19 13:01:18 +02:00
Lukas Matena
0481f33ceb Drop to bed function now accounts for instance transformation 2019-06-19 11:53:08 +02:00
YuSanka
12133f9599 Code cleaning and last msw_rescale() improvements 2019-06-19 11:38:42 +02:00
tamasmeszaros
4a71c42f9b Merge branch 'master' into tm_rotcalipers 2019-06-19 11:07:21 +02:00
Enrico Turri
b0b54ed0e6 Fixed flickering of 3D view when moving objects on NVIDIA graphic cards 2019-06-19 11:05:34 +02:00
Lukas Matena
3d8c3804fa Added 'drop to bed' button into object manipulation panel 2019-06-19 11:04:12 +02:00
Lukas Matena
5a1e1bc10c GUI_ObjectManipulation.cpp - Removed implicit capture by value in some of the lambdas 2019-06-19 11:04:12 +02:00
Enrico Turri
a15cb597ab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 10:35:27 +02:00
tamasmeszaros
78610de473 Fix build on vs2013
Fix 2 for vs2013
2019-06-19 10:18:51 +02:00
Enrico Turri
28dd52d88b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 08:17:58 +02:00
YuSanka
415877d79e Experiments with msw_rescale fixing 2019-06-18 18:02:40 +02:00
tamasmeszaros
b4ef812d32 Merge branch 'master' into tm_sla_printer_mirror 2019-06-18 17:42:10 +02:00
tamasmeszaros
18bbf493c1 Merge branch 'master' into tm_ui_jobs 2019-06-18 16:26:56 +02:00
tamasmeszaros
468516aa31 Apply fixes for the ui jobs.
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
Enrico Turri
b001eca21f #2528 - New project command automatically switches to 3D editor view 2019-06-18 14:45:10 +02:00
tamasmeszaros
d60ecb3788 Merge remote-tracking branch 'origin/master' into tm_ui_jobs 2019-06-18 12:16:24 +02:00
YuSanka
917702f252 Fixed DoubleSlider manipulation from Preview scene 2019-06-18 11:40:26 +02:00
bubnikv
0c95d4e0d9 Merge remote-tracking branch 'remotes/origin/ys_new_features' 2019-06-18 10:01:29 +02:00
bubnikv
a892fa6105 Merge remote-tracking branch 'remotes/origin/ys_bugfixing' 2019-06-18 09:57:55 +02:00
bubnikv
f72f55dc08 A bit of documentation of the mirroring and reset buttons at the side panel. 2019-06-18 09:57:07 +02:00
bubnikv
1cbd6845d5 Merge remote-tracking branch 'remotes/origin/lm_reset_buttons' 2019-06-18 09:33:33 +02:00
bubnikv
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
bubnikv
630883ad0f Extended the error message when the G-code cannot be copied to the SD card 2019-06-18 08:54:28 +02:00
Enrico Turri
5ee695b629 #2506 - Fixed crash while manually editing SLA supports 2019-06-18 08:53:13 +02:00
YuSanka
90beadb65f Check a possibility to load SLA project if there is at least one multi-part object on the bed 2019-06-17 17:04:19 +02:00
YuSanka
f70b25d2f8 Fixed SPE 957 - Impossible to add a part by "Load..." to an object, if the object has some instances 2019-06-17 15:33:58 +02:00
YuSanka
72479428d7 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-17 14:02:43 +02:00
YuSanka
7fe8965c53 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-17 13:50:12 +02:00
YuSanka
5fd3cc2676 Select edited layer after changing instead of "Layers" selection, if editing was in "Layer" mode 2019-06-17 13:46:56 +02:00
YuSanka
f394f84d51 Fixed selection after layers deleting 2019-06-17 13:09:11 +02:00
tamasmeszaros
80fddb7aaf Merge branch 'master' into tm_builtin_pad 2019-06-17 12:17:01 +02:00
Lukas Matena
05e6dbbe4b Wipe tower - refactoring (removed the abstract WipeTower class)
- abstract class WipeTower and its descendant WipeTowerPrusaMM were merged into a single (non-abstract) WipeTower class
- all uses of WipeTower::xy struct were replaced by Eigen Vec2f (it is no longer necessary to be independent on libraries that PrusaSlicer uses)
- the WipeTowerPrusaMM.hpp/.cpp will be renamed in the next commit (hopefully it will retain its git history that way)
2019-06-17 10:16:07 +02:00
tamasmeszaros
ce22251707 Warning hunt session followup 2019-06-17 10:05:46 +02:00
Enrico Turri
ac8de0bcaf Follow-up of 1a91add2e6 -> Improvements to tighter camera frustrum to reduce z-fighting 2019-06-14 15:37:29 +02:00
Lukas Matena
7b07a8da83 Reset buttons: synchronization of instances/volumes 2019-06-14 15:28:09 +02:00
Lukas Matena
980c6673d4 Reset buttons - fixed rotation of instances with multiple volumes
Mirroring buttons now hide where appropriate
2019-06-14 15:28:09 +02:00
Lukas Matena
a3c1644ead Added mirroring buttons into object manipulation panel 2019-06-14 15:03:42 +02:00
Lukas Matena
9f236bc603 Added transformation reset buttons in object manipulation panel 2019-06-14 15:03:42 +02:00
Lukas Matena
aee376762e Changed handling of priming extrusions to allow injection of filament and toolchange custom gcodes
The priming extrusions were handled separately from the rest of the wipe tower toolchanges. In order to be able to use the logic from previous commit for them (custom toolchange gcodes etc), some unpleasant code shuffling was needed
2019-06-14 14:42:07 +02:00
Thomas Moore
da1aea889f Enable wipe tower for all multi-extruder configurations 2019-06-14 12:28:52 +02:00
Enrico Turri
541f58c656 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-14 10:57:29 +02:00
Enrico Turri
ed4b71eb15 Layers editing overlay rendering modified to use a texture drawn on a quad lying in a plane parallel to the camera viewport 2019-06-14 10:55:56 +02:00
Enrico Turri
1a91add2e6 Tighter camera frustrum to reduce z-fighting 2019-06-14 10:38:09 +02:00
bubnikv
dbfa4e6c83 Fix of a smart pointer gymnastics from previous commit 2019-06-13 16:55:12 +02:00
bubnikv
9379fedd43 Further C++isation of the admesh library & TriangleMesh
(copy & move constructors / operators)
2019-06-13 16:33:50 +02:00
YuSanka
7da9d2f66d Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-13 16:18:39 +02:00
YuSanka
86e7a07dd8 Fixed selection 2019-06-13 16:17:54 +02:00
YuSanka
4712c5bbdf DoubleSlider manipulation from preview scene 2019-06-13 16:10:33 +02:00
YuSanka
a9ee4ff4b5 Fixed object selection in right panel form the Scene by context menu 2019-06-13 15:35:10 +02:00
tamasmeszaros
821ca0e36a Build fix when boost is not in prefix/boost 2019-06-13 14:19:24 +02:00
YuSanka
e00774d2e2 Workarounds for selection under OSX and GTK 2019-06-13 13:00:46 +02:00
YuSanka
c9dd5f8786 Fixed updating of data for LayerEditors selection 2019-06-13 11:37:03 +02:00
Enrico Turri
a99466ef1d Method Camera::apply_projection() called at every rendered frame 2019-06-13 10:24:19 +02:00
Enrico Turri
f0b228c4d2 Added support for distance between camera position and camera target 2019-06-13 09:12:44 +02:00
Enrico Turri
26d48b7f52 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-13 08:48:19 +02:00
Enrico Turri
9805417028 Fixed method Camera::get_position() 2019-06-13 08:47:38 +02:00
Enrico Turri
7bfb0aaac0 Fixed method Camera::get_dir_forward() 2019-06-13 08:38:49 +02:00
YuSanka
1694204687 Added some logic to layers editor selection 2019-06-12 16:28:25 +02:00
tamasmeszaros
12396c3051 Fine tuning parameters and fixing pad wings when greater gaps are used. 2019-06-12 13:15:42 +02:00
Enrico Turri
428cc4e7c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-12 11:45:57 +02:00
Enrico Turri
abdb5c5d74 Fixed conflicts after git cherry-picking 39cfe819daeb7dd71bae5ff20edfbe6396dffbe8 2019-06-12 10:57:20 +02:00
Enrico Turri
d07b3fb08b Bed shape dialog refactoring 2019-06-12 10:00:51 +02:00
tamasmeszaros
6877c075dc SPE-742: Parameter layer for zero elevation feature. 2019-06-11 18:17:20 +02:00
bubnikv
0bb8ee149e Sharing TriangleMesh objects between the front end (UI) and back end
(background processing)
2019-06-11 17:08:47 +02:00
YuSanka
f0f608f247 Copy/paste Layers for OSX 2019-06-11 10:11:42 +02:00
bubnikv
0cb5b57c5c SLA gimzmo: Sharing the Mesh's indexed triangle set with IGL AABB
structure directly, without having to make a copy.
2019-06-10 22:43:21 +02:00
bubnikv
313ec7424a admesh refactoring: replaced various diagnostics outputs with boost::log 2019-06-10 19:45:38 +02:00
bubnikv
6defabea53 admesh refactoring: separation of the shared vertices / indices
into an indexed_triangle_set structure
2019-06-10 18:30:54 +02:00
YuSanka
72046598a9 Fixed OSX build 2019-06-10 15:49:41 +02:00
YuSanka
8ba447e97f Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-10 15:24:17 +02:00
YuSanka
2b6e5a0a70 Implemented Copy/Paste for Layers.
+ improved selection (in respect to the Layers)
2019-06-10 15:22:09 +02:00
Enrico Turri
c7ba8c4daa Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d 2019-06-10 11:57:42 +02:00
YuSanka
2fa87044be Implemented update_object_list_by_printer_technology() 2019-06-10 10:48:43 +02:00
YuSanka
819a4506fa Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-07 12:35:16 +02:00
YuSanka
446e37b151 Implemented extruder selection for Layers 2019-06-07 11:32:46 +02:00
bubnikv
7dd842b294 Merge remote-tracking branch 'remotes/origin/master' into vb_admesh_fix 2019-06-06 21:01:19 +02:00
bubnikv
6da1c98139 WIP: Fixing serial for Boost 1.70.0 and newer 2019-06-06 18:51:49 +02:00
YuSanka
71cc0fdb53 Some code refactoring and improvements 2019-06-06 15:56:42 +02:00
tamasmeszaros
d4fe7b5a96 Adding rotating calipers algorithm for minimum are bounding box rotation.
Cleanup, fix build on windows and add test for rotcalipers.

Try to fix compilation on windows

With updates from libnest2d
Another build fix.


Clean up and add comments.


adding rotcalipers test  and some cleanup


Trying to fix on OSX


Fix rotcalipers array indexing


Get rid of boost convex hull.


Adding helper function 'remove_collinear_points'


Importing new libnest2d upgrades.


Disable using __int128 in NFP on OSX
2019-06-06 14:27:07 +02:00
YuSanka
44c05fa209 Implemented additional settings for layers range (except of "extruder") 2019-06-05 16:47:09 +02:00
tamasmeszaros
97cbb5344e Merge branch 'master' into tm_sla_printer_mirror 2019-06-05 15:10:02 +02:00
YuSanka
67ed89c240 Fixed OSX build and a bug when for part is able to add "layer_height" option 2019-06-05 13:52:53 +02:00
YuSanka
401999b68b Next try to fix OSX build 2019-06-05 12:32:59 +02:00
YuSanka
1090105b68 Experiments with updating layer_config_ranges from UI
+ Fixed OSX build
2019-06-05 11:50:59 +02:00
YuSanka
4b3df010ab Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-05 11:16:25 +02:00
YuSanka
567f382938 Implemented focusing of the last edited range 2019-06-05 11:14:57 +02:00
Enrico Turri
836f2d777f Update 3D scene when all compressed texture data are sent to GPU 2019-06-05 10:07:59 +02:00
Enrico Turri
a9ea9b3e0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-05 07:48:32 +02:00
bubnikv
8da54139c4 WIP: Admesh - replacement of C memory allocation with std vectors 2019-06-04 22:06:42 +02:00
YuSanka
213635f559 Implemented range's min/max Z editing 2019-06-04 17:30:44 +02:00
YuSanka
4756961678 Added LayerRangeEditor class for universally editing of the layer_range's parameters
+ Implemented layer_height editing
2019-06-04 15:22:29 +02:00
YuSanka
79a89c4c8f Some code review for avoid use of OptionsGroup 2019-06-04 11:56:59 +02:00
Vojtech Kral
3c8024bddd BonjourDialog: Fix dialog flags 2019-06-03 17:41:02 +02:00
Enrico Turri
273c30c8ce Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 15:47:33 +02:00
YuSanka
51b18fddeb Changed data types 2019-06-03 15:35:21 +02:00
YuSanka
0ee0b546df Fixed a bug with a "gear" button near the filament preset (part of #2440) 2019-06-03 14:59:16 +02:00
Enrico Turri
6a8c7a8705 Fixed race condition while compressing texture data and sending them to the GPU 2019-06-03 13:53:30 +02:00
Lukas Matena
8b685c1881 Added color indicators to Purging volumes dialog 2019-06-03 10:41:34 +02:00
Enrico Turri
e6af0d3dc4 Temporary low-res texture shown while generating compressed data on the CPU 2019-06-02 11:01:51 +02:00
YuSanka
e09207e27e Fixed OSX and Linux build 2019-05-31 15:36:38 +02:00
YuSanka
5f4b7a5292 ObjectLayers::add_layer_range() -> add a layers range using "Add" button from ObjectLayers sizer 2019-05-31 15:29:09 +02:00
Enrico Turri
f0baefb6ff Asynchronous texture compression on CPU 2019-05-31 15:25:02 +02:00
YuSanka
38641ef578 ObjectLayers::del_layer_range() -> delete a layers range using "Del" button from ObjectLayers sizer 2019-05-31 10:54:52 +02:00
YuSanka
e531d224e8 Implemented delete_layers_from_object() 2019-05-30 16:53:17 +02:00
YuSanka
a516f76f94 Improved layer sizer
+ fixed build under OSX and Linux
2019-05-30 14:42:38 +02:00
YuSanka
080274c638 Added missed files to the CMakeLists.txt 2019-05-30 13:08:05 +02:00
YuSanka
b5d7909afb Merge remote-tracking branch 'origin/master' into ys_new_features 2019-05-30 12:53:21 +02:00
YuSanka
bf56d79354 Layers sizer updating 2019-05-30 12:41:16 +02:00
YuSanka
765d4264ae Implemented ObjectLayers class
+ some code refactoring
2019-05-28 16:38:04 +02:00
Enrico Turri
8012499206 Application of anisotropy to textures moved into GLTexture methods 2019-05-28 15:21:34 +02:00
Enrico Turri
886da08f89 Texture compression set as an option 2019-05-28 12:53:16 +02:00
Enrico Turri
61c41aa90f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-28 09:46:40 +02:00
YuSanka
9d19e3d2a7 Improved Delete() Add() ans Select() functions for Layer(s)Item 2019-05-27 16:13:24 +02:00
Lukas Matena
66a56941a5 SLA dialog: Prevented the slider to have zero width, even in case the text width is calculated incorrectly 2019-05-27 15:36:51 +02:00
YuSanka
dd70dd6e10 Implemented LayerItem for ObjectList 2019-05-27 14:00:34 +02:00
Enrico Turri
61730aee27 Updated shortcut dialog with new scale to fit print volume command 2019-05-24 15:53:15 +02:00
Enrico Turri
efe29b3c2d Fixed conflicts after merge with master 2019-05-24 15:29:22 +02:00
Enrico Turri
bf9740188a Code cleanup 2019-05-24 15:22:27 +02:00
Enrico Turri
734d946912 1) Added Scale to print volume menu item to objects list context menu
2) Disable [F] key when scale sizmo is dragging
2019-05-24 14:42:59 +02:00
Enrico Turri
c92940c985 Fixed conflicts after cherry-picking 844e99f84e 2019-05-24 14:42:46 +02:00
Enrico Turri
9f3a05eef3 Fixed false detection of out of print volume for sla supports 2019-05-24 14:38:05 +02:00
YuSanka
abdd76de44 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-24 12:46:36 +02:00
YuSanka
5eab933fc2 Workaround for #2331 2019-05-24 12:37:26 +02:00
Enrico Turri
302ac3a849 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-24 08:22:53 +02:00
bubnikv
ded5ad0517 Support of CJK languages in ImGUI:
Added glyph tables & CJK font (huge file!)
Added glyph tables for Turkish and Vietnamese.
Added glyph tables Thai (font is still missing)
2019-05-23 18:04:27 +02:00
YuSanka
00ebd76431 Merge remote-tracking branch 'origin/ys_bugfixing' 2019-05-23 15:24:16 +02:00
YuSanka
16508fcd93 Merge remote-tracking branch 'origin/ys_new_features' 2019-05-23 15:23:35 +02:00
YuSanka
149665742c Fix of #2318 2019-05-23 15:12:19 +02:00
Enrico Turri
3aa14bddf5 Max texture size dependent on OpenGL version on Win and Linux and on retina monitors on Mac 2019-05-23 13:49:57 +02:00
YuSanka
be2681dab6 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-05-23 12:42:59 +02:00
YuSanka
6de5b34312 Set current filament color to the ColorPicker 2019-05-23 12:39:55 +02:00
Enrico Turri
4504569f8e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-23 12:39:47 +02:00
bubnikv
666e9687ce Fixes PrusaSlicer exits after entering illegal object name #2348
For some reason, showing an error message box from inside the right panel
in place editor handler lealds to crashes at least on Windows.
Postpoing the dialog with a CallAfter cures that crash.
2019-05-23 12:18:28 +02:00
YuSanka
8e12189b37 Fixed filament color editing from Combobox (related to #2321) 2019-05-23 10:55:57 +02:00
Enrico Turri
a8e92be6eb 1) Added Scale to print volume menu item to objects list context menu
2) Disable [F] key when scale sizmo is dragging
2019-05-23 09:20:11 +02:00
YuSanka
1721a7db5b Added comments and some changes of input parameters for slider 2019-05-23 08:58:42 +02:00
Enrico Turri
763576fbc2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-23 08:29:43 +02:00
YuSanka
a1e09c3db3 Fix of an icon size slider under OSX and GTK 2019-05-22 17:08:02 +02:00
bubnikv
82740835fb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-22 15:30:55 +02:00
bubnikv
38bd13463f Fix of MMU file detection not working consistently #2317
If a 3mf or amf file does not contain slicer's profile, and if it
looks like a multi-part object, slicer shall ask for loading it
as a multi-part object.
2019-05-22 15:30:35 +02:00
Enrico Turri
844e99f84e Prototype of scale to fit print volume command 2019-05-22 14:42:38 +02:00
Enrico Turri
f70cc70626 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-22 13:59:33 +02:00
Enrico Turri
77efc33670 Fixed scaling of multiple selection 2019-05-22 13:57:39 +02:00
YuSanka
ccdd68f157 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-05-22 13:51:49 +02:00
YuSanka
d845966cbb Implemented a possibility to set a custom toolbars icon size (related to #2247 and same others) 2019-05-22 13:51:02 +02:00
bubnikv
f5ef537640 Fix of Crash on Export config Bundle (Win64) (#2307)
Export of the names of the SLA profiles was performed into the config bundle
for SLA profiles, which were nop set. A safe method is now used,
which stores an empty string in such a case.
2019-05-22 11:31:36 +02:00
Enrico Turri
efd247fc58 Use texture compression on GPU 2019-05-21 14:19:03 +02:00
tamasmeszaros
5afd0b4ee2 Fixing issues with mode switching on Linux. 2019-05-21 14:06:43 +02:00
Enrico Turri
ac368e2c9e Tech ENABLE_GENERIC_SUBPARTS_PLACEMENT set as default 2019-05-21 10:01:04 +02:00
Enrico Turri
975ccc4ac1 Tech ENABLE_VOLUMES_CENTERING_FIXES set as default 2019-05-21 09:42:59 +02:00
Enrico Turri
2a973c1dfa Removed tech DISABLE_DESELECT_ALL_MENU_ITEM 2019-05-21 09:23:45 +02:00
Enrico Turri
84632d32ba Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-21 08:23:53 +02:00
bubnikv
fb6ae5296e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-20 18:49:36 +02:00
bubnikv
45a2ced191 Fix of a crash when deleting all objects. 2019-05-20 18:49:32 +02:00
Vojtech Kral
28d28a54bf Preset updating: Judge dev version based on version online, not current 2019-05-20 18:36:55 +02:00
bubnikv
9bea752567 Fix of the layer_height / first_layer_height non zero test. 2019-05-20 17:05:16 +02:00
YuSanka
b65d5683e2 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-20 16:38:07 +02:00
YuSanka
213ee6baae Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-20 16:37:13 +02:00
Lukas Matena
03a62e5721 Fixed rendering of support points in SLA gizmo for mirrored objects 2019-05-20 16:33:57 +02:00
YuSanka
7b84d1e710 Fix of #2277
+ new POT
2019-05-20 16:05:15 +02:00
Enrico Turri
b0200c04ae Fixed debug technology ENABLE_RENDER_SELECTION_CENTER 2019-05-20 15:59:54 +02:00
bubnikv
8f72a0cad8 Fixed the localized PrusaSlicer change log link.
Fixed a typo in the code.
2019-05-20 15:32:43 +02:00
bubnikv
8eb31e6d8d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-20 15:00:39 +02:00
bubnikv
dc0e53cbdd When testing for the spin control input bounds, test for the MIN_INT
as well
2019-05-20 15:00:35 +02:00
Vojtech Kral
032cf3cd47
Merge pull request #2272 from wavexx/do_not_refresh_until_initialized
Delay refresh until initialized
2019-05-20 14:48:47 +02:00
Vojtech Kral
8133aa1324 Fix wxSpinCtrl in settings on Mac OS, cf. #2237 2019-05-20 14:39:42 +02:00
bubnikv
cd1a445c83 Fixed update of the project name in the status line in case the name
of the project contains dots.
2019-05-20 14:30:55 +02:00
Enrico Turri
951f9c1dab Reset tooltip in objects list when no item is hovered 2019-05-20 13:52:58 +02:00
bubnikv
08388d3daa Fix of the previous commit 2019-05-20 12:22:08 +02:00
bubnikv
1ecb98e35f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-20 12:21:36 +02:00
bubnikv
f6de7a629b Hopefully a fix of support_material_contact_distance: numeric input not valid (#2278)
Fixed an issue where one was comparing non-localized label with a localized one.
2019-05-20 12:21:05 +02:00
Enrico Turri
0132313ee0 Fixed position of instances after paste object 2019-05-20 10:33:49 +02:00
Enrico Turri
7bb79062e6 Ctrl+Shift+S in place of Ctrl+Alt+S for command Save Project as on Mac 2019-05-20 10:02:51 +02:00
Enrico Turri
783a527109 Added imgui debug dialog for camera statistics 2019-05-20 09:39:57 +02:00
Enrico Turri
c5e4ada75b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-20 08:28:34 +02:00
bubnikv
9fca67d281 Fixed an incorrect language specifier in ImGUI font initialization
for Korean language.
2019-05-19 10:52:09 +02:00
tamasmeszaros
38d54d779a Mirror checkboxes added to the UI.
Everything seems to work fine.
2019-05-18 23:21:59 +02:00
Yuri D'Elia
89ff5d03eb Delay refresh until initialized
on_idle can be called too early on wxGtk3/X11.
Check for m_initialized before refreshing.
2019-05-18 15:07:33 +02:00
Vojtech Kral
b234a1b7a7 Use mac_max_scaling_factor() in create_scaled_bitmap() 2019-05-17 19:16:03 +02:00
bubnikv
5161dc43d6 Enumerate screens and calculate maximum screen scaling. 2019-05-17 19:16:03 +02:00
Vojtech Kral
8c862ade29 Revert 6b379428d4 2019-05-17 19:11:11 +02:00
Vojtech Kral
eebb9e3fe7 Fix double wizard on incompatible bundle, for real this time 2019-05-17 19:09:06 +02:00
Vojtech Kral
b205daa437 Revert "Fix double wizard on incompatible bundle"
This reverts commit 9c288df1b6.
2019-05-17 17:50:06 +02:00
bubnikv
c1cb40c4f0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-17 16:32:01 +02:00
bubnikv
04397c7948 Changed the G-code export and send to OctoPrint GUI code
to store the G-code next to the project file if it exists,
and to process the project name with the PlaceholderParser.
2019-05-17 16:27:00 +02:00
YuSanka
74b3351aeb Typo to last commit 2019-05-17 16:05:32 +02:00
YuSanka
6b379428d4 Workaround to fix #2251 2019-05-17 15:49:37 +02:00
Enrico Turri
64bd392e7d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-17 15:14:08 +02:00
Vojtech Kral
9c288df1b6 Fix double wizard on incompatible bundle 2019-05-17 15:04:37 +02:00
Enrico Turri
e354a306e6 Fixed delayed update of 3D scene when moving preview layers' slider (as reported in #1250) 2019-05-17 15:04:06 +02:00
bubnikv
e358dd9c01 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-17 13:41:35 +02:00
bubnikv
b51b2d30c9 Fixed the previous commit, SystemParametersInfoForDpi was called
with incorrect parameters.
2019-05-17 13:41:19 +02:00
Vojtech Kral
83bdb46209 Firmware updater: Make device names consistent 2019-05-17 13:23:21 +02:00
bubnikv
563a1a8441 Fixed rare font scaling issue on Windows 10. 2019-05-17 13:15:32 +02:00
Enrico Turri
a098f118b6 Follow-up of c62006048f -> Notify Windows only when the its registry is changed 2019-05-17 11:35:35 +02:00
bubnikv
de8db7ccc4 Changed download link for PrusaSlicer.version to prusa3d download server. 2019-05-17 09:50:29 +02:00
bubnikv
670a138f32 Merge remote-tracking branch 'remotes/origin/ys_new_features' 2019-05-16 17:02:07 +02:00
YuSanka
803e748849 Added CopyrightsDialog 2019-05-16 16:55:44 +02:00
bubnikv
a3b3c78a1d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-16 16:07:14 +02:00
bubnikv
57a7425b0f Fix of New assertion failure with 2.0.0rc #2250
Calls to Dialog::Close() after Dialog::EndModal() were removed.
2019-05-16 16:06:57 +02:00
bubnikv
df19314645 Changed the default of output_filename_format to "[input_filename_base].gcode"
for FDM, and "[input_filename_base].sl1" for the SLA technology.
This improves the situation of
"Filename creation with variables broken"
https://github.com/prusa3d/PrusaSlicer/issues/1918
where anything after the last dot in the file name is considered
as an extension, therefore the .gcode resp. .sl1 extension is not added.
Now the user gets the output_filename_format filled in with the correct
extension.
Also now if the output_filename_format is empty, the output name
is generated anyway.
2019-05-16 15:55:26 +02:00
Enrico Turri
8c6304688d Camera refactoring: Frustrum calculations moved into Camera class 2019-05-16 15:54:11 +02:00
YuSanka
cf35d750a0 Merge remote-tracking branch 'origin/ys_bugfixing' 2019-05-16 13:27:18 +02:00
YuSanka
cc933789eb Fix of #2249 2019-05-16 13:16:43 +02:00
Enrico Turri
8e31668704 Fixed method Vec3d Camera::get_position() const 2019-05-16 12:06:02 +02:00
bubnikv
fc0bc15869 Fixed a regression, where in the object list when in-place editing
the object name, the accelerator keys were still captured and caused
weired effects or crashes.
2019-05-16 10:37:06 +02:00
bubnikv
d13d3f39af Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-15 17:16:41 +02:00
bubnikv
325a5b8682 Fix of mangled UTF8 characters in ModelVolume name after copy / paste. 2019-05-15 17:16:31 +02:00
bubnikv
79fe6b9db3 Fix of switching the default print / filament / sla print / sla material
profiles after switching the technology from FFF to SLA and vice versa.
The solution is to keep the print / filament / sla print / sla material
settings undefined until the particular technology is activated for
the first time. Then the settings name persists indefinitely even
if all the printes for that particular printer technology are deleted.
2019-05-15 17:15:52 +02:00
YuSanka
0bcb449fb4 em_unit initialization in one place (DPIAware constructor) 2019-05-15 16:44:33 +02:00
YuSanka
b099ca1d4e Deleted unnecessary size settings 2019-05-15 16:01:40 +02:00
bubnikv
f029ed8fe1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-15 15:22:24 +02:00
bubnikv
036920a43b Fix of a regression bug - joint rotation of multiple instances.
The bug was likely introduced with b89e95aea7
2019-05-15 15:22:18 +02:00
Enrico Turri
0298e9077f Fix build of d0fd8a4a29 on OsX and Linux 2019-05-15 14:55:51 +02:00
Enrico Turri
d0fd8a4a29 Follow-up of f54fd10897 -> Project name stored with no extension, updated after drag and drop of .3mf or .amf files and used by export g-code and send g-code commands 2019-05-15 14:09:16 +02:00
YuSanka
41f29c9f09 Fix of #2237 2019-05-15 12:30:32 +02:00
bubnikv
84f09df03e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-15 10:59:38 +02:00
bubnikv
44306e17e9 Added square brackets [] to banned characters in the profile name.
Fixes "Unable to import config bundle #2236"
2019-05-15 10:59:21 +02:00
Enrico Turri
64d4e7cd0c Follow-up of 8ae1dfd4d0 -> Fixed build on OsX 2019-05-15 10:59:00 +02:00
YuSanka
f0acf4f745 Fixed a manually editing of a "Filament Settings -> Advanced -> Filament type" (#2232) 2019-05-15 10:42:15 +02:00
bubnikv
6bc6806a2e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-15 10:24:10 +02:00
bubnikv
6c3f2609e4 Fix of OctoPrint upload dialog persistance:
Directory always stays remembered in the "Send G-code to printer host" dialog #2234
2019-05-15 10:24:03 +02:00
Enrico Turri
8ae1dfd4d0 File->Open Project allows to load .amf files 2019-05-15 10:23:02 +02:00
bubnikv
3f08d9f30d Changed references to renamed github project
https://github.com/prusa3d/PrusaSlicer
2019-05-14 19:46:01 +02:00
bubnikv
6f71a0fed3 Updated the About dialog with the "based on Slic3r" note. 2019-05-14 18:10:20 +02:00
bubnikv
d54e14a41d Fixed a crash on deleting objects due to the ObjectList accessing
released data before the selection was updated on the GLScene.
2019-05-14 16:37:32 +02:00
YuSanka
6e5df76f2e Don't call SetFont() for MainFrame and wxNotebook under OSX to avoid name cutting in ObjectList 2019-05-14 15:41:20 +02:00
Enrico Turri
bdd9ed123a Updated keyboard shortcuts dialog 2019-05-14 15:16:37 +02:00
Enrico Turri
f54fd10897 Implementation of File->New project menu item 2019-05-14 15:00:24 +02:00
Vojtech Kral
11662f87b8 Updating: dev_version based on build_id as well 2019-05-14 13:30:55 +02:00
Vojtech Kral
6c5bdeadc3 Updating: Add localized links 2019-05-14 13:30:55 +02:00
bubnikv
62847736c8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 12:35:37 +02:00
bubnikv
8a405d5a1c Changed the wizard to generate explicit extrusion widths
for the custom profile (not the zeros).
Changed the default values for filament_diameter and nozzle_diameter.
2019-05-14 12:35:19 +02:00
YuSanka
66aee035ac Set a max extruder's count for the Additional Setting "Extruders".
+ cat sidetext for options from Additional Setting "Extrusion Width".
2019-05-14 12:17:34 +02:00
Enrico Turri
5f6c7853d4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 11:57:48 +02:00
Enrico Turri
14c4469cbf Added Esc shortcut and menu item for command deselect all 2019-05-14 11:57:39 +02:00
bubnikv
cd13b90457 Merge branch 'lm_sla_dialog_scaling' 2019-05-14 11:19:08 +02:00
tamasmeszaros
170789a787 Some comments and avoid race condition with background process. 2019-05-14 10:34:11 +02:00
Enrico Turri
c4c292168d Merge branch 'et_copy_and_paste' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 10:31:56 +02:00
Enrico Turri
016c5f6557 Added placeholder for File->New Project menu item 2019-05-14 10:30:14 +02:00
YuSanka
ca2fb88221 Fixed "bed_shape" reverting 2019-05-14 10:08:52 +02:00
YuSanka
b30405b572 Fixed typo (image grayscaling) 2019-05-14 10:08:52 +02:00
Enrico Turri
979b66f231 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-14 09:07:53 +02:00
bubnikv
229ae454b0 Merge remote-tracking branch 'remotes/origin/master' into lm_sla_dialog_scaling 2019-05-13 19:39:17 +02:00
tamasmeszaros
696ade15ca New way of starting arrange and rotation optimization.
To prevent segfaults when exiting while processing is running.
2019-05-13 18:58:56 +02:00
YuSanka
42ab22e243 Typo fix 2019-05-13 18:21:47 +02:00
bubnikv
03ab6aedad Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-13 18:01:18 +02:00
bubnikv
0787fa861a Updated handling of the SLIC3R_BUILD_ID key 2019-05-13 18:01:00 +02:00
YuSanka
bfaa92eabb Added grayscale parameter for create_scaled_bitmap() 2019-05-13 17:58:15 +02:00
bubnikv
f47839e824 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-13 17:10:17 +02:00
YuSanka
5979e21f2c Set default width for ModeButtons to correct rendering on OnFocus under OSX 2019-05-13 17:03:09 +02:00