FIX:m_show_type should init default
jira: github 6146 Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c
This commit is contained in:
parent
64d61695c5
commit
28bdf64fef
|
@ -224,7 +224,7 @@ public:
|
|||
bool m_has_unmatch_filament {false};
|
||||
bool m_supporting_mix_print {false}; //For single extruder, can ams and ext print together?
|
||||
int m_current_filament_id;
|
||||
ShowType m_show_type;
|
||||
ShowType m_show_type{ShowType::RIGHT};
|
||||
std::string m_tag_material;
|
||||
wxBoxSizer *m_sizer_main{nullptr};
|
||||
wxBoxSizer *m_sizer_ams{nullptr};
|
||||
|
|
|
@ -3963,9 +3963,10 @@ void SelectMachineDialog::reset_and_sync_ams_list()
|
|||
{
|
||||
m_mapping_popup.set_show_type(ShowType::RIGHT);
|
||||
}
|
||||
} else {
|
||||
m_mapping_popup.set_show_type(ShowType::RIGHT);
|
||||
}
|
||||
//m_mapping_popup.set_show_type(ShowType::RIGHT);
|
||||
if (obj_ && obj_->is_support_ams_mapping()) {
|
||||
if (obj_) {
|
||||
if (m_mapping_popup.IsShown()) return;
|
||||
wxPoint pos = item->ClientToScreen(wxPoint(0, 0));
|
||||
pos.y += item->GetRect().height;
|
||||
|
@ -4468,6 +4469,8 @@ void SelectMachineDialog::set_default_from_sdcard()
|
|||
} else if (m_filaments_map[m_current_filament_id] == 2) {
|
||||
m_mapping_popup.set_show_type(ShowType::RIGHT);
|
||||
}
|
||||
} else {
|
||||
m_mapping_popup.set_show_type(ShowType::RIGHT);
|
||||
}
|
||||
|
||||
if (obj_ && obj_->dev_id == m_printer_last_select)
|
||||
|
|
Loading…
Reference in New Issue