Commit Graph

1219 Commits

Author SHA1 Message Date
b2a653ebcc Fix non thread-safe data flow between plater and hollowing gizmo. 2019-11-11 17:27:32 +01:00
448d64c0f7 Progress indication for hollowing gizmo. 2019-11-11 16:10:46 +01:00
9607983880 Save/Load new color print data to/from amf and 3mf files. 2019-11-11 16:01:34 +01:00
10f2d23ff6 Merge branch 'tm_openvdb_integration' into lm_tm_hollowing
* Refactor file names in SLA dir
2019-11-11 12:55:22 +01:00
428f09b114 Use constant names for G-codes like M600, M601 and "tool_change"(Change extruder) 2019-11-11 09:38:45 +01:00
bf60f556ed Merge remote-tracking branch 'origin/master' into ys_resin_cost 2019-11-08 19:33:18 +01:00
efc7453656 1) Added new tech ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE
2) Imgui dialog replaces texture for reset button and tooltip when layer editing is active
2019-11-07 15:55:45 +01:00
6a6edf6484 Hollowing task triggered by the gizmo now spawns a UI job to not block the UI thread
The AABB tree calculation is still done in the UI thread, so it gets blocked for some time
2019-11-07 14:25:03 +01:00
4af537de02 Updated DoubleSlider band. Added smart color selection for M600 2019-11-07 13:57:43 +01:00
b9454e28a4 Follow up, unify boost::thread usage. 2019-11-07 12:58:18 +01:00
364e328595 Change std::async to boost thread in Plater::priv::Job 2019-11-07 12:09:04 +01:00
35fd632316 Fixed conflicts after merge with master 2019-11-07 09:55:44 +01:00
ac2d912826 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-05 13:58:13 +01:00
8492b57e66 Merge branch 'master' of https://github.com/BryanSmithDev/PrusaSlicer into BryanSmithDev-master 2019-11-05 11:37:40 +01:00
918c4697c0 ENABLE_THUMBNAIL_GENERATOR -> Transparent background for thumbnails saved into .3mf 2019-11-04 11:59:23 +01:00
1830d560e5 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-11-03 19:34:34 +01:00
4718712905 ENABLE_THUMBNAIL_GENERATOR -> Fixed potential race condition when generating thumbnails 2019-10-30 10:09:58 +01:00
2477b7c018 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-29 14:47:59 +01:00
13001e36d2 Fixed several warnings 2019-10-29 10:40:34 +01:00
c0efcd46c6 ENABLE_THUMBNAIL_GENERATOR -> Allow for multiple thumbnails into gcode and sl1 files 2019-10-25 13:59:13 +02:00
8fc4e758d8 ENABLE_THUMBNAIL_GENERATOR -> Added a comment 2019-10-25 08:19:02 +02:00
4c988472ac ENABLE_THUMBNAIL_GENERATOR -> Fixed thumbnail generation for SLA and 3mf 2019-10-24 15:56:10 +02:00
6881a878c6 ENABLE_THUMBNAIL_GENERATOR -> Refactoring to simplify code 2019-10-24 12:09:09 +02:00
c68b3b380c Improvements for extruder selector (added possibility to create combobox with thin icons)
Call of an update extruder selector after a change of extruder or filament color
2019-10-24 10:52:34 +02:00
f9ce06effd ENABLE_THUMBNAIL_GENERATOR -> Code cleanup 2019-10-24 10:25:40 +02:00
e539c8bbfd ENABLE_THUMBNAIL_GENERATOR -> Add thumbnail data into gcode output 2019-10-24 10:06:31 +02:00
6cc11828ab ENABLE_THUMBNAIL_GENERATOR -> Add file thumbnail/thumbnail.png into sla output 2019-10-24 08:46:39 +02:00
5a3111528d ENABLE_THUMBNAIL_GENERATOR -> WIP: Added missing include and preparation for adding thumbnail to exported sla archive files 2019-10-23 16:01:23 +02:00
5cfcfb62db ENABLE_THUMBNAIL_GENERATOR -> WIP: Refactoring and preparation for adding thumbnails to exported gcode and 3mf files 2019-10-23 13:31:24 +02:00
c01cb9aad0 Added tech ENABLE_THUMBNAIL_GENERATOR -> 1st installment of generation of thumbnail from plater (WIP) 2019-10-22 16:02:31 +02:00
3b6b9219a9 Implemented possibility to set extruder sequence for whole print 2019-10-18 12:35:35 +02:00
c469699a7c Improved extruder_selector for DoubleSlider 2019-10-16 10:30:29 +02:00
9fbba6d8bd Implemented custom extruder(tool) change from DoubleSlider 2019-10-15 15:42:30 +02:00
2399d964de ENABLE_3DCONNEXION_DEVICES tech set as default 2019-10-11 15:51:36 +02:00
ee8261fbc1 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-10-10 16:17:09 +02:00
4ea0e7bf9d Information from DoubleSlider is saved to Model
GCode creating can work with that values.
2019-10-10 16:03:58 +02:00
b15baf513a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 15:44:52 +02:00
212333514f Fixed crash in Plater::priv::can_reload_from_disk() 2019-10-10 14:44:52 +02:00
d181b71e0f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 12:16:44 +02:00
d3c337b69a Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
6b57febe0c ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver 2019-10-08 08:44:50 +02:00
05b8adb67b Merge branch 'tm_arrange_test_extend' 2019-10-07 17:57:34 +02:00
48a22d9410 Merge branch 'master' into materials 2019-10-07 17:23:37 +02:00
28730791fa Extend libnest tests, remove some warnings, faster catch2 compilation.
Also, improve libnest2d::nest interface.
2019-10-07 17:16:40 +02:00
c9ed137d27 Fixed get extruder color for SLA presets 2019-10-07 12:36:16 +02:00
b5c13962f9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-07 09:31:43 +02:00
e3ab20a56b Merge branch 'tm_sla_tests' 2019-10-04 18:34:08 +02:00
e37c68aecb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-04 07:34:43 +02:00
a8760a5526 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D 2019-10-03 11:38:31 +02:00
ce3db145e4 Added color for extruder 2019-10-01 18:19:28 +02:00