9e7e1fb5e2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-11-18 14:51:06 +01:00
a1aa343416
Follow-up of b2a6a07d72 -> Fixed code to render supports and pad into thumbnails for sla printer (currently commented out)
2019-11-16 09:04:06 +01:00
b2a6a07d72
Make the .gcode and .sl1 thumbnails configurable through printer profile.
2019-11-15 17:33:31 +01:00
49175c3112
Merge remote-tracking branch 'origin/master' into ys_resin_cost
2019-11-08 19:33:18 +01:00
ad0a38e419
Follow up, unify boost::thread usage.
2019-11-07 12:58:18 +01:00
67f55d3b23
Change std::async to boost thread in Plater::priv::Job
2019-11-07 12:09:04 +01:00
a624590b36
Fixed conflicts after merge with master
2019-11-07 09:55:44 +01:00
d8dca69d60
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail
2019-11-05 13:58:13 +01:00
7a7183383f
Merge branch 'master' of https://github.com/BryanSmithDev/PrusaSlicer into BryanSmithDev-master
2019-11-05 11:37:40 +01:00
3d450df680
ENABLE_THUMBNAIL_GENERATOR -> Transparent background for thumbnails saved into .3mf
2019-11-04 11:59:23 +01:00
f6453aab1b
ENABLE_THUMBNAIL_GENERATOR -> Fixed potential race condition when generating thumbnails
2019-10-30 10:09:58 +01:00
47dfe60f0e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail
2019-10-29 14:47:59 +01:00
8b5561aec7
Fixed several warnings
2019-10-29 10:40:34 +01:00
2d5c28d6d1
ENABLE_THUMBNAIL_GENERATOR -> Allow for multiple thumbnails into gcode and sl1 files
2019-10-25 13:59:13 +02:00
f7d3cf063b
ENABLE_THUMBNAIL_GENERATOR -> Added a comment
2019-10-25 08:19:02 +02:00
296d79abf7
ENABLE_THUMBNAIL_GENERATOR -> Fixed thumbnail generation for SLA and 3mf
2019-10-24 15:56:10 +02:00
29fd0ef7c6
ENABLE_THUMBNAIL_GENERATOR -> Refactoring to simplify code
2019-10-24 12:09:09 +02:00
6d5572ae47
ENABLE_THUMBNAIL_GENERATOR -> Code cleanup
2019-10-24 10:25:40 +02:00
5609f53797
ENABLE_THUMBNAIL_GENERATOR -> Add thumbnail data into gcode output
2019-10-24 10:06:31 +02:00
ad0a9cf439
ENABLE_THUMBNAIL_GENERATOR -> Add file thumbnail/thumbnail.png into sla output
2019-10-24 08:46:39 +02:00
16fd2820db
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
4d1153c866
ENABLE_THUMBNAIL_GENERATOR -> WIP: Refactoring and preparation for adding thumbnails to exported gcode and 3mf files
2019-10-23 13:31:24 +02:00
32a42f2808
Added tech ENABLE_THUMBNAIL_GENERATOR -> 1st installment of generation of thumbnail from plater (WIP)
2019-10-22 16:02:31 +02:00
e6403a74ef
ENABLE_3DCONNEXION_DEVICES tech set as default
2019-10-11 15:51:36 +02:00
4d1cfda14a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-10 15:44:52 +02:00
e51d970b2e
Fixed crash in Plater::priv::can_reload_from_disk()
2019-10-10 14:44:52 +02:00
9fc1cc6f84
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-09 12:16:44 +02:00
835ee148e5
Fixed conflicts after merging with master
2019-10-09 11:17:48 +02:00
8aa33a9e05
ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver
2019-10-08 08:44:50 +02:00
272e9f11e3
Merge branch 'tm_arrange_test_extend'
2019-10-07 17:57:34 +02:00
fd6d32135b
Merge branch 'master' into materials
2019-10-07 17:23:37 +02:00
72ac8d68f0
Extend libnest tests, remove some warnings, faster catch2 compilation.
...
Also, improve libnest2d::nest interface.
2019-10-07 17:16:40 +02:00
47a8b49f8b
Fixed get extruder color for SLA presets
2019-10-07 12:36:16 +02:00
6f85b0885a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-07 09:31:43 +02:00
5bf3d5aabf
Merge branch 'tm_sla_tests'
2019-10-04 18:34:08 +02:00
243cb5d524
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-04 07:34:43 +02:00
587effbedf
ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D
2019-10-03 11:38:31 +02:00
d7ebc4de5b
Added color for extruder
2019-10-01 18:19:28 +02:00
e675a5d5c6
Reworked pad creation algorithm with new parameters:
...
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +02:00
eb93d2a32d
Merge branch 'master' into materials
2019-09-30 16:12:48 +02:00
eabaa21df2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:21 +02:00
c07a193b4e
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
904bbcc006
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
4b3eab0ed9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-27 14:52:30 +02:00
f958cfd2ff
ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices
...
Implemented using hidapi library (https://github.com/libusb/hidapi ) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference
Unsolved issues:
- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out
- wxWidgets does not detect devices being connected/disconnected to the pc
- Current state forces a continuous rendering
- Current state misses dependence on camera zoom
- Non intuitive movement limits
- Translation and rotation speed factors are hardcoded
- Number of device buttons hardcoded
2019-09-27 14:52:19 +02:00
82bc243281
Implemented possibility to set a resin cost
2019-09-26 16:36:31 +02:00
dbc51a140d
Fixed erroneous use of logical OR where bitwise OR was meant
...
Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used
2019-09-25 12:18:30 +02:00
e6604afd05
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
2dc9949a4c
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
c0576a8770
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 08:27:01 +02:00
Enrico Turri