3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 23:17:35 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: modify the 3rd party wiki link

Browse source 
and disable the next button after cali

Change-Id: I29437cfbeda1828bbcaf5898b660dd814d1298f0
This commit is contained in:
zhimin.zeng 2023-07-07 12:05:32 +08:00 • committed by Lane.Wei
parent 9b74fbe459
commit 5673defdb9
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -760,6 +760,8 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow
MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
} }
CalibrationCaliPage *cali_page = (static_cast<CalibrationCaliPage *>(cali_step->page));
cali_page->clear_last_job_status();
} }
else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) { else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
CalibInfo calib_info; CalibInfo calib_info;
@ -823,14 +825,20 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow
preset_page->on_cali_start_job(); preset_page->on_cali_start_job();
if (temp_filament_preset) if (temp_filament_preset)
delete temp_filament_preset; delete temp_filament_preset;
if (cali_stage == 1) {
CalibrationCaliPage *cali_coarse_page = (static_cast<CalibrationCaliPage *>(cali_coarse_step->page));
cali_coarse_page->clear_last_job_status();
}
else if (cali_stage == 2) {
CalibrationCaliPage *cali_fine_page = (static_cast<CalibrationCaliPage *>(cali_fine_step->page));
cali_fine_page->clear_last_job_status();
}
} else { } else {
assert(false); assert(false);
} }
show_step(m_curr_step->next); show_step(m_curr_step->next);
CalibrationCaliPage* cali_page = (static_cast<CalibrationCaliPage*>(cali_step->page));
cali_page->clear_last_job_status();
} }
void FlowRateWizard::on_cali_save() void FlowRateWizard::on_cali_save()

2
src/slic3r/GUI/MainFrame.cpp
View file

@ -2769,7 +2769,7 @@ void MainFrame::init_menubar_as_editor()
// help // help
append_menu_item(m_topbar->GetCalibMenu(), wxID_ANY, _L("Tutorial"), _L("Calibration help"), append_menu_item(m_topbar->GetCalibMenu(), wxID_ANY, _L("Tutorial"), _L("Calibration help"),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://github.com/OrcaSlicer/OrcaSlicer/wiki/Calibration", wxBROWSER_NEW_WINDOW); }, "", nullptr, [this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://wiki.bambulab.com/e/en/staging/bambu-studio/Calibration", wxBROWSER_NEW_WINDOW); }, "", nullptr,
[this]() {return m_plater->is_view3D_shown();; }, this); [this]() {return m_plater->is_view3D_shown();; }, this);
} }