From a1ba36b1165349e35dd399ca4f65a74250aa371d Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 2 Jul 2018 15:00:34 +0200 Subject: [PATCH] Readme update, & remove prusa as default vendor (none instead) --- README.md | 9 +++++++-- xs/src/slic3r/GUI/ConfigWizard.cpp | 14 ++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e1a0d2ce4..a5a58aae6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A: Yes. Slic3r ====== -Prebuilt Windows, OSX and Linux binaries are available through the [git releases page](https://github.com/prusa3d/Slic3r/releases). +Prebuilt Windows 32b is available through the [git releases page](https://github.com/supermerill/Slic3r/releases). @@ -19,12 +19,17 @@ See the [project homepage](http://slic3r.org/) at slic3r.org and the ### What language is it written in? Almost everything are written in C++, -Perl is used a bit but the prusa fork is getting rid of it (uless for scripting, maybe). +Perl is used a bit but the prusa fork is getting rid of it (unless for scripting, maybe). The C++ API is public and its use in other projects is encouraged. The goal is to make Slic3r fully modular so that any part of its logic can be used separately. +### What are this fork main features/differences? + +* **Ironing** top surface & many new settings to fine-tune the top surface quality. +* A denser infill option for 1-X layers before the top solid layers to better support them. + ### What are Slic3r's main features? Key features are: diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/xs/src/slic3r/GUI/ConfigWizard.cpp index ce06da853..556a1c334 100644 --- a/xs/src/slic3r/GUI/ConfigWizard.cpp +++ b/xs/src/slic3r/GUI/ConfigWizard.cpp @@ -23,6 +23,7 @@ namespace Slic3r { namespace GUI { +#define MAIN_VENDOR "None" // Printer model picker GUI control @@ -88,7 +89,7 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, cons auto *cbox = new Checkbox(panel, label, model_id, variant.name); const size_t idx = cboxes.size(); cboxes.push_back(cbox); - bool enabled = appconfig_vendors.get_variant("PrusaResearch", model_id, variant.name); + bool enabled = appconfig_vendors.get_variant(MAIN_VENDOR, model_id, variant.name); variants_checked += enabled; cbox->SetValue(enabled); col_sizer->Add(cbox, 0, wxBOTTOM, 3); @@ -226,7 +227,8 @@ PageWelcome::PageWelcome(ConfigWizard *parent) : } const auto &vendors = wizard_p()->vendors; - const auto vendor_prusa = vendors.find("PrusaResearch"); + printf("vendors count : %d", vendors.size()); + const auto vendor_prusa = vendors.find(MAIN_VENDOR); if (vendor_prusa != vendors.cend()) { AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors; @@ -311,7 +313,7 @@ PageVendors::PageVendors(ConfigWizard *parent) : for (const auto vendor_pair : wizard_p()->vendors) { const auto &vendor = vendor_pair.second; - if (vendor.id == "PrusaResearch") { continue; } + if (vendor.id == MAIN_VENDOR) { continue; } auto *picker = new PrinterPicker(this, vendor, appconfig_vendors); picker->Hide(); @@ -614,8 +616,8 @@ static const std::unordered_map void ConfigWizard::priv::load_vendors() { - const auto vendor_dir = fs::path(Slic3r::data_dir()) / "vendor"; - const auto rsrc_vendor_dir = fs::path(resources_dir()) / "profiles"; + const fs::path vendor_dir = fs::path(Slic3r::data_dir()) / "vendor"; + const fs::path rsrc_vendor_dir = fs::path(resources_dir()) / "profiles"; // Load vendors from the "vendors" directory in datadir for (fs::directory_iterator it(vendor_dir); it != fs::directory_iterator(); ++it) { @@ -661,7 +663,7 @@ void ConfigWizard::priv::load_vendors() const auto &model = needle->second.first; const auto &variant = needle->second.second; - appconfig_vendors.set_variant("PrusaResearch", model, variant, true); + appconfig_vendors.set_variant(MAIN_VENDOR, model, variant, true); } } }