Commit graph

2930 commits

Author SHA1 Message Date
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
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
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
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
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
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
bubnikv
1964ac2e89 Ported test_skirt_brim from upstream Slic3r, thanks @lordofhyphens 2019-10-15 16:31:20 +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
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
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
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
a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +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
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
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
Lukas Matena
9a9c3bac39 Fixup of 47a8b49 2019-10-08 11:05:59 +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
tamasmeszaros
5bf3d5aabf Merge branch 'tm_sla_tests' 2019-10-04 18:34:08 +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
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
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
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
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
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
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