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

more work on arrange()

Browse Source
This commit is contained in:
Joseph Lenox 2018-05-07 22:36:40 -05:00
parent eadac30476
commit b16e2570f3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GUI/Plater.cpp
View File

@ -374,14 +374,18 @@ void Plater::refresh_canvases() {
void Plater::arrange() { void Plater::arrange() {
// pause background process // pause background process
Slic3r::Log::info(LogChannel, L"Called arrange()");
auto bb {Slic3r::BoundingBoxf(this->config->get<ConfigOptionPoints>("bed_shape").values)}; auto bb {Slic3r::BoundingBoxf(this->config->get<ConfigOptionPoints>("bed_shape").values)};
bool success {this->model->arrange_objects(this->config->min_object_distance(), &bb)}; bool success {this->model->arrange_objects(5, &bb)};
GetFrame()->statusbar->SetStatusText(_("Objects were arranged.")); GetFrame()->statusbar->SetStatusText(_("Objects were arranged."));
this->on_model_change(true); this->on_model_change(true);
} }
void Plater::on_model_change(bool force_autocenter) { void Plater::on_model_change(bool force_autocenter) {
if (force_autocenter || settings->autocenter) {
this->model->center_instances_around_point(this->bed_centerf());
}
this->refresh_canvases(); this->refresh_canvases();
} }

5
src/GUI/Plater.hpp
View File

@ -37,6 +37,9 @@ public:
Plater(wxWindow* parent, const wxString& title, std::shared_ptr<Settings> _settings); Plater(wxWindow* parent, const wxString& title, std::shared_ptr<Settings> _settings);
void add(); void add();
/// Arrange models
void arrange();
/// Ask if there are any unsaved changes. /// Ask if there are any unsaved changes.
bool prompt_unsaved_changes() { return true; } bool prompt_unsaved_changes() { return true; }
private: private:
@ -96,8 +99,6 @@ private:
void on_thumbnail_made(size_t idx); void on_thumbnail_made(size_t idx);
void refresh_canvases(); void refresh_canvases();
/// Arrange models
void arrange();
/// Run everything that needs to happen when models change. /// Run everything that needs to happen when models change.
/// Includes updating canvases, reloading menus, etc. /// Includes updating canvases, reloading menus, etc.