Commit graph

3136 commits

Author SHA1 Message Date
Lukas Matena
9dd18a8d6d Started work on extending EigenMesh3D to account for possible drain holes when raycasting 2019-11-19 11:33:49 +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
da44618074 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Fixed adaptive layer height profile and layer height profile smoothing calculations 2019-11-18 14:32:41 +01:00
YuSanka
15251397b8 Added wxEXPAND flag to Filament and SLA Materials pages 2019-11-18 13:26:52 +01:00
Enrico Turri
28dedd65f0 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Code cleanup 2019-11-18 10:25:23 +01:00
Enrico Turri
68a9980a5e ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Small refactoring to improve performances 2019-11-18 10:17:44 +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
YuSanka
0fb8b2ce09 Delete color changes for unused extruders 2019-11-15 16:36:29 +01:00
Enrico Turri
3baf11f694 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height 2019-11-15 15:49:26 +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
2dec84a429 Added model and texture for Mini and Ender3 printer printbeds 2019-11-15 09:28:51 +01:00
YuSanka
8c22b0cd4f Added MINI and Creality Ender to ConfigWizard 2019-11-14 14:04:02 +01:00
Lukas Matena
88514eeb0e Merge branch 'lm_low_wipe_tower' 2019-11-14 10:37:04 +01:00
Enrico Turri
5baffdb9c2 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Customizable cusp value 2019-11-14 10:22:48 +01:00
tamasmeszaros
d4d037792d Holes are now visible on slices in preview. 2019-11-13 15:55:37 +01:00
Enrico Turri
8768b04c8a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height 2019-11-13 14:18:30 +01:00
Enrico Turri
0001ce3dab ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Refactoring of SlicingAdaptive to account for volumes' transformation 2019-11-13 13:53:02 +01:00
tamasmeszaros
97811130a1 Merge branch 'tm_openvdb_integration' into lm_tm_hollowing
SLAPrintSteps parallel functions now fully adapted to sla::ccr
2019-11-12 17:11:26 +01:00
YuSanka
8ec1465ea5 Added editing of custom G-code
+ Code cleaning
2019-11-12 16:59:27 +01:00
tamasmeszaros
4e067c42f0 SLAPrint steps moved to separate module.
* Lambdas replaced with class methods
2019-11-12 16:54:59 +01:00
Lukas Matena
73ae733484 New icon for the hollowing gizmo 2019-11-12 15:04:40 +01:00
Enrico Turri
b77ba32bb2 Adaptive layer height profile -> Added Adaptive button to imgui dialog 2019-11-12 14:18:43 +01:00
YuSanka
050a9adf36 OSX issue: Fix Background drawing for some of controls in Dark mode 2019-11-12 13:54:36 +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
Enrico Turri
01d2728060 Added missing include 2019-11-12 12:29:31 +01:00
Enrico Turri
cc919c68b8 Use Linux-style paths when saving custom bed texture and model files into config 2019-11-12 11:59:33 +01:00
Lukas Matena
b6edd5ddb9 SLA support points gizmo renders the holes and does not allow to place a support point in them 2019-11-12 11:48:12 +01:00
YuSanka
74e4a743af Added missed update for a config after extruder change from the ObjectList.
Fixed erase "tool_change" ticks from ticks set.
2019-11-12 10:42:20 +01:00
Enrico Turri
f7e27eb21d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-11-12 09:14:59 +01:00
Enrico Turri
316832b23d Fixed out of printbed detection for non-printable objects leading to inconsistent volumes' color 2019-11-12 09:14:42 +01:00
tamasmeszaros
a69e80b987 Fix non thread-safe data flow between plater and hollowing gizmo. 2019-11-11 17:27:32 +01:00
Vojtech Kral
e12512dec0 Fix: Rename DPI changed event to not clash with impl in wxwidgets 2019-11-11 17:10:29 +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
Enrico Turri
db51809191 Fixed build on Linux 2019-11-11 13:41:50 +01:00
Enrico Turri
dbc0996be1 3Dconnexion devices -> Disabled handling of device buttons / Added camera target to debug dialog / Added extra debug output 2019-11-11 13:04:02 +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
Enrico Turri
621b8426d3 #3175 - Fixed compatibility with boost v 1.71 2019-11-11 11:21:08 +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
Lukas Matena
b4795e1292 Unified igl calls in MeshRaycaster and EigenMesh3D
MeshRaycaster is still aware of the clipping plane but it now uses EigenMesh3D internally
Public interface of both classes is unchanged
2019-11-08 20:18:14 +01:00
YuSanka
49175c3112 Merge remote-tracking branch 'origin/master' into ys_resin_cost 2019-11-08 19:33:18 +01:00
tamasmeszaros
ac8eab5fa8 Enhanced hollowing scheme, closing distance working as expected. 2019-11-08 16:51:43 +01:00
YuSanka
7a22e43825 Hided extruder selector in preview mode.
Fixed tooltips for double slider.
Changed left button menu for multi-material print
2019-11-08 16:38:04 +01:00
Enrico Turri
932b5be196 Fixed build on Linux 2019-11-08 15:54:44 +01:00
YuSanka
db458df3b5 Fixed controls layout in ExtruderSequenceDialog
Dimension of SVG-icons is calculated now according to the scale factor (on Retina displays)
2019-11-08 14:52:11 +01:00
Enrico Turri
08861250bf 3Dconnexion devices -> Added extra debug output 2019-11-08 14:43:15 +01:00
Lukas Matena
645f13a0ae Drain holes are now saved in ModelObject
Internal changes in GLGizmoHollow.cpp
2019-11-08 14:05:56 +01:00
Enrico Turri
a87d83aeb1 3Dconnexion devices -> Another change in logic to select device 2019-11-08 13:31:34 +01:00
Enrico Turri
b10d128ffd 3Dconnexion devices -> Modified logic to select device on Linux 2019-11-08 11:51:56 +01:00
YuSanka
ae4948bd94 Fixed crash from start if SLA preset is selected.
Fixed extruder selection from ObjectList under OSX
2019-11-08 11:24:57 +01:00
tamasmeszaros
4b08865809 hollowing params renamed, filtering generalized 2019-11-08 09:21:30 +01:00
Enrico Turri
4320b8f711 3Dconnexion devices -> Fix into Mouse3DController::handle_packet_button 2019-11-08 09:18:59 +01:00
Enrico Turri
68d6a45815 3D connexion devides -> Added handling of 3 bytes long button packets 2019-11-08 08:47:57 +01:00
YuSanka
f2120c1122 Fixed a sequence of the legend items 2019-11-07 16:36:24 +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
55a4b99e44 Fixed bug into Camera::set_target() 2019-11-07 11:48:59 +01:00
Enrico Turri
a624590b36 Fixed conflicts after merge with master 2019-11-07 09:55:44 +01:00
tamasmeszaros
bc3d22348a Hollowing params: accuracy and smoothness 2019-11-07 09:34:34 +01:00
Enrico Turri
1e8aa54559 ENABLE_THUMBNAIL_GENERATOR -> Added ENABLE_THUMBNAIL_GENERATOR_DEBUG (disabled) 2019-11-07 09:01:28 +01:00
YuSanka
c4a62819f4 Implemented new color change preview from Gcode
+ Added missed "change_extruder.svg"
2019-11-07 08:13:26 +01:00
tamasmeszaros
a82f1268f3 Hollowed interior is now visible in preview 2019-11-06 14:26:15 +01:00
tamasmeszaros
bdf6f7342e Hollowing step in SLAPrint process, PrintConfig params added. 2019-11-06 13:38:43 +01:00
Enrico Turri
41dadfdfcf ENABLE_THUMBNAIL_GENERATOR -> Generate thumbnails using GLEW_EXT_framebuffer_object on graphic cards supporting it 2019-11-05 14:50:58 +01:00
Lukas Matena
eaf815ca4b Merge branch 'lm_hollow_gizmo' into lm_tm_hollowing 2019-11-05 14:41:06 +01:00
Lukas Matena
013e613221 Hollowing gizmo can now actually trigger the hollowing and render result 2019-11-05 14:40:22 +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
YuSanka
ba0ad954e8 Code cleaning for the 6ed9adaeff commit 2019-11-05 12:56:57 +01:00
bubnikv
7a7183383f Merge branch 'master' of https://github.com/BryanSmithDev/PrusaSlicer into BryanSmithDev-master 2019-11-05 11:37:40 +01:00
Lukas Matena
3fe160e60a Added possibility to change hole height and taper
The parameters are yet not saved in ModelObject and they are common for all holes
2019-11-05 10:17:30 +01:00
Lukas Matena
04bcdff110 Added new hollowing gizmo
Basically just copied SLA support gizmo and removed all functionality that will not be needed
2019-11-05 10:17:27 +01:00
YuSanka
6ed9adaeff New legend for color print.
Some improvements for coloration multimaterial print indicator
2019-11-05 09:48:53 +01:00
Enrico Turri
76377ee0fe ENABLE_THUMBNAIL_GENERATOR -> Export thumbnails to gcode as png data in lines with max 80 characters length 2019-11-04 15:38:15 +01:00
Enrico Turri
065cdd878e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-04 14:29:03 +01:00
Enrico Turri
f5bef3707f Added missing include 2019-11-04 14:28:18 +01:00
Enrico Turri
8b8b6c1821 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-04 14:00:36 +01:00
Enrico Turri
64d5ac0d20 ENABLE_THUMBNAIL_GENERATOR -> Export thumbnails to gcode: max length of gcode lines set to 80 characters 2019-11-04 14:00:26 +01:00
YuSanka
d5f7956a55 Set custom color for color change 2019-11-04 13:42:47 +01:00
Stephan
c37cdb6585 * fix compile error and removed json includes 2019-11-04 12:53:48 +01:00
Stephan Reichhelm
3321ae7f13 + add FlashAir support for host upload 2019-11-04 12:53:48 +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
YuSanka
674c6ce1c5 Implemented coloration of multi-extruder print with color changes for separated extruder. 2019-11-03 19:33:02 +01:00
Enrico Turri
f94f75d481 ENABLE_THUMBNAIL_GENERATOR -> Render thumbnails using shader 2019-11-01 12:19:27 +01:00
Enrico Turri
bf8fcabb29 ENABLE_THUMBNAIL_GENERATOR -> Use orthographic camera when rendering thumbnails 2019-10-31 17:03:33 +01:00
Enrico Turri
636e446da1 ENABLE_THUMBNAIL_GENERATOR -> Changes to zoom factor and centering algorithm when rendering thumbnails 2019-10-31 16:40:38 +01:00
YuSanka
8d27cfd4a6 Changed context menu for DoubleSlider 2019-10-31 15:24:20 +01:00
Enrico Turri
2cb1edeba7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-30 10:10:10 +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
b3f53c96c7 Fixed update of 3D preview layout after changing printer after slicing 2019-10-30 08:28:40 +01:00
YuSanka
8ebd9ce7c4 Save "color_change" for a selected extruder to G_code 2019-10-29 15:34:35 +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
Enrico Turri
a7b4b232e9 ENABLE_THUMBNAIL_GENERATOR -> Use multisampling when generating thumbnail using off-screen framebuffer 2019-10-29 14:45:15 +01:00
YuSanka
52538b93c2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-29 13:09:19 +01:00
YuSanka
ffcf25e5cb Fix for #3108 2019-10-29 13:07:57 +01:00
Lukas Matena
8b5561aec7 Fixed several warnings 2019-10-29 10:40:34 +01:00
Enrico Turri
3ff3eed2b1 ENABLE_THUMBNAIL_GENERATOR -> Use off-screen framebuffer to render the thumbnail on graphic cards supporting it 2019-10-29 10:27:51 +01:00
Enrico Turri
f36dd833d2 ENABLE_THUMBNAIL_GENERATOR -> Reduce thumbnail size if exceeding 3D scene canvas size 2019-10-29 07:32:15 +01:00
Enrico Turri
24aed8eb71 ENABLE_THUMBNAIL_GENERATOR -> Added missing include 2019-10-25 14:32:31 +02:00
Enrico Turri
bab4f51bc8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-25 13:59:27 +02:00
Enrico Turri
2d5c28d6d1 ENABLE_THUMBNAIL_GENERATOR -> Allow for multiple thumbnails into gcode and sl1 files 2019-10-25 13:59:13 +02:00
Lukas Matena
62c90abbc0 Fix of SPE-1041: set_state function for gizmos is called even if they are turned on/off by the undo/redo action 2019-10-25 13:10:33 +02:00
Enrico Turri
de60b40347 ENABLE_THUMBNAIL_GENERATOR -> Thumbnail data saved into gcode using base64 encoding + debug code to extract thumbnails from gcode 2019-10-25 12:18:10 +02:00
Enrico Turri
843251c91f ENABLE_THUMBNAIL_GENERATOR -> Do not render wipe tower into thumbnail 2019-10-25 09:04:58 +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
1baa333663 ENABLE_THUMBNAIL_GENERATOR -> Fixed flickering of 3D view when generating thumbnail 2019-10-24 12:30:19 +02:00
Enrico Turri
d01532f4c6 ENABLE_THUMBNAIL_GENERATOR -> Removed obsolete files 2019-10-24 12:11:24 +02:00
Enrico Turri
29fd0ef7c6 ENABLE_THUMBNAIL_GENERATOR -> Refactoring to simplify code 2019-10-24 12:09:09 +02:00
Enrico Turri
a417da8fea ENABLE_THUMBNAIL_GENERATOR -> Fixed volumes visibility test to render them into thumbnail 2019-10-24 11:08:39 +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
a1f2ecb285 ENABLE_THUMBNAIL_GENERATOR -> Fixed color of non printable volumes into thumbnail 2019-10-24 10:38:30 +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
4517fcd997 ENABLE_THUMBNAIL_GENERATOR -> Add file Metadata/thumbnail.png into 3mf output 2019-10-24 09:20:33 +02:00
Enrico Turri
ad0a9cf439 ENABLE_THUMBNAIL_GENERATOR -> Add file thumbnail/thumbnail.png into sla output 2019-10-24 08:46:39 +02:00
YuSanka
2a5cf689a4 Preview mode: Implemented a show of the part printed by selected extruder 2019-10-24 08:43:27 +02:00
tamasmeszaros
77c52b748c Zipper made available for modification after RasterWriter finishes. 2019-10-23 17:32:17 +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
1809497c38 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-22 16:03:27 +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
0d89fd84db Fixed a case when (under OSX) after some manipulation with an object or a part and then add some setting from 3dScene, "Revert button(s)" are still appear(s) in right panel 2019-10-22 10:30:07 +02:00
Enrico Turri
d4f190a0c1 Fixed build on Linux and Mac 2019-10-21 15:20:36 +02:00
Enrico Turri
3ce3f33c9c Mouse3DController::connect_device() -> Modified logic to detect and select plugged device 2019-10-21 14:21:51 +02:00
Enrico Turri
c47ca5a2c0 Mouse3DController -> Added debug output of device serial number 2019-10-21 11:30:29 +02:00
Enrico Turri
76a2f72e97 Follow-up of a065c92302 -> proper enabling of debug output 2019-10-21 11:12:56 +02:00
Enrico Turri
a065c92302 Mouse3DController -> Enabled debug output to check device connection on Linux and Max 2019-10-21 11:06:18 +02:00
YuSanka
33ba6fe4c6 Implemented possibility to set extruder sequence for whole print 2019-10-18 12:35:35 +02:00
Enrico Turri
93ae170113 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-17 08:09:23 +02:00
YuSanka
ea8695c06c Fixed GCode export for color_print extensions.
M25 is changed to M601
2019-10-16 12:03:51 +02:00
YuSanka
4fa2567ea2 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-10-16 10:31:29 +02:00
YuSanka
76ec1bc7e3 Improved extruder_selector for DoubleSlider 2019-10-16 10:30:29 +02:00
bubnikv
1964ac2e89 Ported test_skirt_brim from upstream Slic3r, thanks @lordofhyphens 2019-10-15 16:31:20 +02:00
YuSanka
4b0fe7cba4 Implemented custom extruder(tool) change from DoubleSlider 2019-10-15 15:42:30 +02:00
YuSanka
5c2b5a167b Context menu is extended for multiple material printing 2019-10-14 12:59:10 +02:00
Enrico Turri
e6403a74ef ENABLE_3DCONNEXION_DEVICES tech set as default 2019-10-11 15:51:36 +02:00
Enrico Turri
1c05d88c00 ENABLE_3DCONNEXION_DEVICES -> Added support for 3Dconnexion universal receiver and battery level report 2019-10-11 15:29:57 +02:00
Enrico Turri
a7972bcc77 ENABLE_3DCONNEXION_DEVICES -> Debug output of device features 2019-10-11 09:16:20 +02:00
Enrico Turri
8998a8e756 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-11 08:19:24 +02:00
YuSanka
5d9a136b8a Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-10-10 16:17:09 +02:00
YuSanka
62b7892fa1 OSX: Call m_extruder_editor->Hide(), when extruder selection in ObjectList is changed 2019-10-10 16:13:27 +02:00