amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ENH: unify multi-object copy with single copy

Browse source 
Also adapt empty cell stride with object size plus 1mm.

Change-Id: I47ac98bede196d636ebb3da549c16e393756de0a
This commit is contained in:
Arthur 2022-09-09 16:36:00 +08:00 committed by Lane.Wei
parent b71917b28c
commit 9edc90704a
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -4074,15 +4074,15 @@ double GLCanvas3D::get_size_proportional_to_max_bed_size(double factor) const
} }
//BBS //BBS
std::vector<Vec2f> GLCanvas3D::get_empty_cells(const Vec2f start_point) std::vector<Vec2f> GLCanvas3D::get_empty_cells(const Vec2f start_point, const Vec2f step)
{ {
PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_curr_plate(); PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
BoundingBoxf3 build_volume = plate->get_build_volume(); BoundingBoxf3 build_volume = plate->get_build_volume();
Vec2d vmin(build_volume.min.x(), build_volume.min.y()), vmax(build_volume.max.x(), build_volume.max.y()); Vec2d vmin(build_volume.min.x(), build_volume.min.y()), vmax(build_volume.max.x(), build_volume.max.y());
BoundingBoxf bbox(vmin, vmax); BoundingBoxf bbox(vmin, vmax);
std::vector<Vec2f> cells; std::vector<Vec2f> cells;
for (float x = bbox.min.x(); x < bbox.max.x(); x+=10) for (float x = bbox.min.x(); x < bbox.max.x(); x += step(0))
for (float y = bbox.min.y(); y < bbox.max.y(); y += 10) for (float y = bbox.min.y(); y < bbox.max.y(); y += step(1))
{ {
cells.emplace_back(x, y); cells.emplace_back(x, y);
} }
@ -4124,9 +4124,9 @@ std::vector<Vec2f> GLCanvas3D::get_empty_cells(const Vec2f start_point)
return cells; return cells;
} }
Vec2f GLCanvas3D::get_nearest_empty_cell(const Vec2f start_point) Vec2f GLCanvas3D::get_nearest_empty_cell(const Vec2f start_point, const Vec2f step)
{ {
std::vector<Vec2f> empty_cells = get_empty_cells(start_point); std::vector<Vec2f> empty_cells = get_empty_cells(start_point, step);
if (!empty_cells.empty()) if (!empty_cells.empty())
return empty_cells.front(); return empty_cells.front();
else { else {

6
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -831,11 +831,11 @@ public:
double get_size_proportional_to_max_bed_size(double factor) const; double get_size_proportional_to_max_bed_size(double factor) const;
// BBS: get empty cells to put new object // BBS: get empty cells to put new object
// start_point={-1,-1} means sort from bed center // start_point={-1,-1} means sort from bed center, step is the unscaled x,y stride
std::vector<Vec2f> get_empty_cells(const Vec2f start_point); std::vector<Vec2f> get_empty_cells(const Vec2f start_point, const Vec2f step = {10, 10});
// BBS: get the nearest empty cell // BBS: get the nearest empty cell
// start_point={-1,-1} means sort from bed center // start_point={-1,-1} means sort from bed center
Vec2f get_nearest_empty_cell(const Vec2f start_point); Vec2f get_nearest_empty_cell(const Vec2f start_point, const Vec2f step = {10, 10});
void set_cursor(ECursorType type); void set_cursor(ECursorType type);
void msw_rescale(); void msw_rescale();

15
src/slic3r/GUI/Selection.cpp
View file

@ -2619,6 +2619,7 @@ void Selection::paste_objects_from_clipboard()
//BBS: if multiple objects are selected, move them as a whole after copy //BBS: if multiple objects are selected, move them as a whole after copy
Vec2d shift_all = {0, 0}; Vec2d shift_all = {0, 0};
Vec2f empty_cell_all = {0, 0};
if (src_objects.size() > 1) { if (src_objects.size() > 1) {
BoundingBoxf3 bbox_all; BoundingBoxf3 bbox_all;
for (const ModelObject *src_object : src_objects) { for (const ModelObject *src_object : src_objects) {
@ -2632,25 +2633,27 @@ void Selection::paste_objects_from_clipboard()
shift_all = {0, bbox_all.size().y()}; shift_all = {0, bbox_all.size().y()};
} }
for (const ModelObject* src_object : src_objects) for (size_t i=0;i<src_objects.size();i++)
{ {
const ModelObject *src_object = src_objects[i];
ModelObject* dst_object = m_model->add_object(*src_object); ModelObject* dst_object = m_model->add_object(*src_object);
// BBS: find an empty cell to put the copied object // BBS: find an empty cell to put the copied object
BoundingBoxf3 bbox = src_object->instance_convex_hull_bounding_box(0); BoundingBoxf3 bbox = src_object->instance_convex_hull_bounding_box(0);
Vec3d displacement; Vec3d displacement;
bool in_current = plate->intersects(bbox);
auto start_point = in_current ? bbox.center() : plate->get_build_volume().center();
if (shift_all(0) != 0 || shift_all(1) != 0) { if (shift_all(0) != 0 || shift_all(1) != 0) {
// BBS: if multiple objects are selected, move them as a whole after copy // BBS: if multiple objects are selected, move them as a whole after copy
auto start_point = bbox.center(); if (i == 0) empty_cell_all = wxGetApp().plater()->canvas3D()->get_nearest_empty_cell({start_point(0), start_point(1)}, {bbox.size()(0)+1,bbox.size()(1)+1});
displacement = {shift_all.x() + start_point.x(), shift_all.y() + start_point.y(), start_point(2)}; auto instance_shift = src_object->instances.front()->get_offset() - src_objects[0]->instances.front()->get_offset();
displacement = {shift_all.x() + empty_cell_all.x()+instance_shift.x(), shift_all.y() + empty_cell_all.y()+instance_shift.y(), start_point(2)};
} else { } else {
// BBS: if only one object is copied, find an empty cell to put it // BBS: if only one object is copied, find an empty cell to put it
bool in_current = plate->intersects(bbox);
auto start_point = in_current ? bbox.center() : plate->get_build_volume().center();
auto start_offset = in_current ? src_object->instances.front()->get_offset() : plate->get_build_volume().center(); auto start_offset = in_current ? src_object->instances.front()->get_offset() : plate->get_build_volume().center();
auto point_offset = start_offset - start_point; auto point_offset = start_offset - start_point;
auto empty_cell = wxGetApp().plater()->canvas3D()->get_nearest_empty_cell({start_point(0), start_point(1)}); auto empty_cell = wxGetApp().plater()->canvas3D()->get_nearest_empty_cell({start_point(0), start_point(1)}, {bbox.size()(0)+1, bbox.size()(1)+1});
displacement = {empty_cell.x() + point_offset.x(), empty_cell.y() + point_offset.y(), start_point(2)}; displacement = {empty_cell.x() + point_offset.x(), empty_cell.y() + point_offset.y(), start_point(2)};
} }