Commit Graph

2510 Commits

Author SHA1 Message Date
Lukas Matena
41b1dc3d80 Fix of custom supports 3MF loading
Multiple-part objects were not handled correctly
2020-08-06 14:08:05 +02:00
enricoturri1966
2aa1c2776c GCodeViewer -> Estimated printing times shown in the legend 2020-08-06 10:15:34 +02:00
enricoturri1966
8fc5be7e4f Refactoring to allow to quickly build the various options to show the estimated printing time in gcode viewer scene 2020-08-05 15:43:46 +02:00
enricoturri1966
25c3552555 Fixed conflicts after merge with master 2020-08-04 09:58:19 +02:00
tamasmeszaros
0614d6d4a8 Remove leftover junk comments 2020-08-03 19:07:30 +02:00
tamasmeszaros
f3c0bf46d4 finish optimizer interface and remove commented code 2020-08-03 19:06:57 +02:00
tamasmeszaros
927b81ea97 Working small-to-normal support merging
Fixed fatal bug with anchors for mini supports

Make the optimization cleaner in support generatior

Much better widening behaviour

Add an optimizer interface and the NLopt implementation into libslic3r

New optimizer based only on nlopt C interfase
Fix build and tests
2020-08-03 19:05:30 +02:00
tamasmeszaros
8cb115a035 Add possible manipulation of small support diameter. 2020-08-03 19:05:30 +02:00
tamasmeszaros
7c655b5d7e Fix junction made below ground level. 2020-08-03 19:05:30 +02:00
tamasmeszaros
1eec6c473c Rename EigenMesh3D to IndexedMesh and SupportConfig to SupportTreeConfig 2020-08-03 19:05:30 +02:00
tamasmeszaros
645fbed88b Make compile time support tree conf params constexpr 2020-08-03 19:05:30 +02:00
tamasmeszaros
f19b3a2344 Id-s put in a base class for support tree primitives 2020-08-03 19:05:30 +02:00
tamasmeszaros
301a168b89 Fix bugs and non working tests
Fix failing tests


Try to fix build on windows


Try to fix failng tests on Mac
2020-08-03 19:05:30 +02:00
tamasmeszaros
184f64f828 Separate support tree routing and meshing, remove Common.hpp/.cpp .
* Remove Common.hpp and Common.cpp, move things into their respective modules in sla.
2020-08-03 19:05:30 +02:00
tamasmeszaros
2ff04e6f68 Bugfixes for support generator
* Fix support heads floating in air
* Fix failing tests for the bridge mesh intersection
* Fix failing assertions
WIP refactoring support tree gen, as its a mess.
2020-08-03 19:05:30 +02:00
tamasmeszaros
ed460a3e7e Remove the headless step of support support tree gen 2020-08-03 19:05:30 +02:00
tamasmeszaros
7b6565abeb Improvements on mini pillars 2020-08-03 19:05:30 +02:00
tamasmeszaros
67b61c23f7 Remove the discard region for bottom points removal.
This was a workaround for small supports not to end up in the middle of the gap between the pad and the object. The issue needs to be solved at the support generation.
2020-08-03 19:05:30 +02:00
tamasmeszaros
0622322146 Create smaller supports in problematic areas with established strategies
Completely remove the concept of CompactBridge.

Replace it with Heads having the same back radius as front radius. 

Try to apply the same rules for mini supports as in the route_to_model step.

Increased accuracy of bridge_mesh_intersect shot from support points


Refining mini support integration
2020-08-03 19:05:30 +02:00
tamasmeszaros
38239f09e3 Fix remove_bottom_points function 2020-08-03 19:03:02 +02:00
David Kocik
b3f8ae5ca7 Notifications & warning dialog
notifications
dialog with warnings produced by slicing is shown before exporting
2020-08-03 15:49:25 +02:00
enricoturri1966
0840b2328a Tech ENABLE_GCODE_VIEWER_AS_STATE set as default 2020-08-03 15:00:19 +02:00
enricoturri1966
0eb6ba96d6 Fixed conflicts after merge with master 2020-08-03 14:17:40 +02:00
enricoturri1966
5249b3e018 ENABLE_GCODE_VIEWER -> Estimated print time statistics moved from PrintStatistics to GCodeProcessor 2020-08-03 13:57:10 +02:00
enricoturri1966
757572b760 Tech ENABLE_LAYOUT_NO_RESTART set as default 2020-08-03 11:08:17 +02:00
enricoturri1966
1532920d81 GCodeProcessor -> Extended import of config data from gcode saved by PrusaSlicer 2020-08-03 08:46:32 +02:00
enricoturri1966
534e8bb909 ENABLE_GCODE_VIEWER -> Export to gcode layer z and layer height at each layer change 2020-07-30 13:49:57 +02:00
enricoturri1966
0348986bda Follow-up of 9d4344a78c -> ensure printbed always rendered as custom in gcode preview mode 2020-07-29 14:20:01 +02:00
enricoturri1966
9d4344a78c GCodeProcessor/GCodeViewer -> Extract bed shape from gcode files generated by PrusaSlicer 2020-07-29 12:47:42 +02:00
enricoturri1966
16e282110d GCodeProcessor -> Load config data from gcode files generated by PrusaSlicer 2020-07-29 11:13:48 +02:00
enricoturri1966
11cf9a87f1 GCodeProcessor -> Calculate mm3 per mm on the fly 2020-07-29 10:04:10 +02:00
YuSanka
3c3e463f50 Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-07-28 14:14:16 +02:00
YuSanka
68ae95509f Improved InfoMsg for a delete preset:
* Now we show a list of printers name with selected preset

