3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-15 08:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX:m_show_type should init default

Browse source 
jira: github 6146
Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c
(cherry picked from commit 28bdf64fef8d7cbef15f27ffcc2c841595ba08c7)
This commit is contained in:
zhou.xu 2025-03-26 09:56:57 +08:00 • committed by Noisyfox
parent c26266dfb6
commit a65abbeb58
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/AmsMappingPopup.hpp
View file

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

7
src/slic3r/GUI/SelectMachine.cpp
View file

@ -3947,9 +3947,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;
@ -4452,6 +4453,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)