FIX: the layer nums of customize print sequence is incorrect
when enter from plate parameter which lead slice error jira: STUDIO-10556 Change-Id: Iea15547b5f17a34d0b222000dee990d8dc39bcd8
This commit is contained in:
parent
22499a552e
commit
0f2d10f35d
|
@ -145,7 +145,7 @@ void LayerNumberTextInput::update_label()
|
||||||
|
|
||||||
void LayerNumberTextInput::set_layer_number(int layer_number)
|
void LayerNumberTextInput::set_layer_number(int layer_number)
|
||||||
{
|
{
|
||||||
m_layer_number = layer_number;
|
m_layer_number = layer_number;
|
||||||
if (layer_number == MAX_LAYER_VALUE)
|
if (layer_number == MAX_LAYER_VALUE)
|
||||||
m_value_type = ValueType::End;
|
m_value_type = ValueType::End;
|
||||||
else
|
else
|
||||||
|
@ -300,8 +300,8 @@ void OtherLayersSeqPanel::append_layer(const LayerSeqInfo* layer_info)
|
||||||
auto drag_canvas = new DragCanvas(m_layer_input_panel, extruder_colours, order);
|
auto drag_canvas = new DragCanvas(m_layer_input_panel, extruder_colours, order);
|
||||||
|
|
||||||
if (layer_info) {
|
if (layer_info) {
|
||||||
begin_layer_input->set_layer_number(layer_info->begin_layer_number);
|
begin_layer_input->set_layer_number(std::max(MIN_LAYER_VALUE, layer_info->begin_layer_number));
|
||||||
end_layer_input->set_layer_number(layer_info->end_layer_number);
|
end_layer_input->set_layer_number(std::min(MAX_LAYER_VALUE, layer_info->end_layer_number));
|
||||||
drag_canvas->set_shape_list(extruder_colours, layer_info->print_sequence);
|
drag_canvas->set_shape_list(extruder_colours, layer_info->print_sequence);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -440,7 +440,7 @@ PlateSettingsDialog::PlateSettingsDialog(wxWindow* parent, const wxString& title
|
||||||
m_drag_canvas->Hide();
|
m_drag_canvas->Hide();
|
||||||
top_sizer->Add(0, 0, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT, 0);
|
top_sizer->Add(0, 0, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT, 0);
|
||||||
top_sizer->Add(m_drag_canvas, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxBOTTOM, FromDIP(10));
|
top_sizer->Add(m_drag_canvas, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxBOTTOM, FromDIP(10));
|
||||||
|
|
||||||
m_sizer_main->Add(top_sizer, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, FromDIP(30));
|
m_sizer_main->Add(top_sizer, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, FromDIP(30));
|
||||||
|
|
||||||
// Other layer filament sequence
|
// Other layer filament sequence
|
||||||
|
|
Loading…
Reference in New Issue