FIX:fixed issue with lan mode
jira:[STUDIO-5189] Change-Id: I1d0a05f19dcea154cf3ef2b61ed0546d3581905e
This commit is contained in:
parent
90910e7d52
commit
5b4ece44e7
|
@ -376,6 +376,8 @@ std::string MachineObject::parse_printer_type(std::string type_str)
|
|||
return "BL-P001";
|
||||
} else if (type_str.compare("BL-P001") == 0) {
|
||||
return type_str;
|
||||
} else if (type_str.compare("BL-P002") == 0) {
|
||||
return type_str;
|
||||
} else {
|
||||
return DeviceManager::parse_printer_type(type_str);
|
||||
}
|
||||
|
|
|
@ -2214,14 +2214,11 @@ void SelectMachineDialog::on_cancel(wxCloseEvent &event)
|
|||
this->EndModal(wxID_CANCEL);
|
||||
}
|
||||
|
||||
bool SelectMachineDialog::is_blocking_printing()
|
||||
bool SelectMachineDialog::is_blocking_printing(MachineObject* obj_)
|
||||
{
|
||||
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
||||
if (!dev) return true;
|
||||
|
||||
MachineObject* obj_ = dev->get_selected_machine();
|
||||
if (obj_ == nullptr) return true;
|
||||
|
||||
PresetBundle* preset_bundle = wxGetApp().preset_bundle;
|
||||
auto source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);
|
||||
auto target_model = obj_->printer_type;
|
||||
|
@ -3413,7 +3410,7 @@ void SelectMachineDialog::update_show_status()
|
|||
}
|
||||
}
|
||||
|
||||
if (m_print_type == PrintFromType::FROM_NORMAL && is_blocking_printing()) {
|
||||
if (m_print_type == PrintFromType::FROM_NORMAL && is_blocking_printing(obj_)) {
|
||||
show_status(PrintDialogStatus::PrintStatusUnsupportedPrinter);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -450,7 +450,7 @@ public:
|
|||
bool has_timelapse_warning();
|
||||
void update_timelapse_enable_status();
|
||||
bool is_same_printer_model();
|
||||
bool is_blocking_printing();
|
||||
bool is_blocking_printing(MachineObject* obj_);
|
||||
bool is_same_nozzle_diameters(std::string& nozzle_type, std::string& nozzle_diameter);
|
||||
bool is_same_nozzle_type(std::string& filament_type, std::string& tag_nozzle_type);
|
||||
bool has_tips(MachineObject* obj);
|
||||
|
|
Loading…
Reference in New Issue