kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Measure: give a hint to ::getShape so that compound shapes may be resolved

Browse Source
This commit is contained in:
theo-vt
2025-07-23 15:42:10 -04:00
committed by Kacper Donat
parent 7e986d85f5
commit 2c7d830603
2 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Mod/Measure/App/Measurement.cpp
View File

@@ -284,9 +284,16 @@ MeasureType Measurement::getType()
return measureType; return measureType;
} }
TopoDS_Shape Measurement::getShape(App::DocumentObject* obj, const char* subName) const TopoDS_Shape
Measurement::getShape(App::DocumentObject* obj, const char* subName, TopAbs_ShapeEnum hint) const
{ {
return ShapeFinder::getLocatedShape(*obj, subName); TopoShape shape = ShapeFinder::getLocatedTopoShape(*obj, subName);
if (shape.shapeType() == TopAbs_COMPOUND && hint != TopAbs_COMPOUND
&& shape.hasSubShape(hint)) {
return shape.getSubTopoShape(hint, true).getShape();
}
return shape.getShape();
} }
@@ -323,7 +330,7 @@ double Measurement::length() const
for (; obj != objects.end(); ++obj, ++subEl) { for (; obj != objects.end(); ++obj, ++subEl) {
// Get the length of one edge // Get the length of one edge
TopoDS_Shape shape = getShape(*obj, (*subEl).c_str()); TopoDS_Shape shape = getShape(*obj, (*subEl).c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge = TopoDS::Edge(shape); const TopoDS_Edge& edge = TopoDS::Edge(shape);
BRepAdaptor_Curve curve(edge); BRepAdaptor_Curve curve(edge);
@@ -379,12 +386,12 @@ double Measurement::lineLineDistance() const
const std::vector<std::string>& subElements = References3D.getSubValues(); const std::vector<std::string>& subElements = References3D.getSubValues();
// Get the first line // Get the first line
TopoDS_Shape shape1 = getShape(objects[0], subElements[0].c_str()); TopoDS_Shape shape1 = getShape(objects[0], subElements[0].c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge1 = TopoDS::Edge(shape1); const TopoDS_Edge& edge1 = TopoDS::Edge(shape1);
BRepAdaptor_Curve curve1(edge1); BRepAdaptor_Curve curve1(edge1);
// Get the second line // Get the second line
TopoDS_Shape shape2 = getShape(objects[1], subElements[1].c_str()); TopoDS_Shape shape2 = getShape(objects[1], subElements[1].c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge2 = TopoDS::Edge(shape2); const TopoDS_Edge& edge2 = TopoDS::Edge(shape2);
BRepAdaptor_Curve curve2(edge2); BRepAdaptor_Curve curve2(edge2);
@@ -428,13 +435,13 @@ double Measurement::planePlaneDistance() const
std::vector<gp_Pln> planes; std::vector<gp_Pln> planes;
// Get the first plane // Get the first plane
TopoDS_Shape shape1 = getShape(objects[0], subElements[0].c_str()); TopoDS_Shape shape1 = getShape(objects[0], subElements[0].c_str(), TopAbs_FACE);
const TopoDS_Face& face1 = TopoDS::Face(shape1); const TopoDS_Face& face1 = TopoDS::Face(shape1);
BRepAdaptor_Surface surface1(face1); BRepAdaptor_Surface surface1(face1);
const gp_Pln& plane1 = surface1.Plane(); const gp_Pln& plane1 = surface1.Plane();
// Get the second plane // Get the second plane
TopoDS_Shape shape2 = getShape(objects[1], subElements[1].c_str()); TopoDS_Shape shape2 = getShape(objects[1], subElements[1].c_str(), TopAbs_FACE);
const TopoDS_Face& face2 = TopoDS::Face(shape2); const TopoDS_Face& face2 = TopoDS::Face(shape2);
BRepAdaptor_Surface surface2(face2); BRepAdaptor_Surface surface2(face2);
const gp_Pln& plane2 = surface2.Plane(); const gp_Pln& plane2 = surface2.Plane();
@@ -473,8 +480,8 @@ double Measurement::angle(const Base::Vector3d& /*param*/) const
// Since we don't know if the directions of the lines point in the same general direction // Since we don't know if the directions of the lines point in the same general direction
// we could get the angle we want or the supplementary angle. // we could get the angle we want or the supplementary angle.
if (numRefs == 2) { if (numRefs == 2) {
TopoDS_Shape shape1 = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape1 = getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_EDGE);
TopoDS_Shape shape2 = getShape(objects.at(1), subElements.at(1).c_str()); TopoDS_Shape shape2 = getShape(objects.at(1), subElements.at(1).c_str(), TopAbs_EDGE);
BRepAdaptor_Curve curve1(TopoDS::Edge(shape1)); BRepAdaptor_Curve curve1(TopoDS::Edge(shape1));
BRepAdaptor_Curve curve2(TopoDS::Edge(shape2)); BRepAdaptor_Curve curve2(TopoDS::Edge(shape2));
@@ -505,9 +512,9 @@ double Measurement::angle(const Base::Vector3d& /*param*/) const
// NOTE: we are calculating the 3d angle here, not the projected angle // NOTE: we are calculating the 3d angle here, not the projected angle
// ASSUMPTION: the references are in end-apex-end order // ASSUMPTION: the references are in end-apex-end order
if (numRefs == 3) { if (numRefs == 3) {
TopoDS_Shape shape0 = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape0 = getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_VERTEX);
TopoDS_Shape shape1 = getShape(objects.at(1), subElements.at(1).c_str()); TopoDS_Shape shape1 = getShape(objects.at(1), subElements.at(1).c_str(), TopAbs_VERTEX);
TopoDS_Shape shape2 = getShape(objects.at(1), subElements.at(2).c_str()); TopoDS_Shape shape2 = getShape(objects.at(1), subElements.at(2).c_str(), TopAbs_VERTEX);
if (shape0.ShapeType() != TopAbs_VERTEX || shape1.ShapeType() != TopAbs_VERTEX if (shape0.ShapeType() != TopAbs_VERTEX || shape1.ShapeType() != TopAbs_VERTEX
|| shape2.ShapeType() != TopAbs_VERTEX) { || shape2.ShapeType() != TopAbs_VERTEX) {
throw Base::RuntimeError("Measurement references for 3 point angle are not Vertex"); throw Base::RuntimeError("Measurement references for 3 point angle are not Vertex");
@@ -536,7 +543,7 @@ double Measurement::radius() const
Base::Console().error("Measurement::radius - No 3D references available\n"); Base::Console().error("Measurement::radius - No 3D references available\n");
} }
else if (measureType == MeasureType::Circle) { else if (measureType == MeasureType::Circle) {
TopoDS_Shape shape = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape = getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge = TopoDS::Edge(shape); const TopoDS_Edge& edge = TopoDS::Edge(shape);
BRepAdaptor_Curve curve(edge); BRepAdaptor_Curve curve(edge);
@@ -546,7 +553,7 @@ double Measurement::radius() const
} }
else if (measureType == MeasureType::Cylinder || measureType == MeasureType::Sphere else if (measureType == MeasureType::Cylinder || measureType == MeasureType::Sphere
|| measureType == MeasureType::Torus) { || measureType == MeasureType::Torus) {
TopoDS_Shape shape = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape = getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_FACE);
TopoDS_Face face = TopoDS::Face(shape); TopoDS_Face face = TopoDS::Face(shape);
BRepAdaptor_Surface sf(face); BRepAdaptor_Surface sf(face);
@@ -581,8 +588,10 @@ Base::Vector3d Measurement::delta() const
if (measureType == MeasureType::PointToPoint) { if (measureType == MeasureType::PointToPoint) {
if (numRefs == 2) { if (numRefs == 2) {
// Keep separate case for two points to reduce need for complex algorithm // Keep separate case for two points to reduce need for complex algorithm
TopoDS_Shape shape1 = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape1 =
TopoDS_Shape shape2 = getShape(objects.at(1), subElements.at(1).c_str()); getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_VERTEX);
TopoDS_Shape shape2 =
getShape(objects.at(1), subElements.at(1).c_str(), TopAbs_VERTEX);
const TopoDS_Vertex& vert1 = TopoDS::Vertex(shape1); const TopoDS_Vertex& vert1 = TopoDS::Vertex(shape1);
const TopoDS_Vertex& vert2 = TopoDS::Vertex(shape2); const TopoDS_Vertex& vert2 = TopoDS::Vertex(shape2);
@@ -616,7 +625,8 @@ Base::Vector3d Measurement::delta() const
else if (measureType == MeasureType::Edges) { else if (measureType == MeasureType::Edges) {
// Only case that is supported is straight line edge // Only case that is supported is straight line edge
if (numRefs == 1) { if (numRefs == 1) {
TopoDS_Shape shape = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape =
getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge = TopoDS::Edge(shape); const TopoDS_Edge& edge = TopoDS::Edge(shape);
BRepAdaptor_Curve curve(edge); BRepAdaptor_Curve curve(edge);
@@ -628,8 +638,10 @@ Base::Vector3d Measurement::delta() const
} }
} }
else if (numRefs == 2) { else if (numRefs == 2) {
TopoDS_Shape shape1 = getShape(objects.at(0), subElements.at(0).c_str()); TopoDS_Shape shape1 =
TopoDS_Shape shape2 = getShape(objects.at(1), subElements.at(1).c_str()); getShape(objects.at(0), subElements.at(0).c_str(), TopAbs_EDGE);
TopoDS_Shape shape2 =
getShape(objects.at(1), subElements.at(1).c_str(), TopAbs_EDGE);
BRepAdaptor_Curve curve1(TopoDS::Edge(shape1)); BRepAdaptor_Curve curve1(TopoDS::Edge(shape1));
BRepAdaptor_Curve curve2(TopoDS::Edge(shape2)); BRepAdaptor_Curve curve2(TopoDS::Edge(shape2));
@@ -805,12 +817,12 @@ bool Measurement::linesAreParallel() const
} }
// Get the first line // Get the first line
TopoDS_Shape shape1 = getShape(objects[0], subElements[0].c_str()); TopoDS_Shape shape1 = getShape(objects[0], subElements[0].c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge1 = TopoDS::Edge(shape1); const TopoDS_Edge& edge1 = TopoDS::Edge(shape1);
BRepAdaptor_Curve curve1(edge1); BRepAdaptor_Curve curve1(edge1);
// Get the second line // Get the second line
TopoDS_Shape shape2 = getShape(objects[1], subElements[1].c_str()); TopoDS_Shape shape2 = getShape(objects[1], subElements[1].c_str(), TopAbs_EDGE);
const TopoDS_Edge& edge2 = TopoDS::Edge(shape2); const TopoDS_Edge& edge2 = TopoDS::Edge(shape2);
BRepAdaptor_Curve curve2(edge2); BRepAdaptor_Curve curve2(edge2);

7
src/Mod/Measure/App/Measurement.h
View File

@@ -24,6 +24,7 @@
#define MEASURE_MEASUREMENT_H #define MEASURE_MEASUREMENT_H
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <App/DocumentObject.h> #include <App/DocumentObject.h>
#include <App/PropertyLinks.h> #include <App/PropertyLinks.h>
@@ -115,7 +116,11 @@ public:
bool linesAreParallel() const; bool linesAreParallel() const;
protected: protected:
TopoDS_Shape getShape(App::DocumentObject* obj, const char* subName) const; // Hint parameter helps sort out coumpound shapes by specifying a subelement type
// use hint = TopAbs_COMPOUND to give no hint
TopoDS_Shape getShape(App::DocumentObject* obj,
const char* subName,
TopAbs_ShapeEnum hint = TopAbs_COMPOUND) const;
private: private:
MeasureType measureType; MeasureType measureType;