diff options
| author | YuSanka <yusanka@gmail.com> | 2019-10-16 13:03:51 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2019-10-16 13:03:51 +0300 |
| commit | ea8695c06cb251250f542c7237b1dbbe92401632 (patch) | |
| tree | 2be1c95a910dec59f44b10076874952578ce9ac6 /src | |
| parent | 4fa2567ea27dcc2c1036363556f784b4b692221a (diff) | |
Fixed GCode export for color_print extensions.
M25 is changed to M601
Diffstat (limited to 'src')
| -rw-r--r-- | src/libslic3r/GCode.cpp | 5 | ||||
| -rw-r--r-- | src/slic3r/GUI/wxExtensions.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index c3e780041..1a4d58edc 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1703,13 +1703,14 @@ void GCode::process_layer( // gcode += "M600\n"; // } if (colorprint_change) { - if (print.config().nozzle_diameter.size() == 1) + const bool single_material_print = print.config().nozzle_diameter.size() == 1; + if (single_material_print || custom_code != "tool_change") { // add tag for analyzer gcode += "; " + GCodeAnalyzer::Color_Change_Tag + "\n"; // add tag for time estimator gcode += "; " + GCodeTimeEstimator::Color_Change_Tag + "\n"; - if (custom_code == "tool_change") + if (single_material_print && custom_code == "tool_change") custom_code = "M600"; gcode += custom_code + "\n"; } diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index e9f5ac329..a103e6e0d 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -3055,7 +3055,7 @@ wxString DoubleSlider::get_tooltip(bool is_revert_icon_focused) const auto tick_code_it = m_ticks_.find(tick); tooltip = tick_code_it == m_ticks_.end() ? _(L("Add color change")) : tick_code_it->gcode == "M600" ? _(L("Delete color change")) : - tick_code_it->gcode == "M25" ? _(L("Delete pause")) : + tick_code_it->gcode == "M601" ? _(L("Delete pause")) : tick_code_it->gcode == "tool_change" ? ( m_state == msSingleExtruder ? _(L("Delete color change")) : from_u8((boost::format(_utf8(L("Delete extruder change to \"%1%\""))) % tick_code_it->extruder).str()) ) : from_u8((boost::format(_utf8(L("Delete \"%1%\" code"))) % tick_code_it->gcode).str()); @@ -3353,8 +3353,8 @@ void DoubleSlider::OnRightUp(wxMouseEvent& event) append_menu_item(&menu, wxID_ANY, _(L("Add color change")) + " (M600)", "", [this](wxCommandEvent&) { add_code("M600"); }, "colorchange_add_off.png", &menu); - append_menu_item(&menu, wxID_ANY, _(L("Add pause SD print")) + " (M25)", "", - [this](wxCommandEvent&) { add_code("M25"); }, "pause_add.png", &menu); + append_menu_item(&menu, wxID_ANY, _(L("Add pause SD print")) + " (M601)", "", + [this](wxCommandEvent&) { add_code("M601"); }, "pause_add.png", &menu); append_menu_item(&menu, wxID_ANY, _(L("Add custom G-code")), "", [this](wxCommandEvent&) { add_code(""); }, "add_gcode", &menu); |