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

Fix tests, slip in TNP defense

Browse Source
This commit is contained in:
bgbsww
2024-05-07 11:50:08 -04:00
parent 3ee0530ac2
commit 9fc744fbe3
4 changed files with 133 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/ComplexGeoData.cpp
View File

@@ -685,7 +685,7 @@ void ComplexGeoData::dumpElementMap(std::ostream& stream) const
{
auto map = getElementMap();
std::sort(map.begin(), map.end());
for ( auto element : map ) {
for ( auto& element : map ) {
stream << element.index << " : " << element.name << std::endl;
}
}

3
src/Mod/Part/App/PartFeature.cpp
View File

@@ -1014,7 +1014,7 @@ TopoShape Feature::getTopoShape(const App::DocumentObject* obj,
noElementMap,
hiddens,
lastLink);
#ifdef FC_USE_TNP_FIX
if (needSubElement && shape.shapeType(true) == TopAbs_COMPOUND) {
if (shape.countSubShapes(TopAbs_SOLID) == 1)
shape = shape.getSubTopoShape(TopAbs_SOLID, 1);
@@ -1031,6 +1031,7 @@ TopoShape Feature::getTopoShape(const App::DocumentObject* obj,
else if (shape.countSubShapes(TopAbs_VERTEX) == 1)
shape = shape.getSubTopoShape(TopAbs_VERTEX, 1);
}
#endif
Base::Matrix4D topMat;
if (pmat || transform) {
// Obtain top level transformation

167
src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
View File

@@ -931,7 +931,10 @@ class TestTopologicalNamingProblem(unittest.TestCase):
area1 = self.Pad.Shape.Area
# Act
self.Doc.getObject('Sketch').fillet(2,3,App.Vector(6.673934,25.000000,0),App.Vector(0.000000,21.980343,0),4.740471,True,True,False)
self.Doc.getObject('Sketch').fillet(2,3,
App.Vector(6.673934,25.000000,0),
App.Vector(0.000000,21.980343,0),
4.740471,True,True,False)
self.Doc.recompute()
area2 = self.Pad.Shape.Area
@@ -948,21 +951,29 @@ class TestTopologicalNamingProblem(unittest.TestCase):
def testShapeBinder(self):
doc = self.Doc
doc.addObject('PartDesign::Body','TNP_Test_Body_SubShape')
self.Body = doc.addObject('PartDesign::Body', 'TNP_Test_Body_SubShape')
doc.getObject('TNP_Test_Body_SubShape').Label = 'TNP_Test_Body_SubShape'
doc.recompute()
doc.getObject('TNP_Test_Body_SubShape').newObject('Sketcher::SketchObject','Sketch')
doc.Sketch.AttachmentSupport = (doc.getObject('XY_Plane'),[''])
doc.getObject('TNP_Test_Body_SubShape').newObject('Sketcher::SketchObject', 'Sketch')
doc.Sketch.AttachmentSupport = (doc.getObject('XY_Plane'), [''])
doc.Sketch.MapMode = 'FlatFace'
doc.recompute()
geoList = []
geoList.append(Part.LineSegment(App.Vector(0.000000, 0.000000, 0.000000),App.Vector(35.000000, 0.000000, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(35.000000, 0.000000, 0.000000),App.Vector(35.000000, 25.000000, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(35.000000, 25.000000, 0.000000),App.Vector(0.000000, 25.000000, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(0.000000, 25.000000, 0.000000),App.Vector(0.000000, 0.000000, 0.000000)))
doc.Sketch.addGeometry(geoList,False)
geoList.append(
Part.LineSegment(App.Vector(0.000000, 0.000000, 0.000000),
App.Vector(35.000000, 0.000000, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(35.000000, 0.000000, 0.000000),
App.Vector(35.000000, 25.000000, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(35.000000, 25.000000, 0.000000),
App.Vector(0.000000, 25.000000, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(0.000000, 25.000000, 0.000000),
App.Vector(0.000000, 0.000000, 0.000000)))
doc.Sketch.addGeometry(geoList, False)
del geoList
constraintList = []
@@ -977,18 +988,17 @@ class TestTopologicalNamingProblem(unittest.TestCase):
doc.Sketch.addConstraint(constraintList)
del constraintList
doc.Sketch.addConstraint(Sketcher.Constraint('Distance',1,1,3,2,35.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Distance',0,1,2,2,25.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Distance', 1, 1, 3, 2, 35.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Distance', 0, 1, 2, 2, 25.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Coincident', 0, 1, -1, 1))
doc.recompute()
doc.getObject('TNP_Test_Body_SubShape').newObject('PartDesign::Pad','Pad')
doc.getObject('TNP_Test_Body_SubShape').newObject('PartDesign::Pad', 'Pad')
doc.Pad.Profile = doc.Sketch
doc.Pad.Length = 10
doc.recompute()
doc.Pad.ReferenceAxis = (doc.Sketch,['N_Axis'])
doc.Pad.ReferenceAxis = (doc.Sketch, ['N_Axis'])
doc.Sketch.Visibility = False
doc.recompute()
doc.Pad.Length = 10.000000
@@ -1005,28 +1015,30 @@ class TestTopologicalNamingProblem(unittest.TestCase):
doc.recompute()
doc.Sketch.Visibility = False
doc.addObject('PartDesign::Body','TNP_Test_Body_Second')
doc.addObject('PartDesign::Body', 'TNP_Test_Body_Second')
doc.getObject('TNP_Test_Body_Second').Label = 'TNP_Test_Body_Second'
doc.recompute()
obj = doc.getObject('TNP_Test_Body_Second').newObject('PartDesign::ShapeBinder','ShapeBinder')
obj = doc.getObject('TNP_Test_Body_Second').newObject('PartDesign::ShapeBinder', 'ShapeBinder')
obj.Support = (doc.getObject("TNP_Test_Body_SubShape"), [u'Face6'])
doc.recompute()
doc.getObject('TNP_Test_Body_Second').newObject('Sketcher::SketchObject','Sketch001')
doc.getObject('Sketch001').AttachmentSupport = (doc.getObject('ShapeBinder'),[''])
doc.getObject('TNP_Test_Body_Second').newObject('Sketcher::SketchObject', 'Sketch001')
doc.getObject('Sketch001').AttachmentSupport = (doc.getObject('ShapeBinder'), [''])
doc.getObject('Sketch001').MapMode = 'FlatFace'
doc.recompute()
geoList = []
geoList.append(Part.Circle(App.Vector(14.725412, 16.666899, 0.000000), App.Vector(0.000000, 0.000000, 1.000000), 2.162720))
doc.getObject('Sketch001').addGeometry(geoList,False)
geoList.append(
Part.Circle(App.Vector(14.725412, 16.666899, 0.000000),
App.Vector(0.000000, 0.000000, 1.000000), 2.162720))
doc.getObject('Sketch001').addGeometry(geoList, False)
del geoList
doc.recompute()
doc.getObject('TNP_Test_Body_Second').newObject('PartDesign::Pad','Pad001')
doc.getObject('TNP_Test_Body_Second').newObject('PartDesign::Pad', 'Pad001')
doc.getObject('Pad001').Profile = doc.getObject('Sketch001')
doc.getObject('Pad001').Length = 10
doc.recompute()
doc.getObject('Pad001').ReferenceAxis = (doc.getObject('Sketch001'),['N_Axis'])
doc.getObject('Pad001').ReferenceAxis = (doc.getObject('Sketch001'), ['N_Axis'])
doc.getObject('Sketch001').Visibility = False
doc.recompute()
doc.getObject('Pad001').Length = 10.000000
@@ -1045,11 +1057,19 @@ class TestTopologicalNamingProblem(unittest.TestCase):
doc.getObject('Sketch001').Visibility = False
geoList = []
geoList.append(Part.LineSegment(App.Vector(28.380075, 21.486303, 0.000000),App.Vector(28.380075, 15.462212, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(28.380075, 15.462212, 0.000000),App.Vector(32.797741, 15.462212, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(32.797741, 15.462212, 0.000000),App.Vector(32.797741, 21.486303, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(32.797741, 21.486303, 0.000000),App.Vector(28.380075, 21.486303, 0.000000)))
doc.Sketch.addGeometry(geoList,False)
geoList.append(
Part.LineSegment(App.Vector(28.380075, 21.486303, 0.000000),
App.Vector(28.380075, 15.462212, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(28.380075, 15.462212, 0.000000),
App.Vector(32.797741, 15.462212, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(32.797741, 15.462212, 0.000000),
App.Vector(32.797741, 21.486303, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(32.797741, 21.486303, 0.000000),
App.Vector(28.380075, 21.486303, 0.000000)))
doc.Sketch.addGeometry(geoList, False)
del geoList
constraintList = []
@@ -1068,29 +1088,37 @@ class TestTopologicalNamingProblem(unittest.TestCase):
# Assert
if self.Body.Shape.ElementMapVersion == "": # Should be '4' as of Mar 2023.
return
self.assertEqual(self.Body.Shape.BoundBox.XMin,0)
self.assertEqual(self.Body.Shape.BoundBox.YMin,0)
self.assertEqual(self.Body.Shape.BoundBox.ZMin,0)
self.assertEqual(self.Body.Shape.BoundBox.XMax,31.37)
self.assertEqual(self.Body.Shape.BoundBox.YMax,25.2)
self.assertEqual(self.Body.Shape.BoundBox.ZMax,20)
self.assertEqual(self.Body.Shape.BoundBox.XMin, 0)
self.assertEqual(self.Body.Shape.BoundBox.YMin, 0)
self.assertEqual(self.Body.Shape.BoundBox.ZMin, 0)
self.assertEqual(self.Body.Shape.BoundBox.XMax, 31.37)
self.assertEqual(self.Body.Shape.BoundBox.YMax, 25.2)
self.assertEqual(self.Body.Shape.BoundBox.ZMax, 20)
def testSubShapeBinder(self):
doc = self.Doc
doc.addObject('PartDesign::Body','Body')
self.Body = doc.addObject('PartDesign::Body', 'Body')
doc.Body.Label = 'Body'
doc.recompute()
doc.Body.newObject('Sketcher::SketchObject','Sketch')
doc.Sketch.AttachmentSupport = (doc.getObject('XY_Plane'),[''])
doc.Body.newObject('Sketcher::SketchObject', 'Sketch')
doc.Sketch.AttachmentSupport = (doc.getObject('XY_Plane'), [''])
doc.Sketch.MapMode = 'FlatFace'
doc.recompute()
geoList = []
geoList.append(Part.LineSegment(App.Vector(0.000000, 0.000000, 0.000000),App.Vector(35.000000, 0.000000, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(35.000000, 0.000000, 0.000000),App.Vector(35.000000, 25.000000, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(35.000000, 25.000000, 0.000000),App.Vector(0.000000, 25.000000, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(0.000000, 25.000000, 0.000000),App.Vector(0.000000, 0.000000, 0.000000)))
doc.Sketch.addGeometry(geoList,False)
geoList.append(
Part.LineSegment(App.Vector(0.000000, 0.000000, 0.000000),
App.Vector(35.000000, 0.000000, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(35.000000, 0.000000, 0.000000),
App.Vector(35.000000, 25.000000, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(35.000000, 25.000000, 0.000000),
App.Vector(0.000000, 25.000000, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(0.000000, 25.000000, 0.000000),
App.Vector(0.000000, 0.000000, 0.000000)))
doc.Sketch.addGeometry(geoList, False)
del geoList
constraintList = []
@@ -1105,17 +1133,16 @@ class TestTopologicalNamingProblem(unittest.TestCase):
doc.Sketch.addConstraint(constraintList)
del constraintList
doc.Sketch.addConstraint(Sketcher.Constraint('Distance',1,1,3,2,35.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Distance',0,1,2,2,25.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Distance', 1, 1, 3, 2, 35.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Distance', 0, 1, 2, 2, 25.000000))
doc.Sketch.addConstraint(Sketcher.Constraint('Coincident', 0, 1, -1, 1))
doc.recompute()
self.Body.newObject('PartDesign::Pad','Pad')
doc.Body.newObject('PartDesign::Pad', 'Pad')
doc.Pad.Profile = doc.Sketch
doc.Pad.Length = 10
doc.recompute()
doc.Pad.ReferenceAxis = (doc.Sketch,['N_Axis'])
doc.Pad.ReferenceAxis = (doc.Sketch, ['N_Axis'])
doc.Sketch.Visibility = False
doc.Pad.Length = 10.000000
doc.Pad.TaperAngle = 0.000000
@@ -1130,28 +1157,30 @@ class TestTopologicalNamingProblem(unittest.TestCase):
doc.Pad.Offset = 0
doc.recompute()
doc.Sketch.Visibility = False
doc.addObject('PartDesign::Body','Body001')
doc.addObject('PartDesign::Body', 'Body001')
doc.getObject('Body001').Label = 'Body'
doc.recompute()
binder = doc.getObject('Body001').newObject('PartDesign::SubShapeBinder','Binder')
binder = doc.getObject('Body001').newObject('PartDesign::SubShapeBinder', 'Binder')
binder.Support = self.Body
doc.getObject('Body001').newObject('Sketcher::SketchObject','Sketch001')
doc.getObject('Sketch001').AttachmentSupport = (doc.getObject('Binder'),['Face6',])
doc.getObject('Body001').newObject('Sketcher::SketchObject', 'Sketch001')
doc.getObject('Sketch001').AttachmentSupport = (doc.getObject('Binder'), ['Face6', ])
doc.getObject('Sketch001').MapMode = 'FlatFace'
doc.recompute()
geoList = []
geoList.append(Part.Circle(App.Vector(16.566162, 13.537925, 0.000000), App.Vector(0.000000, 0.000000, 1.000000), 2.197371))
doc.getObject('Sketch001').addGeometry(geoList,False)
geoList.append(
Part.Circle(App.Vector(16.566162, 13.537925, 0.000000),
App.Vector(0.000000, 0.000000, 1.000000), 2.197371))
doc.getObject('Sketch001').addGeometry(geoList, False)
del geoList
doc.recompute()
### Begin command PartDesign_Pad
doc.getObject('Body001').newObject('PartDesign::Pad','Pad001')
doc.getObject('Body001').newObject('PartDesign::Pad', 'Pad001')
doc.Pad001.Profile = doc.getObject('Sketch001')
doc.Pad001.Length = 10
doc.recompute()
doc.Pad001.ReferenceAxis = (doc.getObject('Sketch001'),['N_Axis'])
doc.Pad001.ReferenceAxis = (doc.getObject('Sketch001'), ['N_Axis'])
doc.getObject('Sketch001').Visibility = False
doc.recompute()
doc.Pad001.Length = 10.000000
@@ -1170,11 +1199,19 @@ class TestTopologicalNamingProblem(unittest.TestCase):
doc.getObject('Sketch001').Visibility = False
geoList = []
geoList.append(Part.LineSegment(App.Vector(30.009926, 21.026653, 0.000000),App.Vector(30.009926, 16.425089, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(30.009926, 16.425089, 0.000000),App.Vector(31.994911, 16.425089, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(31.994911, 16.425089, 0.000000),App.Vector(31.994911, 21.026653, 0.000000)))
geoList.append(Part.LineSegment(App.Vector(31.994911, 21.026653, 0.000000),App.Vector(30.009926, 21.026653, 0.000000)))
doc.Sketch.addGeometry(geoList,False)
geoList.append(
Part.LineSegment(App.Vector(30.009926, 21.026653, 0.000000),
App.Vector(30.009926, 16.425089, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(30.009926, 16.425089, 0.000000),
App.Vector(31.994911, 16.425089, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(31.994911, 16.425089, 0.000000),
App.Vector(31.994911, 21.026653, 0.000000)))
geoList.append(
Part.LineSegment(App.Vector(31.994911, 21.026653, 0.000000),
App.Vector(30.009926, 21.026653, 0.000000)))
doc.Sketch.addGeometry(geoList, False)
del geoList
constraintList = []
@@ -1193,12 +1230,12 @@ class TestTopologicalNamingProblem(unittest.TestCase):
# Assert
if self.Body.Shape.ElementMapVersion == "": # Should be '4' as of Mar 2023.
return
self.assertEqual(self.Body.Shape.BoundBox.XMin,0)
self.assertEqual(self.Body.Shape.BoundBox.YMin,0)
self.assertEqual(self.Body.Shape.BoundBox.ZMin,0)
self.assertEqual(self.Body.Shape.BoundBox.XMax,31.37)
self.assertEqual(self.Body.Shape.BoundBox.YMax,25.2)
self.assertEqual(self.Body.Shape.BoundBox.ZMax,20)
self.assertEqual(self.Body.Shape.BoundBox.XMin, 0)
self.assertEqual(self.Body.Shape.BoundBox.YMin, 0)
self.assertEqual(self.Body.Shape.BoundBox.ZMin, 0)
self.assertEqual(self.Body.Shape.BoundBox.XMax, 31.37)
self.assertEqual(self.Body.Shape.BoundBox.YMax, 25.2)
self.assertEqual(self.Body.Shape.BoundBox.ZMax, 20)
def create_t_sketch(self):

59
tests/src/Mod/Part/App/TopoShapeExpansion.cpp
View File

@@ -2794,37 +2794,34 @@ TEST_F(TopoShapeExpansionTest, makeElementPrism)
EXPECT_TRUE(PartTestHelpers::boxesMatch(bb, Base::BoundBox3d(0.0, 0.0, 0.0, 0.75, 1.0, 1.0)));
EXPECT_FLOAT_EQ(getVolume(result.getShape()), 0.75);
// Assert elementMap is correct
EXPECT_TRUE(elementsMatch(
result,
{
"Edge1;:G;XTR;:H2:7,F",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:L(Edge2;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E|Edge3;:G;"
"XTR;:H2:7,F;:U;XTR;:H2:7,E|Edge4;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E);XTR;:H2:74,F",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U2;XTR;:H2:8,V",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U;XTR;:H2:7,V",
"Edge1;:H2,E",
"Edge2;:G;XTR;:H2:7,F",
"Edge2;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge2;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U;XTR;:H2:7,V",
"Edge2;:H2,E",
"Edge3;:G;XTR;:H2:7,F",
"Edge3;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge3;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U2;XTR;:H2:8,V",
"Edge3;:H2,E",
"Edge4;:G;XTR;:H2:7,F",
"Edge4;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge4;:H2,E",
"Face1;:H2,F",
"Vertex1;:G;XTR;:H2:7,E",
"Vertex1;:H2,V",
"Vertex2;:G;XTR;:H2:7,E",
"Vertex2;:H2,V",
"Vertex3;:G;XTR;:H2:7,E",
"Vertex3;:H2,V",
"Vertex4;:G;XTR;:H2:7,E",
"Vertex4;:H2,V",
}));
EXPECT_TRUE(elementsMatch(result,
{
"Edge1;:G;XTR;:H2:7,F",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U2;XTR;:H2:8,V",
"Edge1;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U;XTR;:H2:7,V",
"Edge1;:H2,E",
"Edge2;:G;XTR;:H2:7,F",
"Edge2;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge2;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U;XTR;:H2:7,V",
"Edge2;:H2,E",
"Edge3;:G;XTR;:H2:7,F",
"Edge3;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge3;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E;:U2;XTR;:H2:8,V",
"Edge3;:H2,E",
"Edge4;:G;XTR;:H2:7,F",
"Edge4;:G;XTR;:H2:7,F;:U;XTR;:H2:7,E",
"Edge4;:H2,E",
"Face1;:H2,F",
"Vertex1;:G;XTR;:H2:7,E",
"Vertex1;:H2,V",
"Vertex2;:G;XTR;:H2:7,E",
"Vertex2;:H2,V",
"Vertex3;:G;XTR;:H2:7,E",
"Vertex3;:H2,V",
"Vertex4;:G;XTR;:H2:7,E",
"Vertex4;:H2,V",
}));
}
TEST_F(TopoShapeExpansionTest, makeElementPrismUntil)