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

NEW:add printer compatible check from sd card view 

jira:[STUDIO-5969]

Change-Id: I86d10ebe2e9bc77e6350e26aeed6b4f0f9fdcecb
This commit is contained in:
tao wang 2024-02-05 09:25:27 +08:00 committed by Lane.Wei
parent 5fe6a1e6ec
commit ac0e49ceff
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2218,10 +2218,19 @@ bool SelectMachineDialog::is_blocking_printing(MachineObject* obj_)
{ {
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return true; if (!dev) 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; auto target_model = obj_->printer_type;
std::string source_model = "";
if (m_print_type == PrintFromType::FROM_NORMAL) {
PresetBundle* preset_bundle = wxGetApp().preset_bundle;
source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);
}else if (m_print_type == PrintFromType::FROM_SDCARD_VIEW) {
if (m_required_data_plate_data_list.size() > 0) {
source_model = m_required_data_plate_data_list[m_print_plate_idx]->printer_model_id;
}
}
if (source_model != target_model) { if (source_model != target_model) {
std::vector<std::string> compatible_machine = dev->get_compatible_machine(target_model); std::vector<std::string> compatible_machine = dev->get_compatible_machine(target_model);
@ -3426,7 +3435,7 @@ void SelectMachineDialog::update_show_status()
} }
} }
if (m_print_type == PrintFromType::FROM_NORMAL && is_blocking_printing(obj_)) { if (is_blocking_printing(obj_)) {
show_status(PrintDialogStatus::PrintStatusUnsupportedPrinter); show_status(PrintDialogStatus::PrintStatusUnsupportedPrinter);
return; return;
} }