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

Fix of #5437 - Make it clear on the G-code slider that color change is not supported for sequential print

Browse source
This commit is contained in:
YuSanka 2021-05-10 12:09:44 +02:00
parent 51ef2a98e6
commit a49d34c6f3
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/DoubleSlider.cpp
View file

@ -575,7 +575,10 @@ void Control::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const wxPoint pt_
else else
is_horizontal() ? y_draw = pt_beg.y - m_tick_icon_dim-2 : x_draw = pt_end.x + 3; is_horizontal() ? y_draw = pt_beg.y - m_tick_icon_dim-2 : x_draw = pt_end.x + 3;
dc.DrawBitmap(*icon, x_draw, y_draw); if (m_draw_mode == dmSequentialFffPrint)
dc.DrawBitmap(create_scaled_bitmap("colorchange_add", nullptr, 16, true), x_draw, y_draw);
else
dc.DrawBitmap(*icon, x_draw, y_draw);
//update rect of the tick action icon //update rect of the tick action icon
m_rect_tick_action = wxRect(x_draw, y_draw, m_tick_icon_dim, m_tick_icon_dim); m_rect_tick_action = wxRect(x_draw, y_draw, m_tick_icon_dim, m_tick_icon_dim);
@ -591,7 +594,7 @@ void Control::draw_info_line_with_icon(wxDC& dc, const wxPoint& pos, const Selec
dc.DrawLine(pt_beg, pt_end); dc.DrawLine(pt_beg, pt_end);
//draw action icon //draw action icon
if (m_draw_mode == dmRegular) if (m_draw_mode == dmRegular || m_draw_mode == dmSequentialFffPrint)
draw_action_icon(dc, pt_beg, pt_end); draw_action_icon(dc, pt_beg, pt_end);
} }
} }
@ -1377,6 +1380,10 @@ wxString Control::get_tooltip(int tick/*=-1*/)
if (tick_code_it == m_ticks.ticks.end() && m_focus == fiActionIcon) // tick doesn't exist if (tick_code_it == m_ticks.ticks.end() && m_focus == fiActionIcon) // tick doesn't exist
{ {
if (m_draw_mode == dmSequentialFffPrint)
return _L("The sequential print is on.\n"
"It's impossible to apply any custom G-code for objects printing sequentually.\n");
// Show mode as a first string of tooltop // Show mode as a first string of tooltop
tooltip = " " + _L("Print mode") + ": "; tooltip = " " + _L("Print mode") + ": ";
tooltip += (m_mode == SingleExtruder ? SingleExtruderMode : tooltip += (m_mode == SingleExtruder ? SingleExtruderMode :