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:
authorDavid Kocik <kocikdav@gmail.com>2019-12-18 12:34:26 +0300
committerDavid Kocik <kocikdav@gmail.com>2019-12-18 12:34:26 +0300
commit1fa464af9653aa739e814fd8835c7ad52fdc4394 (patch)
tree182f2ffa2b872c64f47598c1a072a0c0e3620b02 /src/slic3r/GUI/wxExtensions.hpp
parentb8aa12486e1e1b15856a0073cac2e4281b88f95f (diff)
removableDriveManager bug fixes
Diffstat (limited to 'src/slic3r/GUI/wxExtensions.hpp')
-rw-r--r--src/slic3r/GUI/wxExtensions.hpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp
index 26e334def..ebed49efe 100644
--- a/src/slic3r/GUI/wxExtensions.hpp
+++ b/src/slic3r/GUI/wxExtensions.hpp
@@ -17,6 +17,7 @@
#include <set>
#include <functional>
#include "libslic3r/Model.hpp"
+#include "libslic3r/GCodeWriter.hpp"
namespace Slic3r {
enum class ModelVolumeType : int;
@@ -961,24 +962,12 @@ private:
struct TICK_CODE
{
- 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(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) {}
-
bool operator<(const TICK_CODE& other) const { return other.tick > this->tick; }
bool operator>(const TICK_CODE& other) const { return other.tick < this->tick; }
- TICK_CODE operator=(const TICK_CODE& other) const {
- TICK_CODE ret_val(other.tick, other.gcode, other.extruder, other.color);
- return ret_val;
- }
int tick;
- std::string gcode;
- int extruder;
+ std::string gcode = Slic3r::ColorChangeCode;
+ int extruder = 0;
std::string color;
};