GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 10:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Measuring - Fixed transformation of distance_xyz

Browse Source
This commit is contained in:
enricoturri1966 2022-11-07 14:46:21 +01:00
parent 236f97aded
commit 5df2713010
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Measure.cpp
View File

@ -723,8 +723,8 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
if (f2.get_type() == SurfaceFeatureType::Point) { if (f2.get_type() == SurfaceFeatureType::Point) {
Vec3d diff = (f2.get_point() - f1.get_point()); Vec3d diff = (f2.get_point() - f1.get_point());
result.distance_strict = std::make_optional(DistAndPoints{diff.norm(), f1.get_point(), f2.get_point()}); result.distance_strict = std::make_optional(DistAndPoints{diff.norm(), f1.get_point(), f2.get_point()});
result.distance_xyz = diff; result.distance_xyz = diff.cwiseAbs();
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
} else if (f2.get_type() == SurfaceFeatureType::Edge) { } else if (f2.get_type() == SurfaceFeatureType::Edge) {
const auto [s,e] = f2.get_edge(); const auto [s,e] = f2.get_edge();

6
src/libslic3r/Measure.hpp
View File

@ -156,10 +156,10 @@ struct MeasurementResult {
angle->transform(trafo); angle->transform(trafo);
if (distance_infinite.has_value()) if (distance_infinite.has_value())
distance_infinite->transform(trafo); distance_infinite->transform(trafo);
if (distance_strict.has_value()) if (distance_strict.has_value()) {
distance_strict->transform(trafo); distance_strict->transform(trafo);
if (distance_xyz.has_value()) distance_xyz = (distance_strict->to - distance_strict->from).cwiseAbs();
distance_xyz = trafo * *distance_xyz; }
} }
}; };