Lukas Matena
b3f15b1c98
Merge branch 'master' into lm_tm_hollowing
2019-12-20 10:33:53 +01:00
David Kocik
d7698a36cb
changes in plater.cpp
2019-12-19 14:19:41 +01:00
Enrico Turri
3b8d42a64f
Fixed selection after cut command
2019-12-19 10:06:46 +01:00
Enrico Turri
7013f148b5
Store new source path in ModelVolume after reload from disk
2019-12-19 09:02:50 +01:00
David Kocik
3a54279cec
Merge branch 'master' into dk_remote_devices
2019-12-19 08:58:11 +01:00
Enrico Turri
c9dcf3e865
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-12-18 15:33:12 +01:00
Enrico Turri
b2b037eb0b
Show requested filename on title of reload from disk dialog on Mac
2019-12-18 15:32:25 +01:00
David Kocik
df36a7dcb2
merge with master
2019-12-18 10:45:16 +01:00
David Kocik
1fa464af96
removableDriveManager bug fixes
2019-12-18 10:34:26 +01:00
YuSanka
7650732c61
Show context menu for a multi-object selection on 3DScene,
...
add "Reload from disk" item for this menu
2019-12-18 09:11:33 +01:00
YuSanka
afcc6bbb08
Code refactoring for Color change implementation
2019-12-17 08:37:50 +01:00
David Kocik
a029e689d8
verification of save path
2019-12-16 17:15:27 +01:00
David Kocik
bfc9dda1f6
save last path earlier
2019-12-16 15:47:36 +01:00
David Kocik
0db9815467
correct beahvior when disconnecting device other way than button in slicer
2019-12-16 13:53:12 +01:00
tamasmeszaros
a9403319b7
Separate Job, ProgressStatusBar and ProgressIndicator
...
* Separate GUI::Job
* make use of ProgressIndicator interface
* make ProgressStatusbar independent from GUI::App
2019-12-16 11:07:43 +01:00
Enrico Turri
ca518c003f
Added message dialog informing the user that it is not allowed to change the filename when using reload from disk command
2019-12-16 10:24:08 +01:00
David Kocik
507134accb
merge
2019-12-13 18:02:54 +01:00
David Kocik
5a26be1150
message box about succesful removal
2019-12-13 18:02:25 +01:00
YuSanka
7d0d70534b
Fixed "actions" buttons size under OSX
2019-12-13 17:56:04 +01:00
David Kocik
81a2f8535a
merge
2019-12-13 15:26:42 +01:00
YuSanka
2df903640b
Implemented rescaling for "Remove device" button
2019-12-13 15:13:55 +01:00
David Kocik
6de41c6147
button show after write
2019-12-13 15:13:55 +01:00
David Kocik
9c79c7f644
prev commit linux part
2019-12-13 15:12:20 +01:00
David Kocik
1ec7fc23e2
check if last path is on rem drive
2019-12-13 15:07:35 +01:00
David Kocik
acab61fa54
comments
2019-12-13 13:51:46 +01:00
David Kocik
5a9ec0d074
button show after write
2019-12-13 13:51:46 +01:00
David Kocik
9085440c15
button show after write
2019-12-13 13:51:46 +01:00
David Kocik
2c7b711f76
eject button after export
2019-12-13 13:51:46 +01:00
David Kocik
68125b12a7
eject button functionality
2019-12-13 13:51:46 +01:00
David Kocik
a01eec34f9
eject button functionality
2019-12-13 13:51:46 +01:00
David Kocik
8f0eef8f36
eject button functionality
2019-12-13 13:51:46 +01:00
David Kocik
f5e3750d23
eject button functionality
2019-12-13 13:51:46 +01:00
YuSanka
c47fda39f1
Implemented "Disconnect" button
2019-12-13 13:51:45 +01:00
David Kocik
63ee4e3a2f
last path functions
2019-12-13 13:51:45 +01:00
David Kocik
735308b794
refactoring
2019-12-13 13:51:45 +01:00
David Kocik
852d8ad5cc
check if last path is on rem drive
2019-12-13 13:51:45 +01:00
YuSanka
7e87d093fc
Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices
2019-12-13 13:24:12 +01:00
YuSanka
e5fcb587e2
Implemented rescaling for "Remove device" button
2019-12-13 13:23:55 +01:00
David Kocik
8895e944cf
comments
2019-12-13 13:04:09 +01:00
Enrico Turri
62e36cd2d5
Fixed filename shown in open file dialog for reload from disk
2019-12-13 12:41:46 +01:00
David Kocik
e1d9de3ca4
button show after write
2019-12-12 15:43:14 +01:00
David Kocik
95ccc2c4df
button show after write
2019-12-12 14:56:30 +01:00
Lukas Matena
537260494d
Merge branch 'master' into lm_tm_hollowing
2019-12-12 11:37:33 +01:00
David Kocik
0cb9a4c542
eject button after export
2019-12-12 10:48:33 +01:00
David Kocik
e2048775f6
eject button functionality
2019-12-11 17:42:56 +01:00
YuSanka
d66761e030
Fixed wrong context menu selection for instance(s). Related to #3275
2019-12-11 16:07:00 +01:00
David Kocik
6dddc1cc6b
eject button functionality
2019-12-11 15:02:20 +01:00
David Kocik
4a7f50ad66
eject button functionality
2019-12-11 14:53:28 +01:00
David Kocik
975642e3e0
eject button functionality
2019-12-11 12:28:51 +01:00
YuSanka
37b6d9e8ad
Implemented "Disconnect" button
2019-12-10 17:31:27 +01:00
Enrico Turri
b63b5125b6
Enable selection for missing files in reload from disk command
2019-12-10 14:42:28 +01:00
Enrico Turri
bdfed9d9ef
Attempt to fix view toolbar background not showing up on Mac when using dark mode
2019-12-10 10:56:21 +01:00
Enrico Turri
68812b081f
Removed obsolete (and unused) code
2019-12-09 15:40:14 +01:00
David Kocik
5f54856be0
last path functions
2019-12-05 14:07:02 +01:00
YuSanka
ee71f83939
Localization improvements:
...
* fixed "\n" at the end of phrases
+ updated list of files to localization
+ new PrusaSlicer.pot
+ Japanese localization
2019-12-04 11:14:13 +01:00
David Kocik
2ecc8a1b6f
merge s kocikdav fork removable_drives branch
2019-12-03 11:35:46 +01:00
YuSanka
22aa17128a
Fixed function to get a profile name by alias for all preset collections
2019-11-29 11:02:58 +01:00
Enrico Turri
58fa4f32de
Revert e3b9c755aa
2019-11-29 11:01:51 +01:00
Enrico Turri
e3b9c755aa
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Attempt to fix events on Linux and Mac
2019-11-28 15:41:44 +01:00
Enrico Turri
ddd1df1552
ENABLE_THUMBNAIL_GENERATOR -> render printbed into thumbnails
2019-11-28 14:18:24 +01:00
David Kocik
7301b4f7dd
refactoring
2019-11-28 13:50:58 +01:00
YuSanka
773dace33c
Merge remote-tracking branch 'origin/master' into ys_aliases
2019-11-28 10:34:05 +01:00
YuSanka
dfd38c7818
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
2019-11-28 09:01:14 +01:00
YuSanka
322c0230c3
Code cleaning - deleted extruder selector
2019-11-27 16:03:16 +01:00
YuSanka
901a20b3b1
Code cleaning
2019-11-27 15:27:44 +01:00
David Kocik
97a9f245f9
check if last path is on rem drive
2019-11-27 13:30:45 +01:00
Enrico Turri
5fcf41a3aa
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added undo/redo
2019-11-27 11:08:10 +01:00
YuSanka
6a68002a1f
Implemented use of aliases in Plater's preset comboboxes
2019-11-25 15:57:36 +01:00
Enrico Turri
44d7ac4474
Fixed crash when calling Reload from disk command after slicing on SLA printer
2019-11-25 14:42:36 +01:00
Enrico Turri
599403ba94
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-11-22 14:40:59 +01:00
Enrico Turri
62e69d986a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height
2019-11-22 14:18:51 +01:00
Enrico Turri
6df506e482
ENABLE_THUMBNAIL_GENERATOR -> Thumbnails generated using a callback function
2019-11-22 12:39:03 +01:00
Enrico Turri
aea32ffe72
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added 'keep min' option to smoothing algorithm
2019-11-20 14:06:30 +01:00
tamasmeszaros
7011c58faa
Merge branch 'master' into lm_tm_hollowing
2019-11-18 17:50:56 +01:00
Enrico Turri
9e7e1fb5e2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-11-18 14:51:06 +01:00
Enrico Turri
28dedd65f0
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Code cleanup
2019-11-18 10:25:23 +01:00
YuSanka
ec6c87756f
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
2019-11-18 09:18:25 +01:00
Enrico Turri
e1f06a1b84
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height
2019-11-18 08:12:24 +01:00
enricoturri1966
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
YuSanka
bc68b8eaf2
ExtruderSequenceDialog :
...
Fixed layouts after the second opening of the dialog.
(Removing any extruder from the sequence does not cause an incorrect layout)
Validation of entered values added
(0 is not a valid value)
2019-11-16 02:12:37 +01:00
bubnikv
b2a6a07d72
Make the .gcode and .sl1 thumbnails configurable through printer profile.
2019-11-15 17:33:31 +01:00
Enrico Turri
f548a4d7d6
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Profile smoothing using gaussian blur
2019-11-15 15:49:07 +01:00
Enrico Turri
5baffdb9c2
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Customizable cusp value
2019-11-14 10:22:48 +01:00
tamasmeszaros
4e067c42f0
SLAPrint steps moved to separate module.
...
* Lambdas replaced with class methods
2019-11-12 16:54:59 +01:00
Enrico Turri
b77ba32bb2
Adaptive layer height profile -> Added Adaptive button to imgui dialog
2019-11-12 14:18:43 +01:00
Enrico Turri
9d5da8b18c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height
2019-11-12 12:43:16 +01:00
tamasmeszaros
a69e80b987
Fix non thread-safe data flow between plater and hollowing gizmo.
2019-11-11 17:27:32 +01:00
tamasmeszaros
60650d0dfc
Progress indication for hollowing gizmo.
2019-11-11 16:10:46 +01:00
YuSanka
519291394a
Save/Load new color print data to/from amf and 3mf files.
2019-11-11 16:01:34 +01:00
tamasmeszaros
c22423a219
Merge branch 'tm_openvdb_integration' into lm_tm_hollowing
...
* Refactor file names in SLA dir
2019-11-11 12:55:22 +01:00
YuSanka
6c8bb51f4a
Use constant names for G-codes like M600, M601 and "tool_change"(Change extruder)
2019-11-11 09:38:45 +01:00
YuSanka
49175c3112
Merge remote-tracking branch 'origin/master' into ys_resin_cost
2019-11-08 19:33:18 +01:00
Enrico Turri
6e4060569a
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
Lukas Matena
9836533cb3
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
YuSanka
72852ffab5
Updated DoubleSlider band. Added smart color selection for M600
2019-11-07 13:57:43 +01:00
tamasmeszaros
ad0a38e419
Follow up, unify boost::thread usage.
2019-11-07 12:58:18 +01:00
tamasmeszaros
67f55d3b23
Change std::async to boost thread in Plater::priv::Job
2019-11-07 12:09:04 +01:00
Enrico Turri
a624590b36
Fixed conflicts after merge with master
2019-11-07 09:55:44 +01:00
Enrico Turri
d8dca69d60
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail
2019-11-05 13:58:13 +01:00
bubnikv
7a7183383f
Merge branch 'master' of https://github.com/BryanSmithDev/PrusaSlicer into BryanSmithDev-master
2019-11-05 11:37:40 +01:00
Enrico Turri
3d450df680
ENABLE_THUMBNAIL_GENERATOR -> Transparent background for thumbnails saved into .3mf
2019-11-04 11:59:23 +01:00
YuSanka
c564f693e9
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
2019-11-03 19:34:34 +01:00
Enrico Turri
f6453aab1b
ENABLE_THUMBNAIL_GENERATOR -> Fixed potential race condition when generating thumbnails
2019-10-30 10:09:58 +01:00
Enrico Turri
47dfe60f0e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail
2019-10-29 14:47:59 +01:00
Lukas Matena
8b5561aec7
Fixed several warnings
2019-10-29 10:40:34 +01:00
Enrico Turri
2d5c28d6d1
ENABLE_THUMBNAIL_GENERATOR -> Allow for multiple thumbnails into gcode and sl1 files
2019-10-25 13:59:13 +02:00
Enrico Turri
f7d3cf063b
ENABLE_THUMBNAIL_GENERATOR -> Added a comment
2019-10-25 08:19:02 +02:00
Enrico Turri
296d79abf7
ENABLE_THUMBNAIL_GENERATOR -> Fixed thumbnail generation for SLA and 3mf
2019-10-24 15:56:10 +02:00
Enrico Turri
29fd0ef7c6
ENABLE_THUMBNAIL_GENERATOR -> Refactoring to simplify code
2019-10-24 12:09:09 +02:00
YuSanka
398d20c79b
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
Enrico Turri
6d5572ae47
ENABLE_THUMBNAIL_GENERATOR -> Code cleanup
2019-10-24 10:25:40 +02:00
Enrico Turri
5609f53797
ENABLE_THUMBNAIL_GENERATOR -> Add thumbnail data into gcode output
2019-10-24 10:06:31 +02:00
Enrico Turri
ad0a9cf439
ENABLE_THUMBNAIL_GENERATOR -> Add file thumbnail/thumbnail.png into sla output
2019-10-24 08:46:39 +02:00
Enrico Turri
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
Enrico Turri
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
Enrico Turri
32a42f2808
Added tech ENABLE_THUMBNAIL_GENERATOR -> 1st installment of generation of thumbnail from plater (WIP)
2019-10-22 16:02:31 +02:00
YuSanka
33ba6fe4c6
Implemented possibility to set extruder sequence for whole print
2019-10-18 12:35:35 +02:00
YuSanka
76ec1bc7e3
Improved extruder_selector for DoubleSlider
2019-10-16 10:30:29 +02:00
YuSanka
4b0fe7cba4
Implemented custom extruder(tool) change from DoubleSlider
2019-10-15 15:42:30 +02:00
Enrico Turri
e6403a74ef
ENABLE_3DCONNEXION_DEVICES tech set as default
2019-10-11 15:51:36 +02:00
YuSanka
5d9a136b8a
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
2019-10-10 16:17:09 +02:00
YuSanka
70ef0f25ef
Information from DoubleSlider is saved to Model
...
GCode creating can work with that values.
2019-10-10 16:03:58 +02:00
Enrico Turri
4d1cfda14a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-10 15:44:52 +02:00
Enrico Turri
e51d970b2e
Fixed crash in Plater::priv::can_reload_from_disk()
2019-10-10 14:44:52 +02:00
Enrico Turri
9fc1cc6f84
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-09 12:16:44 +02:00
Enrico Turri
835ee148e5
Fixed conflicts after merging with master
2019-10-09 11:17:48 +02:00
Enrico Turri
8aa33a9e05
ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver
2019-10-08 08:44:50 +02:00
tamasmeszaros
272e9f11e3
Merge branch 'tm_arrange_test_extend'
2019-10-07 17:57:34 +02:00
Vojtech Kral
fd6d32135b
Merge branch 'master' into materials
2019-10-07 17:23:37 +02:00
tamasmeszaros
72ac8d68f0
Extend libnest tests, remove some warnings, faster catch2 compilation.
...
Also, improve libnest2d::nest interface.
2019-10-07 17:16:40 +02:00
YuSanka
47a8b49f8b
Fixed get extruder color for SLA presets
2019-10-07 12:36:16 +02:00
Enrico Turri
6f85b0885a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-07 09:31:43 +02:00
tamasmeszaros
5bf3d5aabf
Merge branch 'tm_sla_tests'
2019-10-04 18:34:08 +02:00
Enrico Turri
243cb5d524
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-04 07:34:43 +02:00
Enrico Turri
587effbedf
ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D
2019-10-03 11:38:31 +02:00
YuSanka
d7ebc4de5b
Added color for extruder
2019-10-01 18:19:28 +02:00
tamasmeszaros
e675a5d5c6
Reworked pad creation algorithm with new parameters:
...
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +02:00
Vojtech Kral
eb93d2a32d
Merge branch 'master' into materials
2019-09-30 16:12:48 +02:00
Enrico Turri
eabaa21df2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:21 +02:00
YuSanka
c07a193b4e
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
YuSanka
904bbcc006
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
Enrico Turri
4b3eab0ed9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-27 14:52:30 +02:00
Enrico Turri
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
YuSanka
82bc243281
Implemented possibility to set a resin cost
2019-09-26 16:36:31 +02:00
Lukas Matena
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
Enrico Turri
e6604afd05
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
Enrico Turri
2dc9949a4c
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
Enrico Turri
c0576a8770
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 08:27:01 +02:00
Lukas Matena
656569b0e9
Fix of https://github.com/prusa3d/PrusaSlicer/issues/2953
...
printf-like function argument mismatch: num was long, which was obfuscated by the auto keyword
2019-09-20 16:47:10 +02:00
YuSanka
8aaff08355
Added Possibility to create "shape" as an independent object from 3dScene,
...
using right click on empty place
2019-09-20 09:57:27 +02:00