Commit Graph

3133 Commits

Author SHA1 Message Date
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
YuSanka
db6c501b4d Added code to colorized of axes names in manipulation panel (temporarily commented)
Related to (#3053)
2019-10-10 16:08:52 +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
9ea501cab2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 16:01:24 +02:00
Enrico Turri
8b4799d734 Do not show context menu when the user deletes sla support points by right clicking on them and the mouse pointer is hovering the selected object 2019-10-10 16:00:32 +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
cc34860ddd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-10 14:45:09 +02:00
Enrico Turri
e51d970b2e Fixed crash in Plater::priv::can_reload_from_disk() 2019-10-10 14:44:52 +02:00
Enrico Turri
7caa596b95 ENABLE_3DCONNEXION_DEVICES -> Refactoring and code cleanup 2019-10-10 11:55:17 +02:00
Lukas Matena
0dfbfa62df wxExtensions.cpp: BitmapChoiceRenderer now updates config immediately after its combobox closes
This was needed because for some reason, the combobox would not lose focus when mouse left the ObjectList on Linux (KILL_FOCUS forces the update).
The update could be bypassed on Win too by changing extruder and hitting shortcut to reslice.
2019-10-10 11:03:55 +02:00
Enrico Turri
068b7e86a9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 10:50:06 +02:00
Enrico Turri
f4654e376e ENABLE_3DCONNEXION_DEVICES -> Slightly increased camera target movement limits 2019-10-10 10:49:47 +02:00
Enrico Turri
a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +02:00
Enrico Turri
ded6d44389 Fixed build on OsX 2019-10-10 09:29:55 +02:00
Enrico Turri
aae1250921 ENABLE_3DCONNEXION_DEVICES -> Experimental input queues with max size 2019-10-10 09:04:44 +02:00
Enrico Turri
3a5823bc2e ENABLE_3DCONNEXION_DEVICES -> Added temporary debug output to measure input queue sizes 2019-10-09 15:23:30 +02:00
YuSanka
6ac53aa4f3 Improved Tooltips for selected action icon 2019-10-09 15:06:52 +02:00
Enrico Turri
5888477473 ENABLE_3DCONNEXION_DEVICES -> Reworked deadzone check 2019-10-09 14:39:28 +02:00
Enrico Turri
a735ec1b48 ENABLE_3DCONNEXION_DEVICES -> Added tech ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT for debug output 2019-10-09 14:18:43 +02:00
Enrico Turri
b41a0656b9 ENABLE_3DCONNEXION_DEVICES -> Reworked parsing of data coming from device 2019-10-09 14:01:13 +02:00
YuSanka
20c7801264 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-10-09 13:42:54 +02:00
Enrico Turri
589e003de0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 13:41:09 +02:00
Enrico Turri
a6a7303e25 Fixed context menu showing up when user right clicks on 3D scene and release the mouse button after dragging over the objects list 2019-10-09 13:39:24 +02:00
YuSanka
1ade11fd57 Fixed OSX build 2019-10-09 13:15:03 +02:00
YuSanka
2afaefad24 Bugfix for extruders Column: suppress draw bitmap for Instance and allow Extruder editing for Layer Range 2019-10-09 12:36:13 +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
YuSanka
09a7b348f4 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-10-09 11:34:57 +02:00
YuSanka
688a559b5f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-09 11:31:48 +02:00
YuSanka
c1bb34cc4d Some changing in implementation of emulate_kill_focus according to new code architecture.
+ Cleaning of the code from unused parts
2019-10-09 11:24:28 +02:00
Enrico Turri
835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Enrico Turri
e6ce74957f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 09:58:39 +02:00
YuSanka
8cdcac6ad8 First implementations for an extension of color change feature :
Added context menu for "plus" button on DoubleSlider
2019-10-09 09:28:50 +02:00
Enrico Turri
4ec6199ef1 ENABLE_3DCONNEXION_DEVICES -> Added translation and rotation customizable parameter deadzone 2019-10-08 14:32:05 +02:00
Lukas Matena
fdf9272fbe Wipe tower brim width is now part of WipeTowerData class, so it can be used wherever needed 2019-10-08 13:50:51 +02:00
Enrico Turri
b7db5a9558 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-08 13:38:27 +02:00
Enrico Turri
9447d3e1b5 ENABLE_3DCONNEXION_DEVICES -> Mouse3DController reworked to handle reports of length 7 bytes and 13 bytes 2019-10-08 13:38:08 +02:00
Lukas Matena
9a9c3bac39 Fixup of 47a8b49 2019-10-08 11:05:59 +02:00
Enrico Turri
8fcd4e4407 ENABLE_3DCONNEXION_DEVICES -> added debug code to get 3Cconnexion device product id 2019-10-08 09:52:56 +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
Vojtech Kral
570c038eb7 ConfigWizard: Fix printer pre-selection on fresh config 2019-10-07 17:21:45 +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
Vojtech Kral
eda01341d0 ConfigWizard: Fix a memory access issue between PageMaterial instances 2019-10-07 11:10:18 +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
Enrico Turri
0ba9fbaf0c ENABLE_3DCONNEXION_DEVICES -> Update 3D scene only when mouse 3D device send update messages 2019-10-07 09:31:23 +02:00
tamasmeszaros
5bf3d5aabf Merge branch 'tm_sla_tests' 2019-10-04 18:34:08 +02:00
Enrico Turri
5a94ac9499 ENABLE_3DCONNEXION_DEVICES -> Automatic detection of plugging/unplugging 3Dconnexion devices 2019-10-04 10:59:27 +02:00
Enrico Turri
1d463fc23f ENABLE_3DCONNEXION_DEVICES -> Another small refactoring of Mouse3DController 2019-10-04 07:58:01 +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
YuSanka
ffa544ade3 Merge remote-tracking branch 'origin/ys_extruders_color' 2019-10-03 14:25:25 +02:00
YuSanka
da7275bdea Merge remote-tracking branch 'origin/ys_manipulation_panel_rw' 2019-10-03 14:24:20 +02:00
Enrico Turri
f315681804 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to simplify code 2019-10-03 12:16:59 +02:00
Enrico Turri
b15757a126 ENABLE_3DCONNEXION_DEVICES - Added missing return lines 2019-10-03 12:09:49 +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
Enrico Turri
a554304038 ENABLE_3DCONNEXION_DEVICES -> Serialization of mouse device parameters into config 2019-10-03 10:26:28 +02:00
Enrico Turri
7007d81519 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-03 08:07:13 +02:00
YuSanka
63f31ce4db Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-02 22:51:18 +02:00
YuSanka
b3603a09fc Fixed a bug: Wrong save of a preset if the preset is already exist.
Step to repro:
1. Select system "Some_preset" preset
2. Make some changes
3. Save preset with "Some_preset - Copy" name.
=>  "Some_preset - Copy" is selected, there is/are marked option(s) only different from system preset.
repeate 1-3 steps
=>  "Some_preset - Copy" is selected, there is/are marked option(s) different from DEFAULT preset.
2019-10-02 22:50:55 +02:00
YuSanka
8bc569284e Corrected editor position and size 2019-10-02 16:14:40 +02:00
Enrico Turri
36d3f90fad ENABLE_3DCONNEXION_DEVICES - Added imgui dialog to edit 3Dconnexion device parameters 2019-10-02 15:55:26 +02:00
YuSanka
9e01740db6 More improvements 2019-10-02 15:02:13 +02:00
tamasmeszaros
d5dcba00b1 Time conversion functions with tests.
Fixes issue with incorrect characters in time strings on UI.
Fix platform dependency


Fix return value with incorrect strings.


Just use strptime and strftime on all platforms.

Emulate strptime on msvc... because they don't have it and their get_time is buggy.
2019-10-02 14:44:11 +02:00
YuSanka
4171a6a80d Improvements for 15902766d0 2019-10-02 14:08:36 +02:00
YuSanka
d87f2d11ae Fix OSX build 2019-10-02 12:17:02 +02:00
YuSanka
15902766d0 Workaround for extruder editing under OSX 2019-10-02 11:53:50 +02:00
Enrico Turri
644cc8c6b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-02 11:01:31 +02:00
Enrico Turri
fbe38fb2a4 #3008 - Generate all mipmaps up to size 1x1 2019-10-02 10:57:07 +02:00
YuSanka
a0b46a4019 Merge remote-tracking branch 'origin/master' into ys_extruders_color 2019-10-01 18:20:59 +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
tamasmeszaros
710adca6fe Don't disable pad around object parameters if supports are disabled. 2019-10-01 14:57:37 +02:00
YuSanka
45b81f1805 Fixed "unhandled unknown exception", when try to change an extruder count.
Side effect after 86b258f727.
2019-10-01 14:27:51 +02:00
Lukas Matena
61cee54dd3 Merge branch 'master' into lm_low_wipe_tower 2019-10-01 13:24:25 +02:00
bubnikv
93a157e26c Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-09-30 16:25:31 +02:00
bubnikv
272479826f Refactoring of the G-code preview for lower memory allocation
and for separation of concerns:

The final G-code preview no more uses ExtrusionPaths structure
to hold the G-code path data extracted by parsing the G-code.
Instead, the ExtrusionPath class has been trimmed down back to
the original size before the G-code preview was introduced,
and a new GCodePreviewData::Extrusion::Path class was created to hold
the additional path data as the extruder ID, color change ID
and fan speed.
2019-09-30 16:25:26 +02:00
Vojtech Kral
eb93d2a32d Merge branch 'master' into materials 2019-09-30 16:12:48 +02:00
Enrico Turri
d58dedd459 ENABLE_3DCONNEXION_DEVICES -> Increased limit of device buttons 2019-09-30 15:58:45 +02:00
Enrico Turri
b11704d380 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:38:13 +02:00
Vojtech Kral
520a51c62f hidapi: Fix include path 2019-09-30 15:20:23 +02:00
Enrico Turri
7c8732d560 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:36 +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
Vojtech Kral
82fed1790a 3D connexion support on Linux:
- Replace hidapi/linux/hid.c with the hidraw variant (link to udev)
- Add CMakeLists.txt for hidapi, refactor
- Add udev rules file (no installation so far)
2019-09-30 14:59:21 +02:00
YuSanka
c07a193b4e Implemented BitmapChoiseRenderer 2019-09-30 14:34:29 +02:00
YuSanka
f5593c05aa Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-30 14:04:45 +02:00
YuSanka
904bbcc006 Fix of SPE-1035 (Wrong filament color updating for multi-material print) 2019-09-30 13:59:26 +02:00
bubnikv
b425ee50a9 Merge remote-tracking branch 'remotes/origin/et_pull_2922' 2019-09-30 10:23:16 +02:00
Enrico Turri
7f7b3e0b0b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 08:15:20 +02:00
Lukas Matena
5ded376fe2 An attempt to fix #2997
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
Enrico Turri
1aa559585c Added missing include 2019-09-27 15:26:13 +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
c370fccd8b Changed default values.
And bottle_volume is preferred to recalculation instead of bottle_weight
2019-09-27 12:08:08 +02:00
YuSanka
82bc243281 Implemented possibility to set a resin cost 2019-09-26 16:36:31 +02:00
YuSanka
1a03b664b9 Some changes for alignments in manipulation panel 2019-09-25 15:04:39 +02:00
Enrico Turri
6f8a9bc1ff Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar 2019-09-25 13:05:18 +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
YuSanka
efb9ef37f6 Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw 2019-09-25 11:33:19 +02:00
Enrico Turri
fdbe339622 Fixed gizmo scale for objects added to scene using the new context menu 2019-09-25 11:25:14 +02:00
YuSanka
6faf67d90c Add binding for ManipulationEditors 2019-09-25 11:25:05 +02:00
Lukas Matena
7861fa5086 Whitespace changes to supress misleading indentation warnings
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
YuSanka
b2e7081d31 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 14:33:20 +02:00
YuSanka
9607fbeb6d Fix of SPE-1027 2019-09-24 14:32:59 +02:00
Enrico Turri
2fd5044460 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 14:13:22 +02:00
Enrico Turri
7c1706f7ee Follow-up of f4910cafed -> Fix extended to Mac 2019-09-24 14:13:03 +02:00
Lukas Matena
c1e3be9b27 MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane 2019-09-24 12:58:12 +02:00
Enrico Turri
a68a72a660 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 09:11:43 +02:00
Enrico Turri
e6604afd05 #2972 - Fixed selection after adding an instance with autocenter active 2019-09-24 09:11:27 +02:00
YuSanka
a234193dea Fixed localization for "Configuration Wizard" menu item 2019-09-23 16:29:07 +02:00
Enrico Turri
2dc9949a4c ENABLE_ENHANCED_RELOAD_FROM_DISK set as default 2019-09-23 15:35:49 +02:00
Enrico Turri
82a52e8b21 #2922 - Port of commit: f42edd35ce by jschuh 2019-09-23 14:56:27 +02:00
YuSanka
d90a27d5f8 Merge remote-tracking branch 'origin' into ys_manipulation_panel_rw 2019-09-23 14:37:06 +02:00
YuSanka
c0c937425f Added missed comment to 7e060f84bd 2019-09-23 14:24:53 +02:00
Enrico Turri
4a45c1aa41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-23 12:34:18 +02:00
YuSanka
4e22761f95 Fix of #2977 2019-09-23 10:17:53 +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
89ebf1f1e8 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-20 11:30:53 +02:00
YuSanka
7e060f84bd Forcing of explicit SetWidth for the columns under OSX, as an attempt to fix a narrow column width on 4(5)K monitors under OSX 2019-09-20 11:30:29 +02:00
Enrico Turri
d66bf7e1e1 Follow-up of 8aaff08355 -> Do not show the new context menu when the user pans the scene + cleanup 2019-09-20 11:19:06 +02:00
Lukas Matena
abaebb489a Added a config option to not print sparse layers on the wipe tower 2019-09-20 10:54:20 +02:00
YuSanka
a27026aa03 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-20 09:58:33 +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
Enrico Turri
9e09c52ab0 #2948 - Max zoom takes in account custom bed model size 2019-09-20 09:53:35 +02:00
bubnikv
110d5b9d56 Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev 2019-09-19 17:16:43 +02:00
bubnikv
6ce1011a09 Slic3r -> PrusaSlicer in config snapshot dialog. 2019-09-19 17:16:37 +02:00
YuSanka
e34ef1dd07 Merge remote-tracking branch 'origin/dev' into ys_manipulation_panel_rw 2019-09-19 15:39:13 +02:00
YuSanka
29f3c938e6 Fix of SPE-1026 (Height range value works differently if you press enter and if you leave textbox)
Related to GH #2946
2019-09-19 15:28:36 +02:00
YuSanka
381735581b Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 14:12:12 +02:00
YuSanka
ddf37d3b01 Fix under OSX for 584b37513f 2019-09-19 14:11:56 +02:00
Enrico Turri
0de8245432 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 14:03:05 +02:00
Enrico Turri
355a7d6a8c Fixed empty filename when trying to export a plate where no object is selected and no object is printable 2019-09-19 14:01:17 +02:00
Enrico Turri
74747226f7 ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Modified .zip.amf import/export to save/load volume matrices and source data

2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00
YuSanka
584b37513f Implemented possibility to create "shape" as an object (#2865) 2019-09-19 12:30:16 +02:00
bubnikv
80c5eaacdf Merge remote-tracking branch 'remotes/origin/dev' into vk-materials 2019-09-19 11:49:49 +02:00
Enrico Turri
3a40565d03 Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Reworked void Plater::priv::reload_from_disk() to be more general

2) Added source data to class ModelVolume

3) Modified .3mf import/export to save/load volume matrices and source data