+ Added a edit_button for the editing of the physical printer fro the Settings Tab
+ Show whole list of the loaded presets with "Print host upload"
2020-07-28 12:43:26 +02:00
enricoturri1966
d9228ee82c GCodeProcessor -> Human readable extrusion roles in gcode 2020-07-28 09:48:55 +02:00
enricoturri1966
14366800e2 GCodeProcessor -> Added parsing of 3d part generated gcodes 2020-07-27 15:45:29 +02:00
enricoturri1966
48ae8dc9a2 Modal estimated printing time dialog
Fixed conflicts after merge with master
2020-07-27 14:53:17 +02:00
Lukas Matena
248fba82a4 TriangleSelector: 3MF loading and saving 2020-07-24 17:47:16 +02:00
Lukas Matena
7ddb64783b TriangleSelector: edge limit is derived from cursor size 2020-07-24 17:47:16 +02:00
Lukas Matena
74a1aeff8e TriangleSelector: bugfix - backend did not correctly account for mirrorring 2020-07-24 17:47:16 +02:00
Lukas Matena
5a1d9aee15 TriangleSelector: Fix of a macOS crash
Calling reset() from constructor relied on uninitialized variable
2020-07-24 17:47:16 +02:00
Lukas Matena
afb5d929c4 TriangleSelector: Schedule restarting background process after edit 2020-07-24 17:47:16 +02:00
Lukas Matena
3b91d11ddf TriangleSelector: backend is aware of divided triangles 2020-07-24 17:47:16 +02:00
Lukas Matena
0756a7e4b3 TriangleSelector: 'Select by angle' and 'reset selection' functions fixed 2020-07-24 17:47:16 +02:00
Lukas Matena
6baff45759 TriangleSelector: Separated frontend/backend, support of multiple volumes, etc. 2020-07-24 17:47:16 +02:00
Lukas Matena
953d1417a0 TriangleSelector: draft of interface 2020-07-24 17:47:16 +02:00
YuSanka
a4c12b90f1 PhysicalPrinterCollection: Use select_preset() instead of select_preset_by_name()
+ changed signature for select_preset()
2020-07-23 12:17:18 +02:00
YuSanka
631b15b7d3 Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-07-22 15:53:31 +02:00
enricoturri1966
8e679d8b75 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-07-22 10:37:35 +02:00
enricoturri1966
8f90fe1609 Code cleanup and small refactoring 2020-07-22 10:37:25 +02:00
YuSanka
6d28d68e4a PhysicalPrinter : Implemented synchronizations from user printer profiles with "Print Host upload" information to the new physical printers 2020-07-22 09:24:12 +02:00
rongith
435355adfe Temporary ironing icon to avoid crashes on GTK
Ironing type and spacing can be set per-object
2020-07-22 09:11:48 +02:00
enricoturri1966
6bbc7c048f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-07-21 16:01:27 +02:00
bubnikv
f7ceffb46e Fixed back-end warning infrastructure: The Print / PrintObject
should have been derived from ObjectBase, not from ObjectID.
2020-07-21 15:33:36 +02:00
enricoturri1966
5aadfe3d1c Fixed conflicts after merge with master 2020-07-21 09:48:41 +02:00
YuSanka
f138978fe7 Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-07-21 09:47:29 +02:00
enricoturri1966
dc59e86d2c ENABLE_GCODE_VIEWER -> Partial refactoring in preparation for removal of old time estimator 2020-07-21 09:34:54 +02:00
enricoturri1966
b587289c14 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-07-21 09:09:09 +02:00
enricoturri1966
6e80065240 Added well-known metadata to 3mf export 2020-07-21 09:08:48 +02:00
Lukas Matena
d910f7934b Empty layer check fix
The test gave false positive in case there were supposed to be both object and support extrusions on the first layer
2020-07-21 08:43:23 +02:00
YuSanka
3d990a9189 First try to convert a user printer profiles to the physical printers 2020-07-20 16:27:39 +02:00
YuSanka
72ec414f1e PhysicalPrinters improvements:
- Added possibility to correct delete presets considering with the physical printers
- Smart switching to the printer preset if physical printer was selected
2020-07-20 14:56:09 +02:00
enricoturri1966
2de442b617 Pull request #4235 - Fix tick/untick ironing feature in preview by rongith 2020-07-20 13:31:39 +02:00
Paul Arden
e275197518 Add G10 temperature G-code support for the RepRapFirmware flavour. 2020-07-20 20:57:37 +10:00
enricoturri1966
51f0fd8912 GCodeViewer -> Added visualization of percentage in estimated printing time dialog 2020-07-20 09:45:49 +02:00
YuSanka
5eac36a310 Update for PresetComboBoxes
All "Printer-PresetName" pairs are like a separated items now

