3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 03:37:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cut: Fix crashing in programming cut. Also fixes the cut z offset.

Browse source
This commit is contained in:
Noisyfox 2023-11-05 16:02:39 +08:00
parent 018b2744db
commit 28e2995a01
4 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/CutUtils.cpp
View file

@ -653,11 +653,5 @@ const ModelObjectPtrs& Cut::perform_with_groove(const Groove& groove, const Tran
return m_model.objects; return m_model.objects;
} }
ModelObjectPtrs Cut::cut_horizontal(const ModelObject *object, size_t instance_idx, double z, ModelObjectCutAttributes attributes)
{
Cut cut(object, instance_idx, Geometry::translation_transform(z * Vec3d::UnitZ()), attributes);
return cut.perform_with_plane();
}
} // namespace Slic3r } // namespace Slic3r

2
src/libslic3r/CutUtils.hpp
View file

@ -63,8 +63,6 @@ public:
const ModelObjectPtrs& perform_by_contour(std::vector<Part> parts, int dowels_count); const ModelObjectPtrs& perform_by_contour(std::vector<Part> parts, int dowels_count);
const ModelObjectPtrs& perform_with_groove(const Groove& groove, const Transform3d& rotation_m, bool keep_as_parts = false); const ModelObjectPtrs& perform_with_groove(const Groove& groove, const Transform3d& rotation_m, bool keep_as_parts = false);
static ModelObjectPtrs cut_horizontal(const ModelObject *object, size_t instance_idx, double z, ModelObjectCutAttributes attributes);
}; // namespace Cut }; // namespace Cut

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

@ -8426,23 +8426,12 @@ void Plater::cut_horizontal(size_t obj_idx, size_t instance_idx, double z, Model
return; return;
wxBusyCursor wait; wxBusyCursor wait;
const auto new_objects = Cut::cut_horizontal(object, instance_idx, z, attributes);
remove(obj_idx); const Vec3d instance_offset = object->instances[instance_idx]->get_offset();
p->load_model_objects(new_objects); Cut cut(object, instance_idx, Geometry::translation_transform(z * Vec3d::UnitZ() - instance_offset), attributes);
const auto new_objects = cut.perform_with_plane();
// now process all updates of the 3d scene apply_cut_object_to_model(obj_idx, new_objects);
update();
// Update InfoItems in ObjectList after update() to use of a correct value of the GLCanvas3D::is_sinking(),
// which is updated after a view3D->reload_scene(false, flags & (unsigned int)UpdateParams::FORCE_FULL_SCREEN_REFRESH) call
for (size_t idx = 0; idx < p->model.objects.size(); idx++)
wxGetApp().obj_list()->update_info_items(idx);
Selection& selection = p->get_selection();
size_t last_id = p->model.objects.size() - 1;
for (size_t i = 0; i < new_objects.size(); ++i)
selection.add_object((unsigned int)(last_id - i), i == 0);
} }
void Plater::_calib_pa_tower(const Calib_Params& params) { void Plater::_calib_pa_tower(const Calib_Params& params) {

4
src/slic3r/Utils/CalibUtils.cpp
View file

@ -143,7 +143,9 @@ static void cut_model(Model &model, double z, ModelObjectCutAttributes attribute
auto* object = model.objects[0]; auto* object = model.objects[0];
const auto new_objects = Cut::cut_horizontal(object, instance_idx, z, attributes); const Vec3d instance_offset = object->instances[instance_idx]->get_offset();
Cut cut(object, instance_idx, Geometry::translation_transform(z * Vec3d::UnitZ() - instance_offset), attributes);
const auto new_objects = cut.perform_with_plane();
model.delete_object(obj_idx); model.delete_object(obj_idx);
for (ModelObject *model_object : new_objects) { for (ModelObject *model_object : new_objects) {