3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed GCode export for color_print extensions.

Browse source 
M25 is changed to M601
This commit is contained in:
YuSanka 2019-10-16 12:03:51 +02:00
parent 4fa2567ea2
commit ea8695c06c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/GCode.cpp
View file

@ -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";
}

6
src/slic3r/GUI/wxExtensions.cpp
View file

@ -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);