3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-26 01:28:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FIX: the nozzle data check

Browse source 
jira: [STUDIO-10528]
Change-Id: I5a20d52a92f4e6620239753a66fb5febcad19f39
(cherry picked from commit 679ec788e57932c2088b5b08f75128a93f0e0123)
This commit is contained in:
xin.zhang 2025-02-20 17:06:04 +08:00 • committed by Noisyfox
parent f5829ee837
commit 84fa72a8bb
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1970,6 +1970,35 @@ bool SelectMachineDialog::is_blocking_printing(MachineObject* obj_)
return false;
}
bool SelectMachineDialog::is_nozzle_data_valid(const ExtderData &ext_data) const
{
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return false;
MachineObject *obj_ = dev->get_selected_machine();
if (obj_ == nullptr) return false;
PresetBundle *preset_bundle = wxGetApp().preset_bundle;
try {
PartPlate *cur_plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
auto used_filament_idxs = cur_plate->get_used_filaments(); /*the index is started from 1*/
for (int used_filament_idx : used_filament_idxs)
{
int used_nozzle_idx = cur_plate->get_physical_extruder_by_filament_id(preset_bundle->full_config(), used_filament_idx);
if (ext_data.extders[used_nozzle_idx].current_nozzle_type == NozzleType::ntUndefine ||
ext_data.extders[used_nozzle_idx].current_nozzle_diameter <= 0.0f ||
ext_data.extders[used_nozzle_idx].current_nozzle_flow_type == NozzleFlowType::NONE_FLOWTYPE) {
return false;
}
}
} catch (const std::exception &) {
return false;
}
return true;
}
/**************************************************************//*
* @param tag_nozzle_type -- return the mismatch nozzle type
@ -3340,7 +3369,7 @@ void SelectMachineDialog::update_show_status()
//the nozzle type of preset and machine are different
if (nozzle_nums > 1 && m_print_type == FROM_NORMAL) {
if (!obj_->is_nozzle_data_invalid()) {
if (!is_nozzle_data_valid(obj_->m_extder_data)) {
show_status(PrintDialogStatus::PrintStatusNozzleDataInvalid);
return;
}

1
src/slic3r/GUI/SelectMachine.hpp
View file

@ -486,6 +486,7 @@ public:
void update_timelapse_enable_status();
bool is_same_printer_model();
bool is_blocking_printing(MachineObject* obj_);
bool is_nozzle_data_valid(const ExtderData& ext_data) 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 has_tips(MachineObject* obj);

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

@ -2762,7 +2762,7 @@ void SyncAmsInfoDialog::update_show_status()
// the nozzle type of preset and machine are different
if (nozzle_nums > 1) {
if (!obj_->is_nozzle_data_invalid()) {
if (obj_->is_nozzle_data_invalid()) {
show_status(PrintDialogStatus::PrintStatusNozzleDataInvalid);
return;
}