From 344c821382d1178a86f347dc405f7422902d8ae8 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 29 Sep 2021 14:20:18 +0200 Subject: [PATCH] Move Extruder decimals from extruder to printer supermerill/SuperSlicer#1596 --- resources/ui_layout/extruder.ui | 2 -- src/libslic3r/GCodeWriter.cpp | 2 +- src/libslic3r/PrintConfig.cpp | 1 - src/libslic3r/PrintConfig.hpp | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/resources/ui_layout/extruder.ui b/resources/ui_layout/extruder.ui index f3dee38f7..4cd972220 100644 --- a/resources/ui_layout/extruder.ui +++ b/resources/ui_layout/extruder.ui @@ -39,5 +39,3 @@ group:Retraction when tool is disabled (advanced settings for multi-extruder set setting:idx:retract_restart_extra_toolchange group:Preview reset_to_filament_color -group:Gcode - setting:gcode_precision_e \ No newline at end of file diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp index 2211e521a..3bb8e3a37 100644 --- a/src/libslic3r/GCodeWriter.cpp +++ b/src/libslic3r/GCodeWriter.cpp @@ -13,7 +13,7 @@ #define XYZ_NUM(val) PRECISION(val, this->config.gcode_precision_xyz.value) #define FLOAT_PRECISION(val, precision) std::defaultfloat << std::setprecision(precision) << (val) #define F_NUM(val) FLOAT_PRECISION(val, 8) -#define E_NUM(val) PRECISION(val, this->config.gcode_precision_e.get_at(m_tool->id())) +#define E_NUM(val) PRECISION(val, this->config.gcode_precision_e.value) namespace Slic3r { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 2bdfa2b86..4e6ffc3cd 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -4685,7 +4685,6 @@ void PrintConfigDef::init_extruder_option_keys() "extruder_offset", "extruder_fan_offset", "extruder_temperature_offset", - "gcode_precision_e", "tool_name", "retract_length", "retract_lift", diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 99a1c9316..f80b009c8 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1097,7 +1097,7 @@ public: ConfigOptionEnum gcode_flavor; ConfigOptionBool gcode_label_objects; ConfigOptionInt gcode_precision_xyz; - ConfigOptionInts gcode_precision_e; + ConfigOptionInt gcode_precision_e; ConfigOptionString layer_gcode; ConfigOptionString feature_gcode; ConfigOptionFloat max_gcode_per_second;