4) Incremented .3mf version to 2
2019-09-19 09:09:11 +02:00
YuSanka
67d7809418 Fixed font size and layouts for ObjectManipulation panel under OSX 2019-09-19 08:44:19 +02:00
YuSanka
c9c407cc2b Rewrote UI for ObjectManipulation without using of OptionsGrope 2019-09-18 15:10:36 +02:00
Lukas Matena
76a657ce52 Plater.cpp - better added a range-check when selecting filament color in purging volumes dialog 2019-09-18 12:54:21 +02:00
Lukas Matena
741e98804c Purging volumes dialog now uses filament colour in case extruder color is undefined 2019-09-18 11:47:19 +02:00
Vojtech Kral
107ff6fd36 Materials: Cleanup 2019-09-17 17:16:15 +02:00
Vojtech Kral
cb1ee5ce55 ConfigWizard: Add view mode setting page 2019-09-17 15:52:26 +02:00
Enrico Turri
cd7895065a Fixed typo 2019-09-17 15:48:39 +02:00
Enrico Turri
f4910cafed Fixed selection after adding a modifier by loading it from file 2019-09-17 15:30:54 +02:00
Lukas Matena
dd7eb0b186 Merge branch 'lm_raycasting_refactoring' into dev 2019-09-17 14:59:14 +02:00
Lukas Matena
6bcafd7c83 SLA gizmo no more uses IGL code directly, all was moved to the new MeshRaycaster class 2019-09-17 14:57:57 +02:00
Lukas Matena
1dfd8a0e62 MeshRaycaster class is now used in SLA gizmo when selecting by rectangle 2019-09-17 14:57:54 +02:00
Lukas Matena
3694bf3da9 Added functions get_hit_pos, get_hit_normal, ready to implement intersect_ray 2019-09-17 14:57:49 +02:00
Lukas Matena
b6292247e8 Unproject on mesh in the SLA gizmo is now performed by the MeshRaycaster class 2019-09-17 14:57:45 +02:00
YuSanka
0890c1417a Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-17 13:42:06 +02:00
YuSanka
93aa5ac6ce Fixed re-scaling under MSW for Layers editing
+ Clean code in GUI_ObjectManipulation.cpp
2019-09-17 13:41:44 +02:00
Vojtech Kral
c5a67ff931 WIP: filament/material filtering per selected printers 2019-09-17 13:20:06 +02:00
Vojtech Kral
9a465514ff Filament and material default installation based on enabled printers 2019-09-17 13:20:06 +02:00
Vojtech Kral
270008a3fd Add material_type config option for SLA materials, use in Wizard 2019-09-17 13:20:06 +02:00
Vojtech Kral
235b659cf9 WIP: ConfigWizard: 3rd party bundle installation roughly done 2019-09-17 13:20:06 +02:00
Vojtech Kral
dba9925c4e Move ConfigWizard instance in GUI_App, lazy-initialized,
add filament/material installation item in Sidebar combo boxes
2019-09-17 13:20:06 +02:00
Vojtech Kral
87b7b1cc1d Load default filament/material selections from vendor profiles 2019-09-17 13:20:06 +02:00
Vojtech Kral
34b3548102 Filaments and materials selection/installation 2019-09-17 13:20:06 +02:00
Enrico Turri
a93e63e296 Fixed object shifted after saving to/reloading from .3mf and .zip.amf a multivolume object with printable parts moved by user 2019-09-17 12:50:54 +02:00
Vojtech Kral
8e11a7b895 PresetUpdater: Fix: Sanitize downloadedsemver, fix #2927
Use HTTPS for the slicer app version url
2019-09-16 18:02:14 +02:00
YuSanka
13bde53955 Call update_config_values after deleting of a overridden option 2019-09-16 12:05:56 +02:00
YuSanka
a12e6a7bde More clear identification if is there object selected 2019-09-16 11:55:05 +02:00
YuSanka
284355d378 Fix of #2878 (endless warning loop in configuration update) 2019-09-16 10:22:26 +02:00
Lukas Matena
70c0c87598 Renamed MeshClipper.cpp/.hpp to MeshUtils.cpp/.hpp
More helper classes like the MeshClipper could live here
Moved ClippingPlane class in here to start
2019-09-13 12:03:53 +02:00
Lukas Matena
9782701dd4 Calculating the transformations is now only performed by the MeshClipper
Attempted to get mirroring right (that never worked correctly with the clipping plane in the sla gizmo)
The transformation of the support mesh is kind of a mystery to me, hopefully it is right
Also cleaned the code a bit (removed commented-out code, unused variables, etc)
2019-09-13 12:03:53 +02:00
Lukas Matena
546917830b Initial implementation of MeshClipper class
So far the work is shared between the old code in GLGizmoSlaSupports.cpp and the new class
2019-09-13 12:03:53 +02:00
Lukas Matena
cf23146ee3 Refactoring the SLA clipping plane
The plane is now internally stored as a plane in world coordinates
2019-09-13 12:03:53 +02:00
Enrico Turri
7fe691f14e Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-12 10:46:32 +02:00
Enrico Turri
724cc19ae5 Fixed object position after reload from disk 2019-09-12 10:44:38 +02:00
bubnikv
b4f2df6a98 Merge remote-tracking branch 'remotes/origin/master' into dev 2019-09-12 10:19:09 +02:00
Enrico Turri
c55a463c93 Do not show intermediate states in objects list while reloading from disk 2019-09-11 15:31:30 +02:00
Enrico Turri
26f3af4b16 Fixed modifiers after reload from disk 2019-09-11 15:02:57 +02:00
tamasmeszaros
c37ec7463f Add new config values to SL1 zip file config.ini
All requested config values are written into SL1 ini file inside the zip

