From a3d38494f0c3365bb4cd7484025da0d36cf3cd39 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Thu, 14 Jun 2018 09:24:03 -0500 Subject: [PATCH] Cleaning up settings to ui_settings --- src/GUI/Plater.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GUI/Plater.cpp b/src/GUI/Plater.cpp index a5fe7de9a..3c1fa5d66 100644 --- a/src/GUI/Plater.cpp +++ b/src/GUI/Plater.cpp @@ -76,7 +76,7 @@ Plater::Plater(wxWindow* parent, const wxString& title) : */ // initialize 2D Preview Canvas - canvas2D = new Plate2D(preview_notebook, wxDefaultSize, objects, model, config, settings); + canvas2D = new Plate2D(preview_notebook, wxDefaultSize, objects, model, config); preview_notebook->AddPage(canvas2D, _("2D")); canvas2D->on_select_object = std::function(on_select_object); @@ -241,7 +241,7 @@ void Plater::add() { Log::info(LogChannel, L"Called Add function"); auto& start_object_id = this->object_identifier; - const auto& input_files{open_model(this, *(this->settings), wxTheApp->GetTopWindow())}; + const auto& input_files{open_model(this, wxTheApp->GetTopWindow())}; for (const auto& f : input_files) { Log::info(LogChannel, (wxString(L"Calling Load File for ") + f).ToStdWstring()); this->load_file(f.ToStdString()); @@ -272,8 +272,8 @@ void Plater::add() { std::vector Plater::load_file(const std::string file, const int obj_idx_to_load) { auto input_file {wxFileName(file)}; - settings->skein_directory = input_file.GetPath(); - settings->save_settings(); + ui_settings->skein_directory = input_file.GetPath(); + ui_settings->save_settings(); Slic3r::Model model; bool valid_load {true}; @@ -791,7 +791,7 @@ void Plater::increase(size_t copies, bool dont_push) { this->add_undo_operation(UndoCmd::Increase, obj->identifier, copies); } - if(settings->autocenter) { + if(ui_settings->autocenter) { this->arrange(); } else { this->on_model_change();