GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-27 23:42:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,322 Commits 65 Branches 55 Tags
Commit Graph

510 Commits

Author SHA1 Message Date
Lukas Matena
08cb5bc2c7 Wipe tower uses correct gcodes for RepRap gcode flavor (M907->M906, M900->M572 - should fix #1843) 
Also, fixed proper setting of the extruder current during toolchange (was broken since 6da83c7)
 2019-04-24 12:09:58 +02:00
bubnikv
d83a013d6b Export of filament statistics into G-code for multi-material prints 
has been rewritten to be easier to parse.

Old format
; filament used = 19248.8mm (46.3cm3)
; filament used = 57.4
; filament cost = 1.5
; filament used = 8007.6mm (19.3cm3)
; filament used = 23.9
; filament cost = 0.6
; filament used = 0.0mm (0.0cm3)
; filament used = 0.0mm (0.0cm3)
; filament used = 0.0mm (0.0cm3)
; total filament cost = 2.1

New format
; filament used [mm] = 1600.7,1600.7,1600.7,1600.7,1600.7
; filament used [cm3] = 3.9,3.9,3.9,3.9,3.9
; filament used [g] = 4.8,4.8,4.8,4.8,4.8
; filament cost = 1.5,1.5,1.5,1.5,1.5
; total filament used [g] = 24.0
; total filament cost = 7.5

Where the non-printing extruders are filled in with zeros, and
the trailing non-printing extruders are not exported.

; filament used [g]
and
; filament cost
are only printed if non zero (material density and cost are defined)
 2019-04-16 14:25:50 +02:00
supermerill
c03564f218 restore most loop orientation to ccw. 
add test_model and test_print tests. Work is needed for them
 2019-04-08 20:10:00 +02:00
supermerill
18a57ee137 Changed precision from ~25b (2 147.48mm -> 0.1um) to ~40b (17km -> 0.1um) 
it's scaled by 10^6 (~20b), with 10^2 (~7b) under the epsilon
also, CLIPPER_OFFSET_SCALE scale the number by 2^17, and clipper disallow the use of the 2 higher bits, so it can't go higher than 45b
 2019-04-08 20:02:21 +02:00
Enrico Turri
ea3d30bff1 Fix of #2082 -> Added lines M73 P100 and M73 Q100 to gcode to signal that print is finished 2019-04-08 11:54:58 +02:00
supermerill
8bc9f645f0 Merge remote-tracking branch 'remotes/prusa/master' 2019-03-26 15:42:08 +01:00
bubnikv
e0e1e2b682 Improved SLA layer view: Low layer shall be rendered from the slice above, 
triangulated slices are shifted slightly away from the clipping planes.

FDM: Ported a "(bridged)" G-code comment from upstream.
 2019-03-26 10:38:50 +01:00
supermerill
7afe2092b2 skirt & brim with complete individual object, now one per copy instead of one per object. 
Also printed at the right g-code position.
 2019-03-15 17:01:44 +01:00
Enrico Turri
f5b5e48ad7 Added cancel mechanism to GCodeAnalyzer::calc_gcode_preview_data() 2019-03-12 11:57:39 +01:00
supermerill
b12f484b48 quick fix for "silent time_estimator" when enabled but does not exist => CTD 2019-03-10 21:09:12 +01:00
Enrico Turri
219ea04c23 Fix of #1812 (GCode Anayzer take in account extruder offsets for multiextruder printers) 2019-03-06 10:22:10 +01:00
supermerill
12a7143882 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-03-06 01:00:37 +01:00
Enrico Turri
8a29ec2204 GCode Anayzer take in account extruder offsets 2019-03-05 15:03:56 +01:00
supermerill
a3b9bebfa3 restore "hidden" seam as prusa "nearest". 2019-03-02 23:42:06 +01:00
Enrico Turri
8a6d29f7d8 Workaround to fix inconsistencies of width of gcode preview extrusion paths 2019-03-01 09:55:43 +01:00
supermerill
c6239850b0 new: fan startup delay. (or advanced speed-up) 2019-02-21 19:28:13 +01:00
supermerill
cfbafe4322 Sawtooth infill : may be useful for support interface (idea by e3D) 
add a setting to select the support interface.
need some tests to see if it works.
 2019-02-21 19:12:35 +01:00
supermerill
d7141abcb4 vase mode fix: 
* if the object is hollow and has only thin walls loops, the orientation must be enforced on gcode.cpp
 * add extra_perimeters as unwanted setting for spiral vase.
 * add dense infill as unwanted setting for spiral vase.
 2019-02-14 13:34:37 +01:00
supermerill
3cbb2f7524 Octoprint-Cancelobject : more reliable (i think) and add header for object bounding box. 2019-02-12 19:11:02 +01:00
supermerill
95a6ea1477 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-02-11 15:32:35 +01:00
bubnikv
a56f7d60e5 Fixed an issue, where the output G-code file name was not always updated 
from the current Model/ModelObjects.
Fixed a possible race condition in updating Print::m_placeholder_parser
with the proposed filename / filename base.
Improved documentation (source code comments).
 2019-02-03 10:41:14 +01:00
supermerill
0680d6fe05 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-02-01 11:52:07 +01:00
bubnikv
c82d346c1a Fixed a bug in initialization of some StaticPrintConfig derived classes. 
Merged implementation of support for "Octoprint-Cancelobject" #972
thanks @supermerill
 2019-01-31 15:09:16 +01:00
bubnikv
57bd0889c3 Disabled the experimental pressure equalizer. 2019-01-29 18:07:45 +01:00
supermerill
a76bb026df Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-29 17:55:24 +01:00
bubnikv
aaaffd7f90 Fixes Add [layer_num] and [layer_z] to Custom Tool change G-code #1651 2019-01-29 12:02:48 +01:00
supermerill
1999974f7a Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-25 19:45:50 +01:00
Lukas Matena
ed1aad9de4 PURGING FINISHED gcode comment only emitted on layers where some purging was happening 2019-01-21 14:05:28 +01:00
bubnikv
54299d8eb0 Fix of https://github.com/prusa3d/Slic3r/issues/1631 
This is a fix of a long standing bug, where an extrusion is incorrectly
drawn from the end of the last wipe move. Interestingly enough,
this bug is in Slic3r at least since 1.2.9, but lucky enough
it only occured for single perimeter, no infill prints with wipe after
retract enabled, and only if the two successive slices were discretized
exactly the same, which is quite unlikely.
 2019-01-14 19:57:41 +01:00
supermerill
b1b76c0723 brim ears 
- add brim_ears setting: bool: set to true to activate this new funtino
 - add brim_ears_max_angle : float : max angle for a corner to be assigned a brim ear.
 2019-01-10 23:49:06 +01:00
meril
b91b476032 bugfix 2019-01-08 17:40:16 +01:00
bubnikv
2f4adc1906 Implemented [filament_extruder_id] placeholder #1568 2019-01-07 15:12:40 +01:00
bubnikv
026bc801e3 Fix of #1505, #1541 
Fixed a regression issue in initialization of the "Avoid external perimeters"
feature.
 2019-01-07 12:20:48 +01:00
supermerill
339531fa71 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-04 19:35:01 +01:00
bubnikv
567b367061 Disabled the print bed mesh temporarily, 
bumped up the build version to alpha2,
fixed one minor issue in G-code generator
 2019-01-04 16:48:41 +01:00
supermerill
b053a23e1e option for no z-lift on top solid infill. 2019-01-03 19:57:18 +01:00
supermerill
72d828cf74 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-03 14:47:34 +01:00
supermerill
86d73b9a2a Merge branch 'master_slic3rPE_PR' into masterPE 2018-12-19 18:22:51 +01:00
supermerill
a658ae653e Merge branch 'master' into masterPE (renaming) 2018-12-19 18:18:18 +01:00
supermerill
a36142d258 merge complete 2018-12-19 17:14:11 +01:00
bubnikv
8bc04e640a The G-code export was reshuffled a bit to reduce peak memory consumption. 
Namely, the time estimate memory is released before the G-code
preview data is created from the G-code analyser data.
 2018-12-18 17:34:21 +01:00
bubnikv
1e6900afa2 Logging of memory usage for the GCodeAnalyzer and GCodePreviewData. 2018-12-18 15:55:45 +01:00
bubnikv
bffcaeff41 Time estimator: Added consumed memory tracing, replaced std::map 
with std::vector for lower memory consumption.
 2018-12-18 14:10:31 +01:00
bubnikv
771928d916 Logging of memory allocations on Windows during the slicing process 
when the SLIC3R_LOGLEVEL >= info.
 2018-12-18 11:31:41 +01:00
supermerill
2e2fee79ec Merge branch 'masterPE' into master_slic3rPE_PR 
# "resolved" Conflicts:
#	lib/Slic3r/GUI/Plater.pm
#	slic3r.pl
#	src/libslic3r/EdgeGrid.cpp
#	src/libslic3r/EdgeGrid.hpp
#	src/libslic3r/Fill/Fill.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/PreviewData.cpp
#	src/libslic3r/GCode/PreviewData.hpp
#	src/libslic3r/GCode/WipeTowerPrusaMM.cpp
#	src/libslic3r/Geometry.hpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Model.cpp
#	src/libslic3r/MultiPoint.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/libslic3r/SupportMaterial.cpp
#	src/libslic3r/TriangleMesh.cpp
#	src/slic3r/AppController.hpp
#	src/slic3r/AppControllerWx.cpp
#	src/slic3r/GUI/3DScene.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GUI.cpp
#	src/slic3r/GUI/GUI.hpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/Preset.cpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Tab.hpp
#	xs/CMakeLists.txt
#	xs/xsp/AppController.xsp
#	xs/xsp/GUI.xsp
#	xs/xsp/Print.xsp
 2018-12-17 15:58:41 +01:00
supermerill
a11db7a227 Merge tag 'mass_rename' into master_slic3rPE_PR 
# "resolved" Conflicts:
#	lib/Slic3r/GUI/Plater.pm
#	lib/Slic3r/GUI/Plater/2DToolpaths.pm
#	lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
#	lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
#	lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
#	lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
#	src/libslic3r/EdgeGrid.cpp
#	src/libslic3r/EdgeGrid.hpp
#	src/libslic3r/ExPolygon.cpp
#	src/libslic3r/ExtrusionEntity.hpp
#	src/libslic3r/ExtrusionEntityCollection.hpp
#	src/libslic3r/Fill/Fill.cpp
#	src/libslic3r/Fill/FillBase.cpp
#	src/libslic3r/Flow.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/ToolOrdering.cpp
#	src/libslic3r/GCode/WipeTowerPrusaMM.cpp
#	src/libslic3r/Geometry.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Model.cpp
#	src/libslic3r/MultiPoint.cpp
#	src/libslic3r/MultiPoint.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PerimeterGenerator.hpp
#	src/libslic3r/Polyline.cpp
#	src/libslic3r/Polyline.hpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/libslic3r/SupportMaterial.cpp
#	src/libslic3r/TriangleMesh.cpp
#	src/libslic3r/TriangleMesh.hpp
#	src/libslic3r/Utils.hpp
#	src/libslic3r/utils.cpp
#	src/slic3r/AppController.hpp
#	src/slic3r/AppControllerWx.cpp
#	src/slic3r/GUI/3DScene.cpp
#	src/slic3r/GUI/GUI.cpp
#	src/slic3r/GUI/GUI.hpp
#	src/slic3r/GUI/Preset.cpp
#	src/slic3r/GUI/ProgressIndicator.hpp
#	src/slic3r/GUI/Tab.hpp
#	xs/CMakeLists.txt
#	xs/src/libslic3r/Layer.hpp
#	xs/src/libslic3r/Line.cpp
#	xs/src/libslic3r/Line.hpp
#	xs/src/libslic3r/Point.hpp
#	xs/src/libslic3r/Print.hpp
#	xs/src/libslic3r/PrintRegion.cpp
#	xs/src/slic3r/AppController.cpp
#	xs/xsp/AppController.xsp
#	xs/xsp/GUI.xsp
#	xs/xsp/Print.xsp
 2018-12-17 15:42:50 +01:00
bubnikv
9f43e7d375 Fixed a harless assert in PrintObject consturctor. 
Fixed a bug in G-code generator regarding the seam hiding.
 2018-12-07 11:21:05 +01:00
bubnikv
c586ca4ae0 Implemented compatible_printer / compatible_printer_condition 
for filaments and SLA materials.

Fixed compatible_printers / compatible_prints dialog to show
system profiles as well.
 2018-12-04 17:56:49 +01:00
YuSanka
c010e14460 Suppress ColorPrint for the multi-material printing 2018-11-28 16:03:25 +01:00
YuSanka
360133246c Fixed ColorPrint current layer identification 2018-11-28 16:03:24 +01:00