GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-19 18:19:10 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: modify cali text and picture

Browse Source 
jira: STUDIO-8778 STUDIO-8824
Change-Id: Iecb0a52a100c3f0765e5eda07e0ed50226490e42
This commit is contained in:
zhimin.zeng 2024-12-27 11:40:20 +08:00 committed by lane.wei
parent 8891bbcf17
commit 16791c72d6
6 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/fd_calibration_auto_multi_extruders.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

15
src/slic3r/GUI/CaliHistoryDialog.cpp
View File

@ -311,7 +311,7 @@ void HistoryWindow::sync_history_data() {
gbSizer->Add(title_preset_name, { 0, get_colume_idx(CaliColumnType::Cali_Filament, curr_obj) }, { 1, 1 }, wxBOTTOM, FromDIP(15));
if (curr_obj && curr_obj->is_multi_extruders()) {
auto nozzle_name = new Label(m_history_data_panel, _L("Nozzle"));
auto nozzle_name = new Label(m_history_data_panel, _L("Nozzle Flow"));
nozzle_name->SetFont(Label::Head_14);
gbSizer->Add(nozzle_name, {0, get_colume_idx(CaliColumnType::Cali_Nozzle, curr_obj)}, {1, 1}, wxBOTTOM, FromDIP(15));
}
@ -889,11 +889,14 @@ void NewCalibrationHistoryDialog::on_ok(wxCommandEvent &event)
});
if (iter != m_history_results.end()) {
MessageDialog msg_dlg(nullptr,
wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
"is saved. Are you sure you want to override the historical result?"),
m_new_result.name),
wxEmptyString, wxICON_WARNING | wxYES_NO);
wxString duplicate_name_info = wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
"is saved. Are you sure you want to override the historical result?"), m_new_result.name);
duplicate_name_info = wxString::Format(_L("Within the same extruder, the name(%s) must be unique when the filament type, nozzle diameter, and nozzle flow are the same.\n"
"Are you sure you want to override the historical result?"), m_new_result.name);
MessageDialog msg_dlg(nullptr, duplicate_name_info, wxEmptyString, wxICON_WARNING | wxYES_NO);
if (msg_dlg.ShowModal() != wxID_YES)
return;
}

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

@ -888,8 +888,14 @@ bool PressureAdvanceWizard::can_save_cali_result(const std::vector<PACalibResult
if (!same_pa_names.empty()) {
same_pa_names.erase(same_pa_names.size() - 2);
MessageDialog msg_dlg(nullptr, wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
"is saved. Are you sure you want to override the historical result?"), same_pa_names), wxEmptyString, wxICON_WARNING | wxYES_NO);
wxString duplicate_name_info = wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
"is saved. Are you sure you want to override the historical result?"), same_pa_names);
if (curr_obj->is_multi_extruders())
duplicate_name_info = wxString::Format(_L("Within the same extruder, the name(%s) must be unique when the filament type, nozzle diameter, and nozzle flow are the same.\n"
"Are you sure you want to override the historical result?"), same_pa_names);
MessageDialog msg_dlg(nullptr, duplicate_name_info, wxEmptyString, wxICON_WARNING | wxYES_NO);
if (msg_dlg.ShowModal() != wxID_YES)
return false;
}

16
src/slic3r/GUI/CalibrationWizardCaliPage.cpp
View File

@ -104,10 +104,20 @@ void CalibrationCaliPage::set_cali_img()
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_manual", 400));
}
else if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
if (curr_obj && curr_obj->get_printer_arch() == PrinterArch::ARCH_I3)
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_i3", 400));
else
if (curr_obj) {
if (curr_obj->is_multi_extruders()) {
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_multi_extruders", 400));
}
else if (curr_obj->get_printer_arch() == PrinterArch::ARCH_I3) {
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_i3", 400));
}
else {
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto", 400));
}
}
else {
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto", 400));
}
}
}
else if (m_cali_mode == CalibMode::Calib_Flow_Rate) {

4
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@ -621,7 +621,7 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent)
m_left_nozzle_volume_type_sizer->AddSpacer(FromDIP(5));
//wxBoxSizer *nozzle_volume_sizer = new wxBoxSizer(wxHORIZONTAL);
auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Volume Type"), 0, CALIBRATION_LABEL_SIZE);
auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Flow"), 0, CALIBRATION_LABEL_SIZE);
nozzle_volume_type_text->SetFont(Label::Head_14);
nozzle_volume_type_text->Wrap(-1);
@ -655,7 +655,7 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent)
m_right_nozzle_volume_type_sizer->AddSpacer(FromDIP(5));
//wxBoxSizer *nozzle_volume_sizer = new wxBoxSizer(wxHORIZONTAL);
auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Volume Type"), 0, CALIBRATION_LABEL_SIZE);
auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Flow"), 0, CALIBRATION_LABEL_SIZE);
nozzle_volume_type_text->SetFont(Label::Head_14);
nozzle_volume_type_text->Wrap(-1);

4
src/slic3r/GUI/StatusPanel.cpp
View File

@ -3504,7 +3504,9 @@ void StatusPanel::update_subtask(MachineObject *obj)
int height = m_project_task_panel->get_bitmap_thumbnail()->GetSize().y;
if (m_calib_method == CALI_METHOD_AUTO) {
if (m_calib_mode == CalibMode::Calib_PA_Line) {
if (obj->get_printer_arch() == PrinterArch::ARCH_I3)
if (obj->is_multi_extruders())
png_path = (boost::format("%1%/images/fd_calibration_auto_multi_extruders.png") % resources_dir()).str();
else if (obj->get_printer_arch() == PrinterArch::ARCH_I3)
png_path = (boost::format("%1%/images/fd_calibration_auto_i3.png") % resources_dir()).str();
else
png_path = (boost::format("%1%/images/fd_calibration_auto.png") % resources_dir()).str();