From 416411bd6454ff535a1dc5e2226862c3a4e64cae Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 22 Feb 2019 12:22:51 +0100 Subject: [PATCH] SLA: Changed default value of the faded_layers to the current one. This information is used for export config.ini --- src/libslic3r/PrintExport.hpp | 6 ------ src/libslic3r/SLAPrint.cpp | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/libslic3r/PrintExport.hpp b/src/libslic3r/PrintExport.hpp index e196cde5f..0df405846 100644 --- a/src/libslic3r/PrintExport.hpp +++ b/src/libslic3r/PrintExport.hpp @@ -155,14 +155,8 @@ template<> class FilePrinter "jobDir = ") + projectname + "\n" + "expTime = " + expt_str + "\n" "expTimeFirst = " + expt_first_str + "\n" -// "stepNum = " + stepnum_str + "\n" -// "wifiOn = 1\n" -// "tiltSlow = 60\n" -// "tiltFast = 15\n" "numFade = " + cnt_fade_layers + "\n" -// "startdelay = 0\n" "layerHeight = " + layerh_str + "\n" - "noteInfo = " "expTime = "+expt_str+" + resinType = generic+layerHeight = " +layerh_str+" + printer = DWARF3\n" "usedMaterial = " + used_material + "\n" diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index 7f3bc2557..d81498916 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -975,7 +975,7 @@ void SLAPrint::process() this->fill_statistics(); // Set statistics values to the printer m_printer->set_statistics({(m_print_statistics.objects_used_material + m_print_statistics.support_used_material)/1000, - 10.0, + double(m_default_object_config.faded_layers.getInt()), double(m_print_statistics.slow_layers_count), double(m_print_statistics.fast_layers_count) }); @@ -1318,7 +1318,8 @@ bool SLAPrintObject::invalidate_state_by_config_options(const std::vector steps; bool invalidated = false; for (const t_config_option_key &opt_key : opt_keys) { - if (opt_key == "layer_height") { + if ( opt_key == "layer_height" + || opt_key == "faded_layers") { steps.emplace_back(slaposObjectSlice); } else if ( opt_key == "supports_enable"