QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-02-02 17:08:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prusa 2.7.2

Browse Source
This commit is contained in:
sunsets
2024-03-27 14:38:03 +08:00
parent 63daf0c087
commit 2387bc9cdb
203 changed files with 6053 additions and 15634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/ConfigWizard.cpp
View File

@@ -2789,11 +2789,15 @@ bool ConfigWizard::priv::on_bnt_finish()
* than last changes wouldn't be updated for filaments/materials.
* SO, do that before check_and_install_missing_materials()
*/
if (page_filaments)
page_filaments->check_and_update_presets();
if (page_sla_materials)
page_sla_materials->check_and_update_presets();
// there's no need to check that filament is selected if we have only custom printer
if (custom_printer_selected && !any_fff_selected && !any_sla_selected) return true;
// Even if we have only custom printer installed, check filament selection.
// Template filaments could be selected in this case.
if (custom_printer_selected && !any_fff_selected && !any_sla_selected)
return check_and_install_missing_materials(T_FFF);
// check, that there is selected at least one filament/material
return check_and_install_missing_materials(T_ANY);
}
@@ -2901,7 +2905,7 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo
bool no_templates = wxGetApp().app_config->get("no_templates") == "1";
if (any_fff_selected && (technology & T_FFF)) {
if ((any_fff_selected || custom_printer_selected) && (technology & T_FFF)) {
std::set<const VendorProfile::PrinterModel*> printer_models_without_material = printer_models_missing_materials(ptFFF, AppConfig::SECTION_FILAMENTS, no_templates);
if (! printer_models_without_material.empty()) {
if (only_for_model_id.empty())
@@ -3002,7 +3006,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
}
}
}
return pt;
return ptAny;
};
// QIDI printers are considered first, then 3rd party.
if (preferred_pt = get_preferred_printer_technology("QIDITechnology", bundles.qidi_bundle());
@@ -3360,6 +3364,12 @@ ConfigWizard::ConfigWizard(wxWindow *parent)
wxGetApp().UpdateDarkUI(p->btn_finish);
wxGetApp().UpdateDarkUI(p->btn_cancel);
wxGetApp().SetWindowVariantForButton(p->btn_sel_all);
wxGetApp().SetWindowVariantForButton(p->btn_prev);
wxGetApp().SetWindowVariantForButton(p->btn_next);
wxGetApp().SetWindowVariantForButton(p->btn_finish);
wxGetApp().SetWindowVariantForButton(p->btn_cancel);
const auto qidi_it = p->bundles.find("QIDITechnology");
wxCHECK_RET(qidi_it != p->bundles.cend(), "Vendor QIDITechnology not found");
const VendorProfile *vendor_qidi = qidi_it->second.vendor_profile;