3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Plater: Fix arrange

Browse source
This commit is contained in:
Vojtech Kral 2018-10-11 13:22:36 +02:00
parent 8337d4675f
commit 20e1087d97
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/MainFrame.cpp
View file

@ -58,9 +58,9 @@ wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAUL
SLIC3R_VERSION +
_(L(" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases")));
// m_appController->set_model(m_plater->model);
// m_appController->set_print(m_plater->print);
// m_plater->appController = m_appController;
m_appController->set_model(&m_plater->model());
m_appController->set_print(&m_plater->print());
GUI::set_gui_appctl();
// Make the global status bar and its progress indicator available in C++

7
src/slic3r/GUI/Plater.cpp
View file

@ -1156,8 +1156,8 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs &mode
update();
_3DScene::zoom_to_volumes(canvas3D);
// TODO
// $self->object_list_changed;
object_list_changed();
// $self->schedule_background_process;
return obj_idxs;
@ -1687,7 +1687,8 @@ Plater::~Plater()
}
Sidebar& Plater::sidebar() { return *p->sidebar; }
Model& Plater::model() { return p->model; }
Model& Plater::model() { return p->model; }
Print& Plater::print() { return p->print; }
void Plater::load_files(const std::vector<fs::path> &input_files) { p->load_files(input_files); }

4
src/slic3r/GUI/Plater.hpp
View file

@ -16,6 +16,7 @@ class wxBoxSizer;
namespace Slic3r {
class Model;
class Print;
namespace GUI {
@ -91,7 +92,8 @@ public:
~Plater();
Sidebar& sidebar();
Model& model();
Model& model();
Print& print();
void load_files(const std::vector<boost::filesystem::path> &input_files);