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

PartDesign: Fix revolution's Toponaming support (#23342)

Browse Source 
* PartDesign: Fix revolution's Toponming support

* fix test
This commit is contained in:
drwho495
2025-09-01 10:56:43 -05:00
committed by GitHub
parent a0a589f018
commit bc72b6e85d
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/FeatureRevolution.cpp
View File

@@ -207,7 +207,7 @@ App::DocumentObjectExecReturn* Revolution::execute()
bool midplane = Midplane.getValue();
bool reversed = Reversed.getValue();
generateRevolution(result,
sketchshape.getShape(),
sketchshape,
gp_Ax1(pnt, dir),
angle,
angle2,

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

@@ -623,30 +623,35 @@ class TestTopologicalNamingProblem(unittest.TestCase):
self.assertEqual(self.countFacesEdgesVertexes(revolution.Shape.ElementReverseMap),
(9, 21, 14))
self.assertEqual( revolution.Shape.ElementReverseMap["Vertex9"][1].count(";"), 3)
self.assertEqual( revolution.Shape.ElementReverseMap["Face9"].count(";"), 14)
self.assertEqual( revolution.Shape.ElementReverseMap["Face9"].count(";"), 19)
### This test has been removed because FeatureRevolution generates improper element maps when the user select the
# UpToFace mode. That behavior seems to be the fault of OpenCASCADE itself, and we need to rewrite that section
# before re-enabling this test.
# Arrange for an UpToFace mode test
revolution.Type = 3
revolution.UpToFace = (pad, ("Face4"))
revolution.Reversed = 1
revolution.Midplane = 0
volume = (math.pi * 3 * 3 - math.pi * 2 * 2) * 2 / 4 * 3
# Act
self.Doc.recompute()
# Assert UpToFace shape is correct
self.assertAlmostEqual(revolution.Shape.Volume, volume + padVolume)
# Assert UpToFace element map is correct
self.assertEqual(self.countFacesEdgesVertexes(revolution.Shape.ElementReverseMap),
(8, 18, 12))
# Assertions modified/added while reviewing PR#17119 by CalligaroV
# Previously the condition counted the number of ";" (element map operations prefix)
# If the number of operations changes then the number of ";" will change accordingly
#
# However, it is more useful to count the number of times an element name is
# present in the MappedName of an element (a MappedName is defined also using the
# element names - "Vertex*", "Edge*", "Face*" - used by an OCCT operation to generate
# output elements)
self.assertEqual( revolution.Shape.ElementReverseMap["Face8"].count("Face8"), 3)
self.assertEqual( revolution.Shape.ElementReverseMap["Face8"].count("Face10"), 3)
# revolution.Type = 3
# revolution.UpToFace = (pad, ("Face4"))
# revolution.Reversed = 1
# revolution.Midplane = 0
# volume = (math.pi * 3 * 3 - math.pi * 2 * 2) * 2 / 4 * 3
# # Act
# self.Doc.recompute()
# # Assert UpToFace shape is correct
# self.assertAlmostEqual(revolution.Shape.Volume, volume + padVolume)
# # Assert UpToFace element map is correct
# self.assertEqual(self.countFacesEdgesVertexes(revolution.Shape.ElementReverseMap),
# (8, 18, 12))
# # Assertions modified/added while reviewing PR#17119 by CalligaroV
# # Previously the condition counted the number of ";" (element map operations prefix)
# # If the number of operations changes then the number of ";" will change accordingly
# #
# # However, it is more useful to count the number of times an element name is
# # present in the MappedName of an element (a MappedName is defined also using the
# # element names - "Vertex*", "Edge*", "Face*" - used by an OCCT operation to generate
# # output elements)
# self.assertEqual( revolution.Shape.ElementReverseMap["Face8"].count("Face8"), 3)
# self.assertEqual( revolution.Shape.ElementReverseMap["Face8"].count("Face10"), 3)
def testPartDesignBinderRevolution(self):
doc = self.Doc