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

ENH:no longer checking nozzle type 

jira:[for nozzle type check]

Change-Id: I0e88445a264f21b0c11519e9a22a165d05611d14
This commit is contained in:
tao wang 2023-10-31 21:21:20 +08:00 committed by Lane.Wei
parent ec18a18d10
commit 16881dfb3f
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2236,51 +2236,51 @@ bool SelectMachineDialog::is_same_nozzle_diameters(std::string& nozzle_type, std
{ {
bool is_same_nozzle_diameters = true; bool is_same_nozzle_diameters = true;
float preset_nozzle_diameters; //float preset_nozzle_diameters;
std::string preset_nozzle_type; //std::string preset_nozzle_type;
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); //DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return true; //if (!dev) return true;
MachineObject* obj_ = dev->get_selected_machine(); //MachineObject* obj_ = dev->get_selected_machine();
if (obj_ == nullptr) return true; //if (obj_ == nullptr) return true;
try //try
{ //{
PresetBundle* preset_bundle = wxGetApp().preset_bundle; // PresetBundle* preset_bundle = wxGetApp().preset_bundle;
auto opt_nozzle_diameters = preset_bundle->printers.get_edited_preset().config.option<ConfigOptionFloats>("nozzle_diameter"); // auto opt_nozzle_diameters = preset_bundle->printers.get_edited_preset().config.option<ConfigOptionFloats>("nozzle_diameter");
const ConfigOptionEnum<NozzleType>* nozzle_type = preset_bundle->printers.get_edited_preset().config.option<ConfigOptionEnum<NozzleType>>("nozzle_type"); // const ConfigOptionEnum<NozzleType>* nozzle_type = preset_bundle->printers.get_edited_preset().config.option<ConfigOptionEnum<NozzleType>>("nozzle_type");
if (nozzle_type->value == NozzleType::ntHardenedSteel) { // if (nozzle_type->value == NozzleType::ntHardenedSteel) {
preset_nozzle_type = "hardened_steel"; // preset_nozzle_type = "hardened_steel";
} // }
else if (nozzle_type->value == NozzleType::ntStainlessSteel) { // else if (nozzle_type->value == NozzleType::ntStainlessSteel) {
preset_nozzle_type = "stainless_steel"; // preset_nozzle_type = "stainless_steel";
} // }
if (obj_->nozzle_type != preset_nozzle_type) { // if (obj_->nozzle_type != preset_nozzle_type) {
is_same_nozzle_diameters = false; // is_same_nozzle_diameters = false;
} // }
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders(); // auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders();
if (opt_nozzle_diameters != nullptr) { // if (opt_nozzle_diameters != nullptr) {
for (auto i = 0; i < extruders.size(); i++) { // for (auto i = 0; i < extruders.size(); i++) {
auto extruder = extruders[i] - 1; // auto extruder = extruders[i] - 1;
preset_nozzle_diameters = float(opt_nozzle_diameters->get_at(extruder)); // preset_nozzle_diameters = float(opt_nozzle_diameters->get_at(extruder));
if (preset_nozzle_diameters != obj_->nozzle_diameter) { // if (preset_nozzle_diameters != obj_->nozzle_diameter) {
is_same_nozzle_diameters = false; // is_same_nozzle_diameters = false;
} // }
} // }
} // }
//
//}
//catch (...)
//{
//}
} //nozzle_type = preset_nozzle_type;
catch (...) //nozzle_diameter = wxString::Format("%.1f",preset_nozzle_diameters).ToStdString();
{
}
nozzle_type = preset_nozzle_type;
nozzle_diameter = wxString::Format("%.1f",preset_nozzle_diameters).ToStdString();
return is_same_nozzle_diameters; return is_same_nozzle_diameters;
} }