+ some code refactoring for PresetComboBoxes::update()
2020-07-17 14:32:38 +02:00
enricoturri1966
b03ae392c5 GCodeViewer -> Added estimated printing times for extrusion roles 2020-07-17 10:50:16 +02:00
enricoturri1966
5d845c7a25 Fixed conflicts after merge with master 2020-07-17 08:58:12 +02:00
enricoturri1966
f7164db68e GCodeViewer -> Added estimated printing times for move types 2020-07-17 08:27:23 +02:00
Lukas Matena
f326352ceb Empty layers check converted to a warning (except for the first layer) 2020-07-16 15:42:33 +02:00
enricoturri1966
602a9bc75f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-07-16 11:09:46 +02:00
enricoturri1966
3a88e69896 ENABLE_GCODE_VIEWER -> Integration of time estimator into GCodeProcessor 2020-07-16 11:09:21 +02:00
bubnikv
ba0146746d Fix of previous commit. 2020-07-15 18:13:11 +02:00
bubnikv
f64da8e6cc Update of back-end warnings:
Back-end warnings contain two new members: "current" and "message_id".
A warning is set to "not current" if its milestone is invalidated.
2020-07-15 18:03:39 +02:00
YuSanka
c5197f3350 PhysicalPrinterDialog is completed 2020-07-14 15:34:08 +02:00
Vojtech Bubnik
746ece4c40 Support for collecting warnings from the background processing.
Multiple warnigns may be collected per Print / PrintObject milestone
and a status update is sent to the UI immediately after a warning
is issued.
2020-07-14 11:52:34 +02:00
enricoturri1966
f5215cac44 Attempt to fix crash on Mac when rotating an object while layer editing is active 2020-07-13 13:16:18 +02:00
enricoturri1966
73b885fc37 GCodeViewer -> Added imgui dialog for estimated printing times 2020-07-08 13:33:50 +02:00
YuSanka
0b88e86634 PhysicalPrinter improvements:
* implemented PresetForPrinter class
2020-06-30 14:12:47 +02:00
enricoturri1966
69de5c8c9f GCodeViewer -> Pass vertex normal to shaders for toolpaths 2020-06-29 14:00:08 +02:00
YuSanka
6d4a0d91fc Fixed typo in PresetComboBox.hpp and added missed include in libslic3r.h 2020-06-26 16:58:53 +02:00
YuSanka
d96b5f3606 PhysicalPrinter : Next improvements:
* Create full printer name as a PrinterName + RelatedPresetName
 * Added printer model to the PhysicalPrinter.config => Enable to select just between presets with same printer model
 * When physical printer is selected and create new preset ask if should we use this preset for selected ph_printer or just to switch for it
2020-06-26 10:00:03 +02:00
YuSanka
1a2926050f PhysicalPrinter. PhysicalPrinterDialog improvements 2020-06-25 12:58:59 +02:00
YuSanka
8ac839f427 Physical printers: Delete selected printer
+ Added context menu for the cog-button near the printer presets
2020-06-24 12:28:00 +02:00
YuSanka
02624689ce Physical Printers.
- save/load printers
 - consistency between selection on Tab and Plater
2020-06-24 08:50:01 +02:00
enricoturri1966
eb215fe994 ENABLE_GCODE_VIEWER_AS_STATE -> Removed tabs from gcode viewer state 2020-06-19 15:32:44 +02:00
enricoturri1966
5c7b0948bc Fixed conflict after merge with master 2020-06-19 11:49:59 +02:00
enricoturri1966
f6b5c64642 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-17 09:34:56 +02:00
YuSanka
19c4f32604 Preset and PresetBundle are moved to the _libslic3r_ folder 2020-06-16 17:03:06 +02:00
Vojtech Bubnik
81b809f2a1 Fixed broken compilation of Perl bindings. 2020-06-16 14:39:08 +02:00
Vojtech Bubnik
b101a8e266 Fixes of the offset curves from Voronoi diagram.
The offset curve extractor is already quite usable,
though singular cases are still not covered yet
when the offset curve intersects or nearly intersects
a Voronoi vertex.

Removal of the PRINTF_ZU "%zu" Visual Studio printf compatibility macro.
Fixes of a contours self intersection test for collinear segments.
SVG exporter now exports white background, so that the GNOME Eye viewer is usable.
2020-06-16 13:15:48 +02:00
enricoturri1966
3982d8b51e Fixed conflict after merge with master 2020-06-15 16:55:14 +02:00
enricoturri1966
dcf68aefd7 Enable built-in DPI changed event handler when building against wxWidgets 3.1.3 2020-06-15 16:20:34 +02:00
enricoturri1966
ab60499298 Fixed conflicts after merge with master 2020-06-12 10:35:18 +02:00
enricoturri1966
aa14b42638 GCodeProcessor -> Added processing of gcode lines G0 2020-06-12 09:01:20 +02:00
enricoturri1966
42a8a4aa77 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-12 07:32:06 +02:00
Vojtech Bubnik
1c95ceaeaa Reworked algorithm for Voronoi Offset curve extraction.
Now the algorithm is very different from the OpenVoronoi implementation
and hopefully it is now correct (save numerical issues, which will be
a big PITA).
2020-06-11 16:11:02 +02:00
enricoturri1966
8c998e5f08 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-11 14:04:08 +02:00
enricoturri1966
920d9677da Added new tech ENABLE_LAYOUT_NO_RESTART -> Enable changing application layout without the need to restart it 2020-06-11 14:02:59 +02:00
tamasmeszaros
f53289ae2d Fix support and hole point reprojection after reload and netfabb 2020-06-10 14:16:11 +02:00
YuSanka
f74b1c6547 Added uncommitted changes 2020-06-08 12:36:42 +02:00
YuSanka
befbd6b0fe Merge remote-tracking branch 'origin/master' into custom_gcodes 2020-06-08 12:27:29 +02:00
YuSanka
43cfd44864 Fixed export/import from/to amf and 3mf file. 2020-06-08 12:25:29 +02:00
enricoturri1966
ca17948f87 ENABLE_GCODE_VIEWER_AS_STATE -> Load gcode from file and process it 2020-06-08 09:12:20 +02:00
YuSanka
629584e28f Editing of the custom GCodes like ColorChange and PausePrint 2020-06-07 22:42:54 +02:00
enricoturri1966
bd5a5bf78f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-06-05 16:51:11 +02:00
enricoturri1966
70a6fb0e20 Added new tech ENABLE_GCODE_VIEWER_AS_STATE -> GCodeViewer as a new application state (WIP) + fix of conflicts after merge with master 2020-06-05 16:50:17 +02:00
YuSanka
530786fca4 Object merge: fixed merge of the objects with changed rotation, scale and mirror
+ Fixed get_object_stl_stats()
2020-06-05 13:15:49 +02:00
Vojtech Bubnik
3e0e537b7a Offset curve from a Voronoi diagram: Fixed distance calculation
to a bisector of two segments.
2020-06-04 15:34:35 +02:00
enricoturri1966
ad7e7ae1cd Added tech ENABLE_OPENGL_ERROR_LOGGING -> log opengl errors when SLIC3R_LOGLEVEL=5 2020-06-04 14:48:52 +02:00
enricoturri1966
c3d643ead3 Fixed conflicts after merge with master 2020-06-04 13:57:39 +02:00
Vojtech Bubnik
6f4d24ab95 WIP: Generating offset curves with properly rounded corners from
a Voronoi diagram. Curve extraction is based on the OpenVoronoi implementation.
2020-06-04 13:50:09 +02:00
Vojtech Bubnik
b8267a5f6f G-code placeholder parser - new values:
print_bed_min, print_bed_max, print_bed_size
calculated from a bounding box of bed_shape vector of points.

