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

Delete BugWizard

Browse Source
This commit is contained in:
QIDI TECH
2023-06-28 10:40:36 +08:00
parent 5adbe71d0c
commit aa2c60497f
17 changed files with 32 additions and 2305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,20 +122,20 @@ BundleMap BundleMap::load()
const auto rsrc_vendor_dir = (boost::filesystem::path(resources_dir()) / "profiles").make_preferred();
const auto cache_dir = boost::filesystem::path(Slic3r::data_dir()) / "cache"; // for Index
// Load QIDI bundle from the datadir/vendor directory or from datadir/cache/vendor (archive) or from resources/profiles.
auto qidi_bundle_path = (vendor_dir / PresetBundle::PRUSA_BUNDLE).replace_extension(".ini");
auto qidi_bundle_path = (vendor_dir / PresetBundle::QIDI_BUNDLE).replace_extension(".ini");
BundleLocation qidi_bundle_loc = BundleLocation::IN_VENDOR;
if (! boost::filesystem::exists(qidi_bundle_path)) {
qidi_bundle_path = (archive_dir / PresetBundle::PRUSA_BUNDLE).replace_extension(".ini");
qidi_bundle_path = (archive_dir / PresetBundle::QIDI_BUNDLE).replace_extension(".ini");
qidi_bundle_loc = BundleLocation::IN_ARCHIVE;
}
if (!boost::filesystem::exists(qidi_bundle_path)) {
qidi_bundle_path = (rsrc_vendor_dir / PresetBundle::PRUSA_BUNDLE).replace_extension(".ini");
qidi_bundle_path = (rsrc_vendor_dir / PresetBundle::QIDI_BUNDLE).replace_extension(".ini");
qidi_bundle_loc = BundleLocation::IN_RESOURCES;
}
{
Bundle qidi_bundle;
if (qidi_bundle.load(std::move(qidi_bundle_path), qidi_bundle_loc, true))
res.emplace(PresetBundle::PRUSA_BUNDLE, std::move(qidi_bundle));
res.emplace(PresetBundle::QIDI_BUNDLE, std::move(qidi_bundle));
}
// Load the other bundles in the datadir/vendor directory
@@ -208,9 +208,9 @@ BundleMap BundleMap::load()
Bundle& BundleMap::qidi_bundle()
{
auto it = find(PresetBundle::PRUSA_BUNDLE);
auto it = find(PresetBundle::QIDI_BUNDLE);
if (it == end()) {
throw Slic3r::RuntimeError("ConfigWizard: Internal error in BundleMap: PRUSA_BUNDLE not loaded");
throw Slic3r::RuntimeError("ConfigWizard: Internal error in BundleMap: QIDI_BUNDLE not loaded");
}
return it->second;
@@ -679,7 +679,7 @@ void PagePrinters::set_run_reason(ConfigWizard::RunReason run_reason)
if (is_primary_printer_page
&& (run_reason == ConfigWizard::RR_DATA_EMPTY || run_reason == ConfigWizard::RR_DATA_LEGACY)
&& printer_pickers.size() > 0
&& printer_pickers[0]->vendor_id == PresetBundle::PRUSA_BUNDLE) {
&& printer_pickers[0]->vendor_id == PresetBundle::QIDI_BUNDLE) {
printer_pickers[0]->select_one(0, true);
}
}
@@ -1681,7 +1681,7 @@ PageVendors::PageVendors(ConfigWizard *parent)
for (const std::pair<std::wstring, const VendorProfile*>& v : vendors) {
const VendorProfile* vendor = v.second;
if (vendor->id == PresetBundle::PRUSA_BUNDLE) { continue; }
if (vendor->id == PresetBundle::QIDI_BUNDLE) { continue; }
if (vendor && vendor->templates_profile)
continue;
@@ -2518,7 +2518,7 @@ void ConfigWizard::priv::create_3rdparty_pages()
{
for (const auto &pair : bundles) {
const VendorProfile *vendor = pair.second.vendor_profile;
if (vendor->id == PresetBundle::PRUSA_BUNDLE) { continue; }
if (vendor->id == PresetBundle::QIDI_BUNDLE) { continue; }
bool is_fff_technology = false;
bool is_sla_technology = false;