Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2019-11-11 11:38:45 +0300
committerYuSanka <yusanka@gmail.com>2019-11-11 11:38:45 +0300
commit6c8bb51f4af894333ec56ed2133f0772d14b5044 (patch)
tree84a894462b567534eb92d45a3ef8b23b69f5f57d /src/slic3r/GUI/wxExtensions.hpp
parent7a22e438258ddac329b3565f07a413194cca2694 (diff)
Use constant names for G-codes like M600, M601 and "tool_change"(Change extruder)
Diffstat (limited to 'src/slic3r/GUI/wxExtensions.hpp')
-rw-r--r--src/slic3r/GUI/wxExtensions.hpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp
index 89dc6d9fa..32e96f326 100644
--- a/src/slic3r/GUI/wxExtensions.hpp
+++ b/src/slic3r/GUI/wxExtensions.hpp
@@ -963,11 +963,11 @@ private:
struct TICK_CODE
{
- TICK_CODE(int tick):tick(tick), gcode("M600"), extruder(0), color("") {}
+ TICK_CODE(int tick):tick(tick), gcode(Slic3r::ColorChangeCode), extruder(0), color("") {}
TICK_CODE(int tick, const std::string& code) :
tick(tick), gcode(code), extruder(0) {}
TICK_CODE(int tick, int extruder) :
- tick(tick), gcode("M600"), extruder(extruder) {}
+ tick(tick), gcode(Slic3r::ColorChangeCode), extruder(extruder) {}
TICK_CODE(int tick, const std::string& code, int extruder, const std::string& color) :
tick(tick), gcode(code), extruder(extruder), color(color) {}
@@ -976,13 +976,7 @@ private:
TICK_CODE operator=(const TICK_CODE& other) const {
TICK_CODE ret_val(other.tick, other.gcode, other.extruder, other.color);
return ret_val;
- }/*
- TICK_CODE& operator=(const TICK_CODE& other) {
- this->tick = other.tick;
- this->gcode = other.gcode;
- this->extruder = other.extruder;
- return *this;
- }*/
+ }
int tick;
std::string gcode;