* TIme.hpp and Time.cpp is now part of libslic3r instead of libslic3r_gui
* Updated time manipulation function: separate timestamp_local_str and timestamp_utc_str
* timestamp_utc_str is used in header_slic3r_generated(). Gcode now contains UTC timestamps
2019-09-11 13:10:23 +02:00
Enrico Turri
b383d9581a Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-11 09:01:44 +02:00
bubnikv
246dc64c99 Fix of "Bridging and gap fill are parsed incorrectly when infill is set to 0" #1476
The gap fill was disabled for zero infill.
Now the gap fill is enabled in between the perimeters, but disabled between
the inner-most perimeter and infill in case the infill is set to zero.

Also in case there are multiple infill regions inside a perimeter,
the mutliple infills are considered as non-zero if at least one infill
is non-zero, therefore the gap fill will be added inside the inner-most
perimeter.
2019-09-10 19:03:37 +02:00
Lukas Matena
4fc20090c8 GUI_ObjectList.cpp: Max layer height defaults to 0.75*nozzle_diameter as it should (#2892) 2019-09-10 12:34:03 +02:00
Lukas Matena
86b258f727 Fixed many warnings in following files:
src/slic3r/Config/Snapshot.cpp
src/slic3r/GUI/Field.cpp
src/slic3r/GUI/GLToolbar.cpp
src/slic3r/GUI/GUI_ObjectList.cpp
src/slic3r/GUI/GUI_ObjectList.hpp
src/slic3r/GUI/Plater.cpp
src/slic3r/GUI/Plater.hpp
src/slic3r/GUI/PresetBundle.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/wxExtensions.cpp
2019-09-10 12:08:43 +02:00
Enrico Turri
27f01bb09e Fixed instance printable property after reload from disk 2019-09-10 11:16:59 +02:00
bubnikv
6ba43ebacb Merge remote-tracking branch 'remotes/origin/master' into dev 2019-09-09 17:49:07 +02:00
Vojtech Kral
f747b97564 FirmwareDialog: Attempt to fix window double close assertion #2619 2019-09-09 16:41:14 +02:00
Enrico Turri
6507b7bf39 Fixed gizmos update after objects loading 2019-09-09 15:55:04 +02:00
Enrico Turri
eae02f6cad Fixed handling of mouse left up event when moving an object while the place on face gizmo is active 2019-09-09 14:56:55 +02:00
Enrico Turri
749a1863e5 Fixed rotate gizmo hovering 2019-09-09 12:11:49 +02:00
Enrico Turri
ae0fc75b13 Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-09 08:42:39 +02:00
Enrico Turri
98d8fa37c9 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-09 08:28:16 +02:00
Enrico Turri
19616c4f93 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-06 17:53:17 +02:00
Enrico Turri
e6366894da Fixed object settings after reload from disk 2019-09-06 17:26:08 +02:00
Enrico Turri
5b60fe272a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-06 17:25:39 +02:00
Vojtech Kral
d096804a24 Fix a few warnings in PrintHostDialogs, UploadDialogs 2019-09-06 16:33:00 +02:00
Enrico Turri
9cf3793aac Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-06 16:06:37 +02:00
Lukas Matena
a985a2720f Fixed some more warnings, moved function to get ExtrusionRole name into ExtrusionEntity.hpp
So it can be called from wherever it may be needed
2019-09-06 15:55:07 +02:00
Lukas Matena
3f988b314c Fixed several warnings (Config.hpp and few other files) 2019-09-06 15:55:07 +02:00
Enrico Turri
abd170fbf4 Follow-up of 6c3aae8f89 -> Fixed update of objects list when object has a unique instance 2019-09-06 15:50:54 +02:00
Vojtech Kral
34821df6eb Fix bad pointer dereference in ObjectList::list_manipulation()
Fix of #2875
2019-09-06 15:28:58 +02:00
Enrico Turri
6c3aae8f89 Fixed update of instances in objects list after reload from disk 2019-09-06 15:10:07 +02:00
Enrico Turri
4f1747d5f6 Keep correct instance selection after reload from disk 2019-09-06 14:36:47 +02:00
Enrico Turri
fe07bde385 Do not render intermediate states while reload from disk action is taking place 2019-09-06 13:49:15 +02:00
Enrico Turri
a7a01bfc72 Keep selection after reload from disk 2019-09-06 13:11:20 +02:00
YuSanka
4263fa8dff DoubleSlider refactoring 2019-09-05 15:31:22 +02:00
YuSanka
1651c8db6e Fixed ColorPrint Legend update if Print preset was changed and model was resliced. 2019-09-05 09:13:59 +02:00
Lukas Matena
09e4ac42ba Fixed some more warnings (mostly GLGizmoSlaSupports.cpp) 2019-09-04 16:05:32 +02:00
Lukas Matena
570bec299f Merge branch 'master' into dev 2019-09-04 15:50:18 +02:00
Lukas Matena
326eb5e343 GUI_ObjectList.cpp: Fixed a crash when deleting instances.
Deleting second-but-last instance deletes the whole Instances node, we must select object node in that case.
2019-09-04 15:15:35 +02:00