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

finished removing local settings in favor of singleton ui_settings

Browse Source
This commit is contained in:
Joseph Lenox 2018-06-13 22:17:25 -05:00 committed by Joseph Lenox
parent ce4330e868
commit deba961bf7
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GUI/Plater/Plate3D.hpp
View File

@ -4,7 +4,6 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#include "Settings.hpp"
#include "Model.hpp" #include "Model.hpp"
#include "Config.hpp" #include "Config.hpp"
@ -13,14 +12,13 @@ namespace Slic3r { namespace GUI {
class Plate3D : public wxPanel { class Plate3D : public wxPanel {
public: public:
void update() {}; void update() {};
Plate3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config, std::shared_ptr<Settings> _settings) : Plate3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings) wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
{} {}
private: private:
std::vector<PlaterObject>& objects; //< reference to parent vector std::vector<PlaterObject>& objects; //< reference to parent vector
std::shared_ptr<Slic3r::Model> model; std::shared_ptr<Slic3r::Model> model;
std::shared_ptr<Slic3r::Config> config; std::shared_ptr<Slic3r::Config> config;
std::shared_ptr<Settings> settings;
}; };
} } // Namespace Slic3r::GUI } } // Namespace Slic3r::GUI

2
src/GUI/Plater/Preview2D.hpp
View File

@ -14,7 +14,7 @@ class Preview2D : public wxPanel {
public: public:
void reload_print() {}; void reload_print() {};
Preview2D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) : Preview2D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings) wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
{} {}
void enabled(bool enable = true) {} void enabled(bool enable = true) {}

2
src/GUI/Plater/Preview3D.hpp
View File

@ -14,7 +14,7 @@ class Preview3D : public wxPanel {
public: public:
void reload_print() {}; void reload_print() {};
Preview3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) : Preview3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings) wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
{} {}
void enabled(bool enable = true) {} void enabled(bool enable = true) {}

2
src/GUI/Plater/PreviewDLP.hpp
View File

@ -14,7 +14,7 @@ class PreviewDLP : public wxPanel {
public: public:
void reload_print() {}; void reload_print() {};
PreviewDLP(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) : PreviewDLP(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings) wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
{} {}
void enabled(bool enable = true) {} void enabled(bool enable = true) {}