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

Fixed crashing asserts due to a bug in the just merged branch

Browse Source
This commit is contained in:
Lukas Matena 2022-09-30 08:52:38 +02:00
parent d42c5167f6
commit 97e69c04f8
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/Measure.cpp
View File

@ -646,6 +646,7 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
angle = std::acos(std::abs(normal1.dot(normal2))); angle = std::acos(std::abs(normal1.dot(normal2)));
} }
result.angle = std::make_optional(AngleAndPoints(angle, Vec3d::Zero(), Vec3d::UnitX(), Vec3d::UnitX(), 0., false)); // TODO result.angle = std::make_optional(AngleAndPoints(angle, Vec3d::Zero(), Vec3d::UnitX(), Vec3d::UnitX(), 0., false)); // TODO
result.distance_infinite = std::make_optional(DistAndPoints{0., Vec3d::Zero(), Vec3d::Zero()}); // TODO
} }

26
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -858,8 +858,8 @@ void GLGizmoMeasure::render_dimensioning()
const double radius = res.angle->radius; const double radius = res.angle->radius;
const bool coplanar = res.angle->coplanar; const bool coplanar = res.angle->coplanar;
std::pair<Vec3d, Vec3d> e1 = m_selected_features.first.feature->get_edge(); std::pair<Vec3d, Vec3d> e1 = f1.get_edge();
std::pair<Vec3d, Vec3d> e2 = m_selected_features.second.feature->get_edge(); std::pair<Vec3d, Vec3d> e2 = f2.get_edge();
if ((e1.second - e1.first).dot(e1_unit) < 0.) if ((e1.second - e1.first).dot(e1_unit) < 0.)
std::swap(e1.first, e1.second); std::swap(e1.first, e1.second);
@ -1019,23 +1019,25 @@ void GLGizmoMeasure::render_dimensioning()
: *m_measurement_result.distance_strict; : *m_measurement_result.distance_strict;
point_point(dap.from, dap.to); point_point(dap.from, dap.to);
const Measure::SurfaceFeature& f1 = *m_selected_features.first.feature; const Measure::SurfaceFeature* f1 = &(*m_selected_features.first.feature);
const Measure::SurfaceFeature& f2 = *m_selected_features.second.feature; const Measure::SurfaceFeature* f2 = &(*m_selected_features.second.feature);
Measure::SurfaceFeatureType ft1 = f1.get_type(); Measure::SurfaceFeatureType ft1 = f1->get_type();
Measure::SurfaceFeatureType ft2 = f2.get_type(); Measure::SurfaceFeatureType ft2 = f2->get_type();
// Order features by type so following conditions are simple.
if (ft2 > ft2)
std::swap(ft1, ft2);
// Where needed, draw also the extension of the edge to where the dist is measured: // Where needed, draw also the extension of the edge to where the dist is measured:
if ((int(ft1) | int(ft2)) == if (ft1 == Measure::SurfaceFeatureType::Point && ft2 == Measure::SurfaceFeatureType::Edge)
(int(Measure::SurfaceFeatureType::Point) | int(Measure::SurfaceFeatureType::Edge))) point_edge(*f1, *f2);
point_edge(f1, f2);
// Now if there is an angle to show, draw the arc: // Now if there is an angle to show, draw the arc:
if (ft1 == Measure::SurfaceFeatureType::Edge && ft2 == Measure::SurfaceFeatureType::Edge) if (ft1 == Measure::SurfaceFeatureType::Edge && ft2 == Measure::SurfaceFeatureType::Edge)
arc_edge_edge(f1, f2); arc_edge_edge(*f1, *f2);
if (int(ft1) | int(ft2) == (int(Measure::SurfaceFeatureType::Edge) | int(Measure::SurfaceFeatureType::Plane))) if (ft1 == Measure::SurfaceFeatureType::Edge && ft2 == Measure::SurfaceFeatureType::Plane)
arc_edge_plane(f1, f2); arc_edge_plane(*f1, *f2);
} }