GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 14:35:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Readme update, & remove prusa as default vendor (none instead)

Browse Source
This commit is contained in:
supermerill 2018-07-02 15:00:34 +02:00 committed by supermerill
parent b78928e13d
commit a1ba36b116
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -4,7 +4,7 @@ A: Yes.
Slic3r 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).
<img width=256 src=https://cloud.githubusercontent.com/assets/31754/22719818/09998c92-ed6d-11e6-9fa0-09de638f3a36.png /> <img width=256 src=https://cloud.githubusercontent.com/assets/31754/22719818/09998c92-ed6d-11e6-9fa0-09de638f3a36.png />
@ -19,12 +19,17 @@ See the [project homepage](http://slic3r.org/) at slic3r.org and the
### What language is it written in? ### What language is it written in?
Almost everything are written in C++, 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 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 The goal is to make Slic3r fully modular so that any part of its logic
can be used separately. 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? ### What are Slic3r's main features?
Key features are: Key features are:

14
xs/src/slic3r/GUI/ConfigWizard.cpp
View File

@ -23,6 +23,7 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
#define MAIN_VENDOR "None"
// Printer model picker GUI control // 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); auto *cbox = new Checkbox(panel, label, model_id, variant.name);
const size_t idx = cboxes.size(); const size_t idx = cboxes.size();
cboxes.push_back(cbox); 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; variants_checked += enabled;
cbox->SetValue(enabled); cbox->SetValue(enabled);
col_sizer->Add(cbox, 0, wxBOTTOM, 3); col_sizer->Add(cbox, 0, wxBOTTOM, 3);
@ -226,7 +227,8 @@ PageWelcome::PageWelcome(ConfigWizard *parent) :
} }
const auto &vendors = wizard_p()->vendors; 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()) { if (vendor_prusa != vendors.cend()) {
AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors; AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
@ -311,7 +313,7 @@ PageVendors::PageVendors(ConfigWizard *parent) :
for (const auto vendor_pair : wizard_p()->vendors) { for (const auto vendor_pair : wizard_p()->vendors) {
const auto &vendor = vendor_pair.second; 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); auto *picker = new PrinterPicker(this, vendor, appconfig_vendors);
picker->Hide(); picker->Hide();
@ -614,8 +616,8 @@ static const std::unordered_map<std::string, std::pair<std::string, std::string>
void ConfigWizard::priv::load_vendors() void ConfigWizard::priv::load_vendors()
{ {
const auto vendor_dir = fs::path(Slic3r::data_dir()) / "vendor"; const fs::path vendor_dir = fs::path(Slic3r::data_dir()) / "vendor";
const auto rsrc_vendor_dir = fs::path(resources_dir()) / "profiles"; const fs::path rsrc_vendor_dir = fs::path(resources_dir()) / "profiles";
// Load vendors from the "vendors" directory in datadir // Load vendors from the "vendors" directory in datadir
for (fs::directory_iterator it(vendor_dir); it != fs::directory_iterator(); ++it) { 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 &model = needle->second.first;
const auto &variant = needle->second.second; const auto &variant = needle->second.second;
appconfig_vendors.set_variant("PrusaResearch", model, variant, true); appconfig_vendors.set_variant(MAIN_VENDOR, model, variant, true);
} }
} }
} }