mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix wrong save page 

Change-Id: I0dd97f9c8d40e1e88230634af7aaf07180132d61
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-07-04 11:59:39 +08:00 committed by Lane.Wei
parent edb70b06b5
commit 547c9cb0ba
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/CalibrationWizard.cpp
View File

@ -90,12 +90,7 @@ void CalibrationWizard::update(MachineObject* obj)
} }
else { else {
if (last_obj != obj && obj->is_info_ready()) { if (last_obj != obj && obj->is_info_ready()) {
for (int i = 0; i < m_page_steps.size(); i++) {
if (m_page_steps[i]->page)
m_page_steps[i]->page->on_device_connected(obj);
}
this->on_device_connected(obj); this->on_device_connected(obj);
last_obj = obj; last_obj = obj;
} }
} }
@ -111,6 +106,11 @@ void CalibrationWizard::on_device_connected(MachineObject* obj)
{ {
if (!m_page_steps.empty()) if (!m_page_steps.empty())
show_step(m_page_steps.front()); show_step(m_page_steps.front());
for (int i = 0; i < m_page_steps.size(); i++) {
if (m_page_steps[i]->page)
m_page_steps[i]->page->on_device_connected(obj);
}
} }
void CalibrationWizard::set_cali_method(CalibrationMethod method) void CalibrationWizard::set_cali_method(CalibrationMethod method)

2
src/slic3r/GUI/CalibrationWizardPage.hpp
View File

@ -224,7 +224,7 @@ public:
virtual void update(MachineObject* obj) { curr_obj = obj; } virtual void update(MachineObject* obj) { curr_obj = obj; }
/* device changed and connected */ /* device changed and connected */
virtual void on_device_connected(MachineObject* obj) {} virtual void on_device_connected(MachineObject* obj) { curr_obj = obj; }
virtual void on_reset_page() {} virtual void on_reset_page() {}

9
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@ -657,6 +657,11 @@ void CalibrationPASavePage::show_panels(CalibrationMethod method, const std::str
m_auto_panel->Show(false); m_auto_panel->Show(false);
m_manual_panel->Show(false); m_manual_panel->Show(false);
m_p1p_panel->Show(); m_p1p_panel->Show();
} else {
m_auto_panel->Show(false);
m_manual_panel->Show(false);
m_p1p_panel->Show();
assert(false);
} }
Layout(); Layout();
} }
@ -671,7 +676,9 @@ void CalibrationPASavePage::set_cali_method(CalibrationMethod method)
void CalibrationPASavePage::on_device_connected(MachineObject* obj) void CalibrationPASavePage::on_device_connected(MachineObject* obj)
{ {
; curr_obj = obj;
if (curr_obj)
show_panels(m_cali_method, curr_obj->printer_type);
} }
void CalibrationPASavePage::update(MachineObject* obj) void CalibrationPASavePage::update(MachineObject* obj)