Also added first_layer_print_size as a size of a first layer print
bounding box.
2020-06-03 16:30:37 +02:00
Vojtech Bubnik
6529543518 WIP: first_layer_print_min/max, first_layer_print_convex_hull
placeholders for the G-code export.
2020-06-03 16:30:37 +02:00
Lukas Matena
ed98a859af Fix of #3919 (extremely wide wipe tower with 0.35mm FAST profile)
This is an excerpt from ec86d94, which was recently reverted because
the other changes from that commit broke some functionality.
2020-06-03 15:34:33 +02:00
Lukas Matena
8ecb0bfe0e Revert "Workaround for the Prusa3D Fast (layer height 0.35mm) profile, which"
This reverts commit ec86d94f02.
2020-06-03 15:34:33 +02:00
tamasmeszaros
10c59b0d00 Fix the tests after EigenMesh3D refactor 2020-06-02 17:15:08 +02:00
enricoturri1966
06a8bfa588 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-02 10:03:00 +02:00
enricoturri1966
aa92cbf051 New tech ENABLE_SMOOTH_NORMALS (disabled) -> Added two experimental functions to smooth normals using libigl (none of them working properly in detecting edges) when calling GLIndexedVertexArray::load_mesh_full_shading() 2020-06-02 10:02:50 +02:00
tamasmeszaros
4be0e37963 Workaround for items out of bed after arrange.
Fixes #4329
2020-06-01 16:16:30 +02:00
enricoturri1966
71db69ef41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-29 12:29:24 +02:00
Vojtech Bubnik
6f92538c20 BoundingBox support for Lines,
BoundingBox constructor will no more throw for empty vector of points.

GMP allowed for Vojtech's fork of boost::polygon Voronoi implementation.

Added libslic3r tests for boost::polygon Voronoi. All Voronoi issues
ever reported on the Internet are captured by the tests. Two issues
reported (the two test cases) are real issues which may influence
PrusaSlicer negatively, namely

https://github.com/boostorg/polygon/issues/43
2020-05-28 15:53:53 +02:00
enricoturri1966
e9d57c932a Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
enricoturri1966
0599dc4df7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-28 15:27:39 +02:00
enricoturri1966
c63e03c367 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
Lukas Matena
2c244732db Introduced a limit on max print z (1.2 m)
A follow-up of 815989d, related to #2877
2020-05-28 12:03:48 +02:00
enricoturri1966
0e018e6690 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:31:26 +02:00
enricoturri1966
35190936a3 GCodeViewer -> Newer version of shader for options 2020-05-27 16:19:40 +02:00
enricoturri1966
edb643e178 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:03:56 +02:00
Yuri D'Elia
c6f0cd5b5b Ironingy typo 2020-05-27 14:31:17 +02:00
enricoturri1966
448d92df68 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
Lukas Matena
48c186331a Includes cleanup:
GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
2020-05-27 14:01:47 +02:00
YuSanka
ee1942e4e9 Implemented merge of the objects to the one multi-part object
+ Implemented merge of the parts to the one object. But now this function doesn't used.

