GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-10-05 21:56:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup of Settings usage/propagation

Browse Source
This commit is contained in:
Joseph Lenox 2018-06-14 11:07:19 -05:00 committed by GitHub
parent b249b75be8
commit 3ac6cbdbfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GUI/Plater.cpp
View File

@ -85,16 +85,16 @@ Plater::Plater(wxWindow* parent, const wxString& title) :
canvas2D->on_instances_moved = std::function<void ()>(on_instances_moved); canvas2D->on_instances_moved = std::function<void ()>(on_instances_moved);
canvas3D = new Plate3D(preview_notebook, wxDefaultSize, objects, model, config, settings); canvas3D = new Plate3D(preview_notebook, wxDefaultSize, objects, model, config);
preview_notebook->AddPage(canvas3D, _("3D")); preview_notebook->AddPage(canvas3D, _("3D"));
preview3D = new Preview3D(preview_notebook, wxDefaultSize, objects, model, config, settings); preview3D = new Preview3D(preview_notebook, wxDefaultSize, objects, model, config);
preview_notebook->AddPage(preview3D, _("Preview")); preview_notebook->AddPage(preview3D, _("Preview"));
preview2D = new Preview2D(preview_notebook, wxDefaultSize, objects, model, config, settings); preview2D = new Preview2D(preview_notebook, wxDefaultSize, objects, model, config);
preview_notebook->AddPage(preview2D, _("Toolpaths")); preview_notebook->AddPage(preview2D, _("Toolpaths"));
previewDLP = new PreviewDLP(preview_notebook, wxDefaultSize, objects, model, config, settings); previewDLP = new PreviewDLP(preview_notebook, wxDefaultSize, objects, model, config);
preview_notebook->AddPage(previewDLP, _("DLP/SLA")); preview_notebook->AddPage(previewDLP, _("DLP/SLA"));
/* /*
@ -374,7 +374,7 @@ std::vector<int> Plater::load_model_objects(ModelObjectPtrs model_objects) {
Slic3r::Log::info(LogChannel, LOG_WSTRING("Instances: " << obj->instances.size())); Slic3r::Log::info(LogChannel, LOG_WSTRING("Instances: " << obj->instances.size()));
if (obj->instances.size() == 0) { if (obj->instances.size() == 0) {
if (settings->autocenter) { if (ui_settings->autocenter) {
need_arrange = true; need_arrange = true;
o->center_around_origin(); o->center_around_origin();
@ -382,13 +382,13 @@ std::vector<int> Plater::load_model_objects(ModelObjectPtrs model_objects) {
o->instances.back()->offset = this->bed_centerf(); o->instances.back()->offset = this->bed_centerf();
} else { } else {
need_arrange = false; need_arrange = false;
if (settings->autoalignz) { if (ui_settings->autoalignz) {
o->align_to_ground(); o->align_to_ground();
} }
o->add_instance(); o->add_instance();
} }
} else { } else {
if (settings->autoalignz) { if (ui_settings->autoalignz) {
o->align_to_ground(); o->align_to_ground();
} }
} }
@ -516,7 +516,7 @@ void Plater::on_model_change(bool force_autocenter) {
} }
} }
if (force_autocenter || settings->autocenter) { if (force_autocenter || ui_settings->autocenter) {
this->model->center_instances_around_point(this->bed_centerf()); this->model->center_instances_around_point(this->bed_centerf());
} }
this->refresh_canvases(); this->refresh_canvases();