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

FIX: update some text 

jira: [STUDIO-10352]
Change-Id: I33b02a811970002b5f05ee2e519eb722b19e7051
This commit is contained in:
xin.zhang 2025-02-13 20:48:57 +08:00 committed by lane.wei
parent 872726abed
commit 16729c9283
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/SelectMachine.cpp
View File

@ -1976,7 +1976,7 @@ bool SelectMachineDialog::is_blocking_printing(MachineObject* obj_)
* @param tag_nozzle_diameter -- return the target nozzle_diameter but mismatch * @param tag_nozzle_diameter -- return the target nozzle_diameter but mismatch
* @return is same or not * @return is same or not
/*************************************************************/ /*************************************************************/
bool SelectMachineDialog::is_same_nozzle_diameters(float& tag_nozzle_diameter) const bool SelectMachineDialog::is_same_nozzle_diameters(float &tag_nozzle_diameter, int& mismatch_nozzle_id) const
{ {
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return false; if (!dev) return false;
@ -2007,6 +2007,7 @@ bool SelectMachineDialog::is_same_nozzle_diameters(float& tag_nozzle_diameter) c
tag_nozzle_diameter = float(opt_nozzle_diameters->get_at(used_nozzle_idx)); tag_nozzle_diameter = float(opt_nozzle_diameters->get_at(used_nozzle_idx));
if (tag_nozzle_diameter != obj_->m_extder_data.extders[used_nozzle_idx].current_nozzle_diameter) if (tag_nozzle_diameter != obj_->m_extder_data.extders[used_nozzle_idx].current_nozzle_diameter)
{ {
mismatch_nozzle_id = used_nozzle_idx;
return false; return false;
} }
} }
@ -3325,16 +3326,27 @@ void SelectMachineDialog::update_show_status()
// check nozzle type and diameter // check nozzle type and diameter
if (m_print_type == PrintFromType::FROM_NORMAL) if (m_print_type == PrintFromType::FROM_NORMAL)
{ {
int mismatch_nozzle_id = 0;
float nozzle_diameter = 0; float nozzle_diameter = 0;
if (!is_same_nozzle_diameters(nozzle_diameter)) if (!is_same_nozzle_diameters(nozzle_diameter, mismatch_nozzle_id))
{ {
std::vector<wxString> msg_params; std::vector<wxString> msg_params;
if (obj_->m_extder_data.total_extder_count == 2) if (obj_->m_extder_data.total_extder_count == 2)
{ {
const wxString& nozzle_config = wxString::Format(_L("The current nozzle diameter (Left: %.1fmm Right: %.1fmm) doesn't match with the slicing file (%.1fmm). " wxString mismatch_nozzle_str;
"Please make sure the nozzle installed matches with settings in printer, then set the " if (mismatch_nozzle_id == MAIN_NOZZLE_ID)
"corresponding printer preset when slicing."), obj_->m_extder_data.extders[1].current_nozzle_diameter, {
obj_->m_extder_data.extders[0].current_nozzle_diameter, nozzle_diameter); mismatch_nozzle_str = _L("right nozzle");
}
else
{
mismatch_nozzle_str = _L("left nozzle");
}
const wxString& nozzle_config = wxString::Format(_L("The %s diameter(%.1fmm) of current printer doesn't match with the slicing file (%.1fmm). "
"Please make sure the nozzle installed matches with settings in printer, then set the "
"corresponding printer preset when slicing."), mismatch_nozzle_str,
obj_->m_extder_data.extders[mismatch_nozzle_id].current_nozzle_diameter, nozzle_diameter);
msg_params.emplace_back(nozzle_config); msg_params.emplace_back(nozzle_config);
} }
else else

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

@ -483,7 +483,7 @@ public:
void update_timelapse_enable_status(); void update_timelapse_enable_status();
bool is_same_printer_model(); bool is_same_printer_model();
bool is_blocking_printing(MachineObject* obj_); bool is_blocking_printing(MachineObject* obj_);
bool is_same_nozzle_diameters(float& tag_nozzle_diameter) const; bool is_same_nozzle_diameters(float& tag_nozzle_diameter, int& mismatch_nozzle_id) const;
bool is_same_nozzle_type(const Extder& extruder, std::string& filament_type) const; bool is_same_nozzle_type(const Extder& extruder, std::string& filament_type) const;
bool has_tips(MachineObject* obj); bool has_tips(MachineObject* obj);
bool is_timeout(); bool is_timeout();