+ Fixed Model::looks_like_imperial_units()
2020-05-27 11:59:43 +02:00
enricoturri1966
908650630b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 10:45:19 +02:00
enricoturri1966
2eb4b2caed Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
Lukas Matena
3ced59d2a3 Reenabled SLIC3R_HOLE_RAYCASTER before unit tests are updated properly
There are still tests of removing holes on slices and raycasting on unaltered mesh (which was eventually superseded by CGAL boolean operations)
2020-05-27 10:05:54 +02:00
Lukas Matena
55395e046f EigenMesh3D does not store a copy of the mesh
Instead, it stores a pointer to extern TriangleMesh (which must not be destroyed before the EigenMesh3D object)
2020-05-27 00:51:11 +02:00
Lukas Matena
1f833921a2 More code cleaning,...
optimizations regarding normals calculation
removed unused EigenMesh3D(const Contour3D &other) constructor
removed unused class si_result
2020-05-27 00:51:11 +02:00
Lukas Matena
d85fa8e9ab EigenMesh3D now stores TriangleMesh inside, not a mesh in Eigen format
Rotfinder was apparently building the AABB tree needlessly
2020-05-27 00:51:11 +02:00
Lukas Matena
9224a6a3e6 Removed some unused code
- removed define USE_AABB_INDIRECT (which switched between old and new AABB implementation)
- removed define SLIC3R_SLA_NEEDS_WINDTREE (relied on igl and was not used anyway)
- new define SLIC3R_HOLE_RAYCASTER (hides currently unused code)
- slight include cleanup
- removed obsolete source file SupportTreeIGL.cpp
2020-05-27 00:51:11 +02:00
Lukas Matena
cdf80c3b3f Switched to new AABB tree implementation for raycasting 2020-05-27 00:13:38 +02:00
Lukas Matena
32a353058f Fixed few warnings 2020-05-26 16:06:11 +02:00
Lukas Matena
c2cd430941 Few more include chains broken 2020-05-26 13:46:59 +02:00
Lukas Matena
02838eaa30 Slight include cleanup 2020-05-26 13:45:36 +02:00
Lukas Matena
fb9d8b2025 Include cleanup: do not include Model.hpp from 3DScene.hpp 2020-05-26 13:45:36 +02:00
enricoturri1966
1d317489fd GCodeViewer -> Temporary ImGui dialog for editing shaders parameters 2020-05-26 08:16:08 +02:00
enricoturri1966
314995fa0b ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
enricoturri1966
80c2f107c1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-22 12:12:56 +02:00
Vojtech Bubnik
ac1f24e5c9 AABB: Some further polishing and a reference to an SSE implementation
of the 3D Box vs. ray intersection implementation.
2020-05-22 11:35:49 +02:00
Vojtech Bubnik
dc46589a8e AABB - triangle intersection wrapped to mimize copying into Vector3D 2020-05-22 09:29:21 +02:00
Vojtech Bubnik
c64b7b2e21 Fix of the previous commit. 2020-05-22 09:29:21 +02:00
Vojtech Bubnik
7b6dff3f03 Little simplification of Point to boost::polygon bindings 2020-05-22 09:29:21 +02:00
Vojtech Bubnik
4c365ad583 Replaced many defines in libslic3r.h with constexpr,
removed some macros to support old visual studio compiler.
2020-05-22 09:29:21 +02:00
Vojtech Bubnik
99514ba42b WIP: AABBTreeIndirect - optimized ray_box_intersect_invdir() test,
sandbox for comparing the AABBTreeIndirect with libigl::AABB
2020-05-22 09:29:21 +02:00
Vojtech Bubnik
2b8f655020 WIP AABBIndirect: Documentation, polishing. 2020-05-22 09:29:21 +02:00
Vojtech Bubnik
eeb9590d28 WIP: own AABBTreeIndirect, builds up the tree 4x quicker than libigl. 2020-05-22 09:29:21 +02:00
Vojtech Bubnik
abf279fc44 Fixed compilation with Shiny profiler. 2020-05-22 09:29:21 +02:00
enricoturri1966
dd424b6bcf Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 11:38:22 +02:00
Lukas Matena
35c8c84631 Fix of #3965 (properly disable linear advance with RepRap firmware) 2020-05-21 10:47:50 +02:00
enricoturri1966
cae84d2857 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:15:24 +02:00
YuSanka
8afd273c4b Implemented "from/to imperial units conversation" for loaded objects and volumes 2020-05-20 20:07:31 +02:00
enricoturri1966
cbfb09a241 Fixed build for all 4 cases of tech ENABLE_SHADERS_MANAGER and ENABLE_GCODE_VIEWER enabled/disabled and code cleanup 2020-05-20 17:03:53 +02:00
enricoturri1966
c7c87973b7 First installment of tech ENABLE_SHADERS_MANAGER, using class GLShadersManager as a central point to manage OpenGL shaders 2020-05-20 14:11:22 +02:00
enricoturri1966
8a834b76e4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-19 07:57:19 +02:00
YuSanka
504066e64b Merge remote-tracking branch 'origin/ys_imperial_unit' 2020-05-18 16:01:10 +02:00
enricoturri1966
c49f46d904 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 17:58:07 +02:00
enricoturri1966
9487676680 ENABLE_CANVAS_TOOLTIP_USING_IMGUI set as default 2020-05-15 13:40:45 +02:00
enricoturri1966
b9f0b9eeda ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX set as default 2020-05-15 12:42:29 +02:00
enricoturri1966
a68eefbe4a Tech ENABLE_GCODE_VIEWER -> Refactoring and code cleanup 2020-05-15 12:25:38 +02:00
enricoturri1966
e57bc8afc1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 09:23:20 +02:00
enricoturri1966
5be901547e GCodeViewer -> Imgui slider for sequential view replaced by DoubleSlider::Control (wip) 2020-05-15 09:22:51 +02:00
tamasmeszaros
f91c27b2ff Do reprojection also after netfabb repair 2020-05-13 14:53:20 +02:00
tamasmeszaros
f7a43f9757 Reproject support and hole points after a reload from disk op. 2020-05-13 14:53:20 +02:00
enricoturri1966
2bd514614b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-13 12:34:50 +02:00
Lukas Matena
b046eb4fc9 Merge branch 'master' into lm_fdm_custom_supports_polishing 2020-05-11 17:03:03 +02:00
enricoturri1966
3475604362 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-11 16:37:19 +02:00
tamasmeszaros
4fe99c7569 Fix missing support mini sticks 2020-05-11 14:07:21 +02:00
enricoturri1966
89dafeac95 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-07 10:49:34 +02:00
enricoturri1966
5c6a56ca29 GCodeAnalyzer and GCodePreviewData removed from tech ENABLE_GCODE_VIEWER 2020-05-07 10:49:12 +02:00
bubnikv
b73e675aaa Changed the Ironing G-code preview color based on Jindra's feedback. 2020-05-06 18:28:23 +02:00
bubnikv
0940db7b2e Improvements of the monotonous infill ordering:
Calculate the initial path length and set the initial pheromone level
accordingly.
Implemented a stopping criterion to ant colony optimization.
Fixed some compilation warnings.
2020-05-06 18:28:23 +02:00
enricoturri1966
aa49575e0f Fixed conflicts after merge with master 2020-05-06 12:48:00 +02:00
enricoturri1966
0bb56736a1 Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
YuSanka
75fa07136f Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-05-05 17:26:14 +02:00
Lukas Matena
e0b04e7d36 Merge branch 'master' into lm_fdm_custom_supports_polishing 2020-05-05 13:46:01 +02:00
Lukas Matena
272de22055 Undo/redo in FDM supports gizmo 2020-05-05 13:45:04 +02:00
enricoturri1966
813e268d7e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-04 09:37:29 +02:00
bubnikv
f479b77e01 Fixed compilation warning. 2020-04-30 12:04:49 +02:00
YuSanka
bf09d8f93a Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-29 19:17:20 +02:00
YuSanka
495db2ff2e Imperial units: Implemented just for the object's position and size 2020-04-29 19:10:13 +02:00
YuSanka
99d49a74d0 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
enricoturri1966
05e4476808 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-29 12:53:55 +02:00
David Kocik
d828a1e80b single slicer instance
check for other instances during startup
send message with command line arguments if found and terminate
listen for those messages and load objects from paths in messages from them
2020-04-29 10:53:48 +02:00
enricoturri1966
c9bd0840b3 GCodeViewer -> Code cleanup 2020-04-29 08:24:39 +02:00
bubnikv
4de4d765ee Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-04-28 19:31:18 +02:00
bubnikv
ef89c73fd5 fixing a compilation issue on a buggy GCC on R-PI 2020-04-28 18:28:11 +02:00
bubnikv
ec81de7553 Ironing and Monotonous infill - first working implementation. 2020-04-28 17:19:11 +02:00
enricoturri1966
3267d3368f GCodeViewer -> Use glMultiDrawElements() in place of glDrawElements() to draw extrude and travel paths 2020-04-28 15:08:36 +02:00
tamasmeszaros
572b5ba8bb Add PNG and wxWidgets 3.1.3 uniformly to all platforms with cmake build.
wx is built with png as a dependency, wxpng is disabled.
2020-04-28 15:01:56 +02:00
enricoturri1966
a00c391f0f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-28 10:29:44 +02:00
enricoturri1966
1cb0f044db GCodeProcessor::MoveVertex -> added placeholder for time 2020-04-28 10:29:25 +02:00
enricoturri1966
2a4d011817 GCodeViewer -> Toggle extrusion role visibility by clicking on legend 2020-04-28 08:50:52 +02:00
Lukas Matena
2bd524849a Custom support blockers are now working 2020-04-27 17:45:55 +02:00
enricoturri1966
eac4b3c15a GCodeViewer -> Added debug statistics imgui dialog 2020-04-27 14:10:18 +02:00
Lukas Matena
bf2a10803e Fixing debug build broken after recent merge 2020-04-27 12:15:45 +02:00
bubnikv
033548a568 Introduction of Monotonous infill type. Fill no-sort only for monotonous
and ironing infills.
2020-04-25 08:15:04 +02:00
Lukas Matena
8afc9338de Merge branch 'lm_fdm_custom_supports_backend' 2020-04-24 15:16:33 +02:00
enricoturri1966
e5c45405d4 Fixed conflicts after merge with master 2020-04-24 10:59:03 +02:00
bubnikv
e390ebc95c WIP: Monotonous infill 2020-04-24 09:41:48 +02:00
enricoturri1966
81a29169ae GCodeViewer -> Coloring of travel paths 2020-04-24 08:46:31 +02:00
Lukas Matena
5a80f0442f Optimization of the custom support projection algorithm
- transformation matrix is precalculated for each volume
- number of heap allocations was reduced
2020-04-24 01:26:13 +02:00
tamasmeszaros
217477a9ff SLA archive import with miniz, marching square bugfixes
Fix compilation on Windows


Fix array subscript out of range error in MarchingSquares


Fix normals of mesh constructed from slices


Improve performance of mesh construction from slices
2020-04-23 19:12:07 +02:00
tamasmeszaros
247fca6d55 Initial version of sl1 import with sla::Raster refactor. 2020-04-23 19:05:32 +02:00
tamasmeszaros
728d90cb33 Separate jobs from Plater, re-add big bed workaround 2020-04-23 18:47:51 +02:00
tamasmeszaros
1bffc2b99b Add ModelArrange.hpp as extension to Model.hpp, use it for duplicating
Refactored Arrange interface: remove the union based BedShapeHint, replace it with proper function overloads

WARN: this commit is only intermediate, it does not compile.
2020-04-23 18:19:03 +02:00
tamasmeszaros
44ca0a6c3d Add universal method to get bed shape from Config objects 2020-04-23 18:18:23 +02:00
tamasmeszaros
8c04536514 Integrate scaling and unscaling into Point.hpp 2020-04-23 18:17:50 +02:00
tamasmeszaros
89d376dc35 Add min_object_distance method as free function taking ConfigBase argument 2020-04-23 18:17:37 +02:00
enricoturri1966
90d5cf1735 Fix to previous commit 2020-04-23 15:46:21 +02:00
enricoturri1966
66964c44c1 GCodeViewer -> Refactoring and code cleanup 2020-04-23 15:12:40 +02:00
enricoturri1966
7a0df4bcb4 GCodeViewer -> Extrusion toolpaths colored by color print (wip) + visualization of tool changes, color changes, pause prints, custom gcodes + refactoring 2020-04-22 16:29:07 +02:00
Lukas Matena
61e5eab35d Custom supports projection now runs in parallel 2020-04-22 16:08:36 +02:00
Lukas Matena
a40d60ce08 Custom support generation now ignores triangles with upward-pointing normal 2020-04-22 14:01:29 +02:00
Lukas Matena
d74b5cb1da Custom supports data change forces invalidation of supports step 2020-04-22 11:16:28 +02:00
bubnikv
03eb5ffcd5 WIP: Reworking of FillRectilinear2 to support monotonous infill
with ant colony optimization and 3-opt flips.
2020-04-22 10:54:11 +02:00
Lukas Matena
8d95345ede Fixed a logic error in the algorithm
The error created extremely large projections of triangles that were close to horizontal
2020-04-22 10:11:42 +02:00
Lukas Matena
7fc4a71715 Moved the projection function into PrintObject.cpp 2020-04-21 13:50:47 +02:00
enricoturri1966
443a511420 GCodeViewer -> Extrusion toolpaths colored by volumetric rate 2020-04-21 11:38:42 +02:00
Lukas Matena
79ef456d7c Fixed the algorithm so it works for horizontal triangles
Partial code cleanup
2020-04-21 01:39:40 +02:00
Lukas Matena
20068842ec Project each part of the triangle on one slice only (WIP) 2020-04-21 01:39:35 +02:00
Lukas Matena
7b104bcdd1 Save z heights of the triangle vertices 2020-04-20 14:01:11 +02:00
enricoturri1966
aee80dbd01 GCodeViewer -> Extrusion toolpaths colored by width 2020-04-20 13:24:25 +02:00
enricoturri1966
6e5a6f3b43 GCodeViewer -> Extrusion toolpaths colored by height 2020-04-20 10:52:16 +02:00
enricoturri1966
3a07e8730f GCodeViewer -> Basic legend using imgui 2020-04-18 10:41:37 +02:00
Lukas Matena
c570fc40de First partially working implementation of custom supports at the backend
The solution is temporary and should be improved and moved elsewhere - see comments in the code.
2020-04-17 13:15:26 +02:00
enricoturri1966
9c68abfb35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-17 08:18:20 +02:00
Lukas Matena
546b0702f9 Custom supports data are saved into ModelObject and propagate to the backend
Invalidation of supports after they change is not implemented yet.
2020-04-16 16:57:46 +02:00
enricoturri1966
75d1e8373d GCodeViewer -> extrusion paths colored by extrusion role 2020-04-16 15:09:04 +02:00
YuSanka
ae51f280b8 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-16 11:46:29 +02:00
bubnikv
10110ed307 WIP: Ironing over top surfaces. 2020-04-14 11:53:28 +02:00
enricoturri1966
c3eb65c461 Added class GCodeViewer -> basic render of gcode toolpaths using dedicated shaders 2020-04-14 10:02:08 +02:00
YuSanka
167f7cf5de Added map for save Group and Category values for each option
+ Some code refactoring in Tab (the translation of the titles moved to the OptionGroups) and Search
+ Fixed assert in fts_fuzzy_match
2020-04-13 17:55:38 +02:00
Lukas Matena
a380053a17 Merge branch 'lm_gizmos' into lm_fdm_supports_gizmo 2020-04-07 17:16:48 +02:00
enricoturri1966
22cf0396fc Added missing include 2020-04-06 17:32:35 +02:00
enricoturri1966
2c69d96239 Reduced size of GCodeProcessor::MoveVertex 2020-04-06 17:24:11 +02:00
enricoturri1966
57dad5dfd2 GCodeProcessor additions:
process color change comment tag

process pause print comment tag

process custom code comment tag

process end pause print or custom code comment tag
2020-04-06 11:53:15 +02:00
enricoturri1966
1caac17b02 GCodeProcessor additions:
process M108 lines

process M132 lines

process M135 lines

process M401 lines

process M402 lines
2020-04-06 08:55:48 +02:00
enricoturri1966
dce1f24ad8 GCodeProcessor additions:
process G10 lines

process G11 lines

process G22 lines

process G23 lines

process M106 lines

process M107 lines

process mm3_per_mm comment tag
2020-04-03 10:15:46 +02:00
enricoturri1966
f05de150c5 Added another missing include 2020-04-02 15:52:42 +02:00
enricoturri1966
d0ce17656f Added missing includes 2020-04-02 13:19:42 +02:00
enricoturri1966
ab1e90ec0d Fixed conflicts after merge with master 2020-04-02 12:29:30 +02:00
enricoturri1966
956f7a4593 GCodeProcessor additions:
process G90 lines

process G91 lines

process G92 lines

process M82 lines

process M83 lines

process T lines

process extrusion role/width/height comment tags

debug output
2020-04-02 12:03:18 +02:00
enricoturri1966
a6fe16c612 3rd attempt to fix build on AppleClang 2020-04-02 08:11:25 +02:00
enricoturri1966
f27999e136 Follow-up of cfb6ac76fc - Another attempt to fix the build on AppleClang (std::array in lambdas) 2020-04-01 16:47:35 +02:00
enricoturri1966
cfb6ac76fc Fixed build on AppleClang 2020-04-01 15:54:25 +02:00
enricoturri1966
f598c2d5d8 Fixed conflicts after merge with master 2020-04-01 15:06:30 +02:00
bubnikv
31b0ae164d Optimization of the GCodeTimeEstimator to only keep a fixed number
of trapeziodal blocks around. The number is hard coded to 64,
and 3x64 blocks are flushed everytime the queue grows over 4x64 blocks.
This time estimator is slightly more close to what the firmware does, which
keeps a fixed number of blocks and it recalculates all the blocks
every time a new block is added while the oldest block is pushed out
of the queue. Therefore this optimization shall produce negligible
differences to what the previous code produced.
2020-04-01 13:42:26 +02:00
enricoturri1966
8a03d5642d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-04-01 09:58:48 +02:00
enricoturri1966
1f3046f65d #3964 - Attempt to fix crash when closing on Linux (Debian unstable) 2020-04-01 09:58:31 +02:00
bubnikv
b843a094f6 Slic3r::format(), Slic3r::GUI::format_wxstr():
wrappers around boost::format using C++17 variadic templates,
replacing the ugly and verbose
	(boost::format("template") % arg1 % arg2).str()
syntax.
The wrappers also implictely convert input parameters including the template
from wxString to UTF8.

The new format wrapper has been applied at multiple places as a start,
also some double macros _(L()) with new single macro _L().
2020-04-01 09:49:04 +02:00
tamasmeszaros
70baa0d246 Fix arrange for large beds 2020-03-30 13:26:24 +02:00
enricoturri1966
29cbfa7c9e Fixed conflicts after merge with master 2020-03-30 09:36:37 +02:00
enricoturri1966
35e963a566 Small refactoring 2020-03-30 09:01:50 +02:00
bubnikv
ec86d94f02 Workaround for the Prusa3D Fast (layer height 0.35mm) profile, which
collides with the maximum allowed layer height at the Printer Extruder
0.25mm.

Works around "MMU2s and supports on prusaslicer 2.2.0 issue #3919"
2020-03-27 14:15:09 +01:00
bubnikv
b3cebdb672 Fix after merge 2020-03-25 17:55:46 +01:00
bubnikv
750e704b37 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
bubnikv
8d7f88b381 Imported error reporting when loading presets with option keys
or option values that our poor software does not understand.
This applies to configs added by some forks of slic3r, for example
slic3r++
PrusaSlicer has encountered an error: Failed loading the preset file: #3909
2020-03-25 16:04:11 +01:00
enricoturri1966
a54d77699b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-25 14:54:10 +01:00
enricoturri1966
f12b39be25 Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
bubnikv
4656102dba Compile with 32bit coord_t by default. 2020-03-25 14:35:41 +01:00
bubnikv
c27297f6cc 64bit coord_t
Vec3i as a vertex index to TriangleMesh constructor
2020-03-25 14:35:41 +01:00
enricoturri1966
a1a4d49f15 Fixed conflicts after merge with master 2020-03-25 12:07:59 +01:00
enricoturri1966
10eb954c7e ENABLE_AUTO_CONSTRAINED_CAMERA set as default 2020-03-25 10:24:52 +01:00
enricoturri1966
3d6c9e54e9 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
enricoturri1966
fac28ea27a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-25 09:34:17 +01:00
enricoturri1966
c300b66b7e ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 09:05:35 +01:00
enricoturri1966
69ca14a695 ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:52:57 +01:00
enricoturri1966
6f1c99db34 ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:43:18 +01:00
enricoturri1966
36041ced26 ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:31:15 +01:00
Lukas Matena
97b9de47b4 Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
enricoturri1966
4c1d867ba0 #3897 - Small optimisation in GCodePreviewData::RangeBase::get_color_at (thanks to rongith) 2020-03-23 16:12:52 +01:00
bubnikv
046f0dbfa2 Fixed a regression issue to PrusaSlicer 2.1.1
Custom printer with center of bed at 0,0 results in "toolpath outside print area" #3510
The G92 A0 B0 was incorrectly considered to be equal to just G92
to reset all axes.
2020-03-21 10:09:33 +01:00
bubnikv
1cbb822dd7 Enabled "clip multipart objects" by default, see discussion in
https://github.com/prusa3d/PrusaSlicer/issues/2803#issuecomment-524602137
2020-03-20 18:25:11 +01:00
bubnikv
a9fc39491e Fix of weird double extrusions with multiple regions and their
parameters being changed between slicing runs.
2020-03-20 13:37:13 +01:00
enricoturri1966
5b24a0fb91 Fixed conflicts after merge with master 2020-03-20 10:55:37 +01:00
enricoturri1966
2501cf64c0 Modified mouse events handling for gizmobar
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip

The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
Lukas Matena
08daddb5de WIP: First working implementation of the triangle selector for the FDM support gizmo 2020-03-19 11:15:17 +01:00
enricoturri1966
739d8131ab Modified mouse events handling for toolbar
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
enricoturri1966
61f3b53ef8 Fixed conflicts after merge with master 2020-03-18 14:26:44 +01:00
enricoturri1966
cd55b235ad Canvas tooltip constrained inside canvas 2020-03-18 14:13:50 +01:00
enricoturri1966
f4aa9c5b0e #3858 - Added missing reset for fan speed visualization 2020-03-18 08:10:05 +01:00
enricoturri1966
166389e6a8 Initial delay for ImGUI-based tooltip 2020-03-17 14:35:56 +01:00
enricoturri1966
7a1fa3d847 Canvas' tooltip using ImGUI 2020-03-17 13:01:38 +01:00
bubnikv
98fb8b626f Fix of Wipe to Infill causes severe overextrusion (thicker walls & infill) (#3842)
Regressinon in regard to PrusaSlicer 2.2.1 due to Vojtech's refactorings
for efficiency.
2020-03-17 09:41:54 +01:00
enricoturri1966
2ab8a474c2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-17 07:59:10 +01:00
tamasmeszaros
5ed7d0aa29 Fix arrangement with items larger or equal to bed dimesions.
fixes #2897 
fixes #1186
2020-03-16 14:37:54 +01:00
enricoturri1966
ac4d9ea172 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
bubnikv
7f376fa927 Fix of infill type update with vase mode enabled after change
of the number of bottom layers.
related to [2.2.1-RC] Vase mode prints base no matter what #3823
2020-03-14 11:59:50 +01:00
bubnikv
dc1ffe15a8 Revert "Added "Filament spool weight" option to filament options"
This reverts commit 3d3e36ba8d.

The change is too risky just before the PrusaSlicer 2.2.0 final release
and the feature may need a bit of polishing before release.
2020-03-14 09:49:12 +01:00
bubnikv
6b58f67fb8 "inifinit_skirt" renamed to "draft_shield"
Polished the tooltip for the draft shield.
Legacy conversion from old skirt_heigth == -1 to draft_shield = 1
2020-03-14 07:46:39 +01:00
bubnikv
37b3780a72 Merge remote-tracking branch 'remotes/origin/et_free_camera' 2020-03-14 07:02:08 +01:00