From ebce006a9ba80eab34d5b9e16fab6979fc091a02 Mon Sep 17 00:00:00 2001 From: Clarisse GENRAULT - DEN/DANS/DM2S/STMF/LGLS - 2012/10/01 Date: Thu, 14 Mar 2019 15:20:36 +0100 Subject: [PATCH] Renaming Fill in Split : Unit tests --- src/CollectionPlugin/Test/TestGroupMove06.py | 12 +-- src/CollectionPlugin/Test/TestGroupMove20.py | 10 +-- src/FeaturesPlugin/CMakeLists.txt | 82 +++++++++---------- src/FeaturesPlugin/Test/Test2394.py | 62 +++++++------- src/FeaturesPlugin/Test/Test2419_1.py | 14 ++-- src/FeaturesPlugin/Test/Test2419_2.py | 16 ++-- src/FeaturesPlugin/Test/Test2419_3.py | 16 ++-- src/FeaturesPlugin/Test/Test2636.py | 26 +++--- src/FeaturesPlugin/Test/Test2751.py | 2 +- ...TestBooleanFill.py => TestBooleanSplit.py} | 4 +- ...hPlane.py => TestBooleanSplitWithPlane.py} | 18 ++-- ...rorMsg.py => TestBooleanSplit_ErrorMsg.py} | 6 +- ...illSolidEdge.py => TestScriptSolidEdge.py} | 6 +- ...FaceSolid.py => TestSplitCompFaceSolid.py} | 8 +- ...lidPlane.py => TestSplitCompsolidPlane.py} | 16 ++-- ...stFillEdgeEdge.py => TestSplitEdgeEdge.py} | 6 +- ...ted.py => TestSplitEdgeEdgeIntersected.py} | 6 +- ...stFillEdgeFace.py => TestSplitEdgeFace.py} | 6 +- ...FillEdgeShell.py => TestSplitEdgeShell.py} | 6 +- ...FillEdgeSolid.py => TestSplitEdgeSolid.py} | 6 +- ...ed.py => TestSplitEdgeSolidIntersected.py} | 6 +- ...llEdgeVertex.py => TestSplitEdgeVertex.py} | 6 +- ...stFillEdgeWire.py => TestSplitEdgeWire.py} | 6 +- ...stFillFaceEdge.py => TestSplitFaceEdge.py} | 6 +- ...geInside.py => TestSplitFaceEdgeInside.py} | 6 +- ...r.py => TestSplitFaceEdgePerpendicular.py} | 6 +- ...stFillFaceFace.py => TestSplitFaceFace.py} | 6 +- ...FillFaceShell.py => TestSplitFaceShell.py} | 6 +- ...FillFaceSolid.py => TestSplitFaceSolid.py} | 6 +- ...llFaceVertex.py => TestSplitFaceVertex.py} | 6 +- ...stFillFaceWire.py => TestSplitFaceWire.py} | 6 +- ...rPlane.py => TestSplitShellConstrPlane.py} | 6 +- ...FillShellEdge.py => TestSplitShellEdge.py} | 6 +- ...FillShellFace.py => TestSplitShellFace.py} | 6 +- ...llShellShell.py => TestSplitShellShell.py} | 6 +- ...llShellSolid.py => TestSplitShellSolid.py} | 10 +-- ...ShellVertex.py => TestSplitShellVertex.py} | 6 +- ...FillShellWire.py => TestSplitShellWire.py} | 6 +- ...y => TestSplitSolid2ConstructionPlanes.py} | 6 +- ...dCompFace.py => TestSplitSolidCompFace.py} | 8 +- ...ompShell.py => TestSplitSolidCompShell.py} | 10 +-- ...FillSolidFace.py => TestSplitSolidFace.py} | 6 +- ...llSolidShell.py => TestSplitSolidShell.py} | 10 +-- ...stFillWireEdge.py => TestSplitWireEdge.py} | 6 +- ...stFillWireFace.py => TestSplitWireFace.py} | 6 +- ...FillWireShell.py => TestSplitWireShell.py} | 6 +- ...FillWireSolid.py => TestSplitWireSolid.py} | 6 +- ...llWireVertex.py => TestSplitWireVertex.py} | 6 +- ...stFillWireWire.py => TestSplitWireWire.py} | 6 +- src/ModelAPI/Test/Test2401.py | 6 +- 50 files changed, 261 insertions(+), 261 deletions(-) rename src/FeaturesPlugin/Test/{TestBooleanFill.py => TestBooleanSplit.py} (90%) rename src/FeaturesPlugin/Test/{TestBooleanFillWithPlane.py => TestBooleanSplitWithPlane.py} (85%) rename src/FeaturesPlugin/Test/{TestBooleanFill_ErrorMsg.py => TestBooleanSplit_ErrorMsg.py} (93%) rename src/FeaturesPlugin/Test/{TestFillSolidEdge.py => TestScriptSolidEdge.py} (88%) rename src/FeaturesPlugin/Test/{TestFillCompFaceSolid.py => TestSplitCompFaceSolid.py} (89%) rename src/FeaturesPlugin/Test/{TestFillCompsolidPlane.py => TestSplitCompsolidPlane.py} (76%) rename src/FeaturesPlugin/Test/{TestFillEdgeEdge.py => TestSplitEdgeEdge.py} (89%) rename src/FeaturesPlugin/Test/{TestFillEdgeEdgeIntersected.py => TestSplitEdgeEdgeIntersected.py} (87%) rename src/FeaturesPlugin/Test/{TestFillEdgeFace.py => TestSplitEdgeFace.py} (91%) rename src/FeaturesPlugin/Test/{TestFillEdgeShell.py => TestSplitEdgeShell.py} (92%) rename src/FeaturesPlugin/Test/{TestFillEdgeSolid.py => TestSplitEdgeSolid.py} (88%) rename src/FeaturesPlugin/Test/{TestFillEdgeSolidIntersected.py => TestSplitEdgeSolidIntersected.py} (89%) rename src/FeaturesPlugin/Test/{TestFillEdgeVertex.py => TestSplitEdgeVertex.py} (88%) rename src/FeaturesPlugin/Test/{TestFillEdgeWire.py => TestSplitEdgeWire.py} (91%) rename src/FeaturesPlugin/Test/{TestFillFaceEdge.py => TestSplitFaceEdge.py} (92%) rename src/FeaturesPlugin/Test/{TestFillFaceEdgeInside.py => TestSplitFaceEdgeInside.py} (92%) rename src/FeaturesPlugin/Test/{TestFillFaceEdgePerpendicular.py => TestSplitFaceEdgePerpendicular.py} (93%) rename src/FeaturesPlugin/Test/{TestFillFaceFace.py => TestSplitFaceFace.py} (94%) rename src/FeaturesPlugin/Test/{TestFillFaceShell.py => TestSplitFaceShell.py} (96%) rename src/FeaturesPlugin/Test/{TestFillFaceSolid.py => TestSplitFaceSolid.py} (92%) rename src/FeaturesPlugin/Test/{TestFillFaceVertex.py => TestSplitFaceVertex.py} (92%) rename src/FeaturesPlugin/Test/{TestFillFaceWire.py => TestSplitFaceWire.py} (93%) rename src/FeaturesPlugin/Test/{TestFillShellConstrPlane.py => TestSplitShellConstrPlane.py} (91%) rename src/FeaturesPlugin/Test/{TestFillShellEdge.py => TestSplitShellEdge.py} (92%) rename src/FeaturesPlugin/Test/{TestFillShellFace.py => TestSplitShellFace.py} (96%) rename src/FeaturesPlugin/Test/{TestFillShellShell.py => TestSplitShellShell.py} (96%) rename src/FeaturesPlugin/Test/{TestFillShellSolid.py => TestSplitShellSolid.py} (86%) rename src/FeaturesPlugin/Test/{TestFillShellVertex.py => TestSplitShellVertex.py} (91%) rename src/FeaturesPlugin/Test/{TestFillShellWire.py => TestSplitShellWire.py} (95%) rename src/FeaturesPlugin/Test/{TestFillSolid2ConstructionPlanes.py => TestSplitSolid2ConstructionPlanes.py} (81%) rename src/FeaturesPlugin/Test/{TestFillSolidCompFace.py => TestSplitSolidCompFace.py} (89%) rename src/FeaturesPlugin/Test/{TestFillSolidCompShell.py => TestSplitSolidCompShell.py} (87%) rename src/FeaturesPlugin/Test/{TestFillSolidFace.py => TestSplitSolidFace.py} (92%) rename src/FeaturesPlugin/Test/{TestFillSolidShell.py => TestSplitSolidShell.py} (86%) rename src/FeaturesPlugin/Test/{TestFillWireEdge.py => TestSplitWireEdge.py} (91%) rename src/FeaturesPlugin/Test/{TestFillWireFace.py => TestSplitWireFace.py} (94%) rename src/FeaturesPlugin/Test/{TestFillWireShell.py => TestSplitWireShell.py} (96%) rename src/FeaturesPlugin/Test/{TestFillWireSolid.py => TestSplitWireSolid.py} (92%) rename src/FeaturesPlugin/Test/{TestFillWireVertex.py => TestSplitWireVertex.py} (91%) rename src/FeaturesPlugin/Test/{TestFillWireWire.py => TestSplitWireWire.py} (94%) diff --git a/src/CollectionPlugin/Test/TestGroupMove06.py b/src/CollectionPlugin/Test/TestGroupMove06.py index c3f79ffb8..362876a21 100644 --- a/src/CollectionPlugin/Test/TestGroupMove06.py +++ b/src/CollectionPlugin/Test/TestGroupMove06.py @@ -18,7 +18,7 @@ # # Test of deep nested results history. -# Copied boxes are involved to Fill operation. +# Copied boxes are involved to Split operation. # Check the groups of initial boxes moved to the end contain the corresponding # results, but divided. @@ -42,10 +42,10 @@ Group_5 = model.addGroup(Part_1_doc, Group_5_objects) Group_6_objects = [model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Back][LinearCopy_1_1_2/MF:Translated&Box_1_1/Bottom]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Back][LinearCopy_1_1_2/MF:Translated&Box_1_1/Right]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Back][LinearCopy_1_1_2/MF:Translated&Box_1_1/Left]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Back][LinearCopy_1_1_2/MF:Translated&Box_1_1/Top]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Right][LinearCopy_1_1_2/MF:Translated&Box_1_1/Bottom]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Left][LinearCopy_1_1_2/MF:Translated&Box_1_1/Top]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Left][LinearCopy_1_1_2/MF:Translated&Box_1_1/Bottom]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Right][LinearCopy_1_1_2/MF:Translated&Box_1_1/Top]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Front][LinearCopy_1_1_2/MF:Translated&Box_1_1/Bottom]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Front][LinearCopy_1_1_2/MF:Translated&Box_1_1/Left]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Front][LinearCopy_1_1_2/MF:Translated&Box_1_1/Right]"), model.selection("EDGE", "[LinearCopy_1_1_2/MF:Translated&Box_1_1/Front][LinearCopy_1_1_2/MF:Translated&Box_1_1/Top]")] Group_6 = model.addGroup(Part_1_doc, Group_6_objects) Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "LinearCopy_1_1_1/MF:Translated&Box_1_1/Left"), model.selection("FACE", "LinearCopy_1_1_1/MF:Translated&Box_1_1/Right")) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "LinearCopy_1_1_1")], [model.selection("SOLID", "LinearCopy_1_1_2"), model.selection("FACE", "Plane_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "LinearCopy_1_1_1")], [model.selection("SOLID", "LinearCopy_1_1_2"), model.selection("FACE", "Plane_1")]) model.do() # move groups to the end -Part_1_doc.moveFeature(Group_1.feature(), Fill_1.feature()) +Part_1_doc.moveFeature(Group_1.feature(), Split_1.feature()) Part_1_doc.moveFeature(Group_2.feature(), Group_1.feature()) Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) Part_1_doc.moveFeature(Group_4.feature(), Group_3.feature()) @@ -85,11 +85,11 @@ assert(aFactory.validate(Group_6.feature())) model.begin() -Filling_1 = model.addFilling(Part_1_doc, [model.selection("EDGE", "Fill_1_1_2/Generated_Edge&Plane_1/Plane_1&Box_1_1/Top"), model.selection("EDGE", "[Fill_1_1_2/Modified_Face&Box_1_1/Right][(Fill_1_1_2/Modified_Face&Box_1_1/Right)(Fill_1_1_2/Modified_Face&Plane_1/Plane_1)(Fill_1_1_2/Modified_Face&Box_1_1/Front)(Fill_1_1_2/Modified_Face&Box_1_1/Top)2(Fill_1_1_2/Modified_Face&Box_1_1/Left)2]")]) -Fill_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Fill_1_1_2")], [model.selection("FACE", "Filling_1_1")]) +Filling_1 = model.addFilling(Part_1_doc, [model.selection("EDGE", "Split_1_1_2/Generated_Edge&Plane_1/Plane_1&Box_1_1/Top"), model.selection("EDGE", "[Split_1_1_2/Modified_Face&Box_1_1/Right][(Split_1_1_2/Modified_Face&Box_1_1/Right)(Split_1_1_2/Modified_Face&Plane_1/Plane_1)(Split_1_1_2/Modified_Face&Box_1_1/Front)(Split_1_1_2/Modified_Face&Box_1_1/Top)2(Split_1_1_2/Modified_Face&Box_1_1/Left)2]")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Split_1_1_2")], [model.selection("FACE", "Filling_1_1")]) model.do() # move groups to the end once again -Part_1_doc.moveFeature(Group_1.feature(), Fill_2.feature()) +Part_1_doc.moveFeature(Group_1.feature(), Split_2.feature()) Part_1_doc.moveFeature(Group_2.feature(), Group_1.feature()) Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) Part_1_doc.moveFeature(Group_4.feature(), Group_3.feature()) diff --git a/src/CollectionPlugin/Test/TestGroupMove20.py b/src/CollectionPlugin/Test/TestGroupMove20.py index 9726cd6b4..46982ef00 100644 --- a/src/CollectionPlugin/Test/TestGroupMove20.py +++ b/src/CollectionPlugin/Test/TestGroupMove20.py @@ -18,7 +18,7 @@ # # Test based on DBC mail 04.03.2019. If the selected solid was not modified by -# the following Fill operation, this selection disappears after movement to the end. +# the following Split operation, this selection disappears after movement to the end. from GeomAPI import * from ModelAPI import * @@ -31,13 +31,13 @@ Part_1_doc = Part_1.document() Box_1 = model.addBox(Part_1_doc, 10, 10, 10) Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Front"), 2, True) Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Front"), 7, True) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("FACE", "Plane_2")]) -Group_1 = model.addGroup(Part_1_doc, [model.selection("SOLID", "Fill_1_1_1")]) -Fill_2 = model.addFill(Part_1_doc, [model.selection("COMPSOLID", "Fill_1_1")], [model.selection("FACE", "Plane_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("FACE", "Plane_2")]) +Group_1 = model.addGroup(Part_1_doc, [model.selection("SOLID", "Split_1_1_1")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("COMPSOLID", "Split_1_1")], [model.selection("FACE", "Plane_1")]) model.do() # move group -Part_1_doc.moveFeature(Group_1.feature(), Fill_2.feature()) +Part_1_doc.moveFeature(Group_1.feature(), Split_2.feature()) model.end() # Check group: result must be four faces diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index 27115310a..e2f94dca0 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -217,9 +217,9 @@ ADD_UNIT_TESTS(TestExtrusion.py TestBoolean3.py TestBooleanCompSolids.py TestBooleanSmash.py - TestBooleanFill.py - TestBooleanFillWithPlane.py - TestBooleanFill_ErrorMsg.py + TestBooleanSplit.py + TestBooleanSplitWithPlane.py + TestBooleanSplit_ErrorMsg.py TestMultiBoolean.py TestSerialBoolean.py TestBoolean_ErrorMsg.py @@ -241,43 +241,43 @@ ADD_UNIT_TESTS(TestExtrusion.py TestPipe_ErrorMsg.py TestRecover.py TestRecover1798.py - TestFillEdgeVertex.py - TestFillEdgeEdge.py - TestFillEdgeEdgeIntersected.py - TestFillEdgeWire.py - TestFillEdgeFace.py - TestFillEdgeShell.py - TestFillEdgeSolid.py - TestFillEdgeSolidIntersected.py - TestFillWireVertex.py - TestFillWireEdge.py - TestFillWireWire.py - TestFillWireFace.py - TestFillWireShell.py - TestFillWireSolid.py - TestFillFaceVertex.py - TestFillFaceEdge.py - TestFillFaceEdgeInside.py - TestFillFaceEdgePerpendicular.py - TestFillFaceWire.py - TestFillFaceFace.py - TestFillFaceShell.py - TestFillFaceSolid.py - TestFillCompFaceSolid.py - TestFillShellVertex.py - TestFillShellEdge.py - TestFillShellConstrPlane.py - TestFillShellWire.py - TestFillShellFace.py - TestFillShellShell.py - TestFillShellSolid.py - TestFillSolid2ConstructionPlanes.py - TestFillSolidEdge.py - TestFillSolidFace.py - TestFillSolidCompFace.py - TestFillSolidShell.py - TestFillSolidCompShell.py - TestFillCompsolidPlane.py + TestSplitEdgeVertex.py + TestSplitEdgeEdge.py + TestSplitEdgeEdgeIntersected.py + TestSplitEdgeWire.py + TestSplitEdgeFace.py + TestSplitEdgeShell.py + TestSplitEdgeSolid.py + TestSplitEdgeSolidIntersected.py + TestSplitWireVertex.py + TestSplitWireEdge.py + TestSplitWireWire.py + TestSplitWireFace.py + TestSplitWireShell.py + TestSplitWireSolid.py + TestSplitFaceVertex.py + TestSplitFaceEdge.py + TestSplitFaceEdgeInside.py + TestSplitFaceEdgePerpendicular.py + TestSplitFaceWire.py + TestSplitFaceFace.py + TestSplitFaceShell.py + TestSplitFaceSolid.py + TestSplitCompFaceSolid.py + TestSplitShellVertex.py + TestSplitShellEdge.py + TestSplitShellConstrPlane.py + TestSplitShellWire.py + TestSplitShellFace.py + TestSplitShellShell.py + TestSplitShellSolid.py + TestSplitSolid2ConstructionPlanes.py + TestSplitSolidEdge.py + TestSplitSolidFace.py + TestSplitSolidCompFace.py + TestSplitSolidShell.py + TestSplitSolidCompShell.py + TestSplitCompsolidPlane.py TestPartition2Faces.py TestPartition2Solids.py TestPartition2Wires.py @@ -299,7 +299,7 @@ ADD_UNIT_TESTS(TestExtrusion.py TestMeasurementAngle3Points.py TestMeasurementPresentation.py TestFusionFaces.py - TestFusionFaces2697.py + TestFusionFaces2697.py Test1379.py Test1922.py Test1942.py diff --git a/src/FeaturesPlugin/Test/Test2394.py b/src/FeaturesPlugin/Test/Test2394.py index 8c4def393..1aeafcd3a 100644 --- a/src/FeaturesPlugin/Test/Test2394.py +++ b/src/FeaturesPlugin/Test/Test2394.py @@ -80,25 +80,25 @@ SketchProjection_4 = Sketch_2.addProjection(model.selection("EDGE", "[Revolution SketchLine_9 = SketchProjection_4.createdFeature() SketchConstraintCoincidence_12 = Sketch_2.setCoincident(SketchLine_4.startPoint(), SketchLine_9.result()) Extrusion_1.setNestedSketch(Sketch_2) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Revolution_1_1")], [model.selection("SOLID", "Extrusion_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Revolution_1_1")], [model.selection("SOLID", "Extrusion_1_1")]) Point_2 = model.addPoint(Part_1_doc, "x", "y", "-z") -Axis_4 = model.addAxis(Part_1_doc, model.selection("VERTEX", "Point_1"), model.selection("VERTEX", "[Fill_1_1_2/Modified_Face&Sketch_2/SketchLine_5&Revolution_1_1/To_Face][Fill_1_1_2/Modified_Face&Sketch_2/SketchLine_4&Revolution_1_1/From_Face][Fill_1_1_2/Modified_Face&Extrusion_1_1/To_Face&Sketch_1/SketchLine_3]")) +Axis_4 = model.addAxis(Part_1_doc, model.selection("VERTEX", "Point_1"), model.selection("VERTEX", "[Split_1_1_2/Modified_Face&Sketch_2/SketchLine_5&Revolution_1_1/To_Face][Split_1_1_2/Modified_Face&Sketch_2/SketchLine_4&Revolution_1_1/From_Face][Split_1_1_2/Modified_Face&Extrusion_1_1/To_Face&Sketch_1/SketchLine_3]")) Plane_4 = model.addPlane(Part_1_doc, model.selection("EDGE", "Axis_1"), model.selection("VERTEX", "Point_1"), True) Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Plane_1"), "haut_ext_tuyau", True) Plane_5.result().setName("Plane_2 arrivee tuyau") Plane_6 = model.addPlane(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_6"), model.selection("EDGE", "[Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_6][Extrusion_1_1/From_Face]"), 45) Plane_7 = model.addPlane(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_7"), model.selection("EDGE", "[Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_7][Extrusion_1_1/From_Face]"), 45) Plane_8 = model.addPlane(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_7"), model.selection("EDGE", "[Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_6][Extrusion_1_1/Generated_Face&Sketch_2/SketchLine_7]"), "90+45") -Fill_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Fill_1_1_1")], [model.selection("FACE", "Plane_5")]) -Fill_3 = model.addFill(Part_1_doc, [model.selection("SOLID", "Fill_2_1_2")], [model.selection("FACE", "Plane_3")]) -Fill_4 = model.addFill(Part_1_doc, [model.selection("SOLID", "Fill_3_1_2")], [model.selection("FACE", "Plane_4")]) -Fill_4.result().setColor(102, 51, 51) -Fill_4.result().subResult(0).setColor(153, 153, 76) -Fill_4.result().subResult(1).setColor(0, 204, 204) -Fill_4.result().subResult(2).setColor(51, 51, 102) -Fill_4.result().subResult(3).setColor(102, 204, 102) -Fill_4.result().subResult(4).setColor(204, 204, 0) -Union_1 = model.addUnion(Part_1_doc, [model.selection("SOLID", "Fill_4_1_4"), model.selection("SOLID", "Fill_4_1_2")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Split_1_1_1")], [model.selection("FACE", "Plane_5")]) +Split_3 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Split_2_1_2")], [model.selection("FACE", "Plane_3")]) +Split_4 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Split_3_1_2")], [model.selection("FACE", "Plane_4")]) +Split_4.result().setColor(102, 51, 51) +Split_4.result().subResult(0).setColor(153, 153, 76) +Split_4.result().subResult(1).setColor(0, 204, 204) +Split_4.result().subResult(2).setColor(51, 51, 102) +Split_4.result().subResult(3).setColor(102, 204, 102) +Split_4.result().subResult(4).setColor(204, 204, 0) +Union_1 = model.addUnion(Part_1_doc, [model.selection("SOLID", "Split_4_1_4"), model.selection("SOLID", "Split_4_1_2")]) Point_3 = model.addPoint(Part_1_doc, model.selection("EDGE", "Axis_1"), model.selection("FACE", "Plane_2 arrivee tuyau")) Sketch_3 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_2 arrivee tuyau")) SketchProjection_5 = Sketch_3.addProjection(model.selection("VERTEX", "Point_2"), False) @@ -167,25 +167,25 @@ Plane_13 = model.addPlane(Part_1_doc, model.selection("FACE", "Recover_1_1/Modif Plane_14 = model.addPlane(Part_1_doc, model.selection("FACE", "Recover_1_1/Modified_Face&Sketch_3/SketchLine_13"), model.selection("EDGE", "[Recover_1_1/Modified_Face&Sketch_3/SketchLine_13][Recover_1_1/Modified_Face&Extrusion_3_1/To_Face]"), "90+45") Plane_15 = model.addPlane(Part_1_doc, model.selection("FACE", "Recover_1_1/Modified_Face&Sketch_3/SketchLine_12"), model.selection("EDGE", "[Recover_1_1/Modified_Face&Sketch_3/SketchLine_12][Recover_1_1/Modified_Face&Extrusion_3_1/To_Face]"), "90+45") Plane_16 = model.addPlane(Part_1_doc, model.selection("FACE", "Recover_1_1/Modified_Face&Extrusion_3_1/To_Face"), model.selection("EDGE", "[Recover_1_1/Modified_Face&Sketch_3/SketchLine_11][Recover_1_1/Modified_Face&Extrusion_3_1/To_Face]"), 45) -Fill_5_objects_2 = [model.selection("FACE", "Plane_6"), model.selection("FACE", "Plane_7"), model.selection("FACE", "Plane_8"), model.selection("FACE", "Plane_9"), model.selection("FACE", "Plane_10"), model.selection("FACE", "Plane_11"), model.selection("FACE", "Plane_12"), model.selection("FACE", "Plane_13")] -Fill_5 = model.addFill(Part_1_doc, [model.selection("SOLID", "demi-sphere")], Fill_5_objects_2) -Fill_5.result().subResult(0).setName("Fill_5_1_1") -Fill_5.result().subResult(1).setName("Fill_5_1_2") -Fill_5.result().subResult(2).setName("Fill_5_1_3") -Fill_5.result().subResult(3).setName("Fill_5_1_4") -Fill_5.result().subResult(4).setName("Fill_5_1_5") -Fill_5.result().subResult(5).setName("Fill_5_1_6") -Fill_5.result().subResult(6).setName("Fill_5_1_7") -Fill_5.result().subResult(7).setName("Fill_5_1_8") -Fill_5.result().subResult(8).setName("Fill_5_1_9") -Fill_5.result().subResult(9).setName("Fill_5_1_10") -Fill_5.result().subResult(10).setName("Fill_5_1_11") -Fill_5.result().subResult(11).setName("Fill_5_1_12") -Fill_5.result().subResult(12).setName("Fill_5_1_13") -Fill_5.result().subResult(13).setName("Fill_5_1_14") -Fill_5.result().subResult(14).setName("Fill_5_1_15") -Fill_5.result().subResult(15).setName("Fill_5_1_16") -Union_2_objects = [model.selection("SOLID", "Fill_5_1_14"), model.selection("SOLID", "Fill_5_1_15"), model.selection("SOLID", "Fill_5_1_16")] +Split_5_objects_2 = [model.selection("FACE", "Plane_6"), model.selection("FACE", "Plane_7"), model.selection("FACE", "Plane_8"), model.selection("FACE", "Plane_9"), model.selection("FACE", "Plane_10"), model.selection("FACE", "Plane_11"), model.selection("FACE", "Plane_12"), model.selection("FACE", "Plane_13")] +Split_5 = model.addSplit(Part_1_doc, [model.selection("SOLID", "demi-sphere")], Split_5_objects_2) +Split_5.result().subResult(0).setName("Split_5_1_1") +Split_5.result().subResult(1).setName("Split_5_1_2") +Split_5.result().subResult(2).setName("Split_5_1_3") +Split_5.result().subResult(3).setName("Split_5_1_4") +Split_5.result().subResult(4).setName("Split_5_1_5") +Split_5.result().subResult(5).setName("Split_5_1_6") +Split_5.result().subResult(6).setName("Split_5_1_7") +Split_5.result().subResult(7).setName("Split_5_1_8") +Split_5.result().subResult(8).setName("Split_5_1_9") +Split_5.result().subResult(9).setName("Split_5_1_10") +Split_5.result().subResult(10).setName("Split_5_1_11") +Split_5.result().subResult(11).setName("Split_5_1_12") +Split_5.result().subResult(12).setName("Split_5_1_13") +Split_5.result().subResult(13).setName("Split_5_1_14") +Split_5.result().subResult(14).setName("Split_5_1_15") +Split_5.result().subResult(15).setName("Split_5_1_16") +Union_2_objects = [model.selection("SOLID", "Split_5_1_14"), model.selection("SOLID", "Split_5_1_15"), model.selection("SOLID", "Split_5_1_16")] Union_2 = model.addUnion(Part_1_doc, Union_2_objects) Union_2.result().subResult(0).setName("Union_2_1_1") Union_2.result().subResult(1).setName("Union_2_1_2") diff --git a/src/FeaturesPlugin/Test/Test2419_1.py b/src/FeaturesPlugin/Test/Test2419_1.py index f65834577..4e95e9f40 100644 --- a/src/FeaturesPlugin/Test/Test2419_1.py +++ b/src/FeaturesPlugin/Test/Test2419_1.py @@ -110,17 +110,17 @@ Face_2.setName("Face_5") Face_2.result().setName("Face_5_1") LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("FACE", "Face_5_1")], model.selection("EDGE", "Sketch_1/SketchLine_9"), 10, 2) LinearCopy_1.result().setName("LinearCopy") -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("COMPOUND", "LinearCopy")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("COMPOUND", "LinearCopy")]) model.do() model.end() from GeomAPI import GeomAPI_Shape -model.testNbResults(Fill_1, 1) -model.testNbSubResults(Fill_1, [3]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.SOLID, [0]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.FACE, [3]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.EDGE, [20]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.VERTEX, [40]) +model.testNbResults(Split_1, 1) +model.testNbSubResults(Split_1, [3]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.SOLID, [0]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.FACE, [3]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.EDGE, [20]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.VERTEX, [40]) assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/Test2419_2.py b/src/FeaturesPlugin/Test/Test2419_2.py index 4aa76fd6e..e474db6fa 100644 --- a/src/FeaturesPlugin/Test/Test2419_2.py +++ b/src/FeaturesPlugin/Test/Test2419_2.py @@ -148,18 +148,18 @@ Recover_4 = model.addRecover(Part_1_doc, LinearCopy_1, [Face_5.result()]) Translation_4 = model.addTranslation(Part_1_doc, [model.selection("FACE", "Recover_4_1")], model.selection("VERTEX", "Sketch_1/SketchLine_7_EndVertex"), model.selection("VERTEX", "Sketch_1/SketchLine_1_StartVertex")) LinearCopy_5 = model.addMultiTranslation(Part_1_doc, [model.selection("FACE", "Translation_4_1")], model.selection("EDGE", "PartSet/OX"), "length_assemblage", 2) Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) -Fill_1_objects_2 = [model.selection("FACE", "Face_3_1"), model.selection("FACE", "Face_3_2"), model.selection("FACE", "Face_3_3"), model.selection("FACE", "Face_3_4"), model.selection("FACE", "Face_3_5"), model.selection("FACE", "Face_3_6"), model.selection("FACE", "Face_3_7"), model.selection("FACE", "Face_3_8"), model.selection("FACE", "Face_3_9"), model.selection("FACE", "Face_3_10"), model.selection("FACE", "Face_3_11"), model.selection("FACE", "Face_3_12"), model.selection("FACE", "Face_4_1"), model.selection("COMPOUND", "LinearCopy_1_1"), model.selection("COMPOUND", "LinearCopy_2_1"), model.selection("COMPOUND", "LinearCopy_3_1"), model.selection("COMPOUND", "LinearCopy_4_1"), model.selection("COMPOUND", "LinearCopy_5_1")] -Fill_1 = model.addFill(Part_1_doc, [model.selection("COMPOUND", "Partition_1_1")], Fill_1_objects_2) +Split_1_objects_2 = [model.selection("FACE", "Face_3_1"), model.selection("FACE", "Face_3_2"), model.selection("FACE", "Face_3_3"), model.selection("FACE", "Face_3_4"), model.selection("FACE", "Face_3_5"), model.selection("FACE", "Face_3_6"), model.selection("FACE", "Face_3_7"), model.selection("FACE", "Face_3_8"), model.selection("FACE", "Face_3_9"), model.selection("FACE", "Face_3_10"), model.selection("FACE", "Face_3_11"), model.selection("FACE", "Face_3_12"), model.selection("FACE", "Face_4_1"), model.selection("COMPOUND", "LinearCopy_1_1"), model.selection("COMPOUND", "LinearCopy_2_1"), model.selection("COMPOUND", "LinearCopy_3_1"), model.selection("COMPOUND", "LinearCopy_4_1"), model.selection("COMPOUND", "LinearCopy_5_1")] +Split_1 = model.addSplit(Part_1_doc, [model.selection("COMPOUND", "Partition_1_1")], Split_1_objects_2) model.do() model.end() from GeomAPI import GeomAPI_Shape -model.testNbResults(Fill_1, 1) -model.testNbSubResults(Fill_1, [60]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.SOLID, [0]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.FACE, [60]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.EDGE, [273]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.VERTEX, [546]) +model.testNbResults(Split_1, 1) +model.testNbSubResults(Split_1, [60]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.SOLID, [0]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.FACE, [60]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.EDGE, [273]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.VERTEX, [546]) assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/Test2419_3.py b/src/FeaturesPlugin/Test/Test2419_3.py index 9ddfe5e97..c26b78c5e 100644 --- a/src/FeaturesPlugin/Test/Test2419_3.py +++ b/src/FeaturesPlugin/Test/Test2419_3.py @@ -148,18 +148,18 @@ Recover_4 = model.addRecover(Part_1_doc, LinearCopy_1, [Face_5.result()]) Translation_4 = model.addTranslation(Part_1_doc, [model.selection("FACE", "Recover_4_1")], model.selection("VERTEX", "Sketch_1/SketchLine_7_EndVertex"), model.selection("VERTEX", "Sketch_1/SketchLine_1_StartVertex")) LinearCopy_5 = model.addMultiTranslation(Part_1_doc, [model.selection("FACE", "Translation_4_1")], model.selection("EDGE", "PartSet/OX"), "length_assemblage", 2) Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) -Fill_1_objects_2 = [model.selection("FACE", "Face_3_1"), model.selection("FACE", "Face_3_2"), model.selection("FACE", "Face_3_3"), model.selection("FACE", "Face_3_4"), model.selection("FACE", "Face_3_5"), model.selection("FACE", "Face_3_6"), model.selection("FACE", "Face_3_7"), model.selection("FACE", "Face_3_8"), model.selection("FACE", "Face_3_9"), model.selection("FACE", "Face_3_10"), model.selection("FACE", "Face_3_11"), model.selection("FACE", "Face_3_12"), model.selection("FACE", "Face_4_1"), model.selection("COMPOUND", "LinearCopy_1_1"), model.selection("COMPOUND", "LinearCopy_2_1"), model.selection("COMPOUND", "LinearCopy_3_1"), model.selection("COMPOUND", "LinearCopy_4_1"), model.selection("COMPOUND", "LinearCopy_5_1")] -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], Fill_1_objects_2) +Split_1_objects_2 = [model.selection("FACE", "Face_3_1"), model.selection("FACE", "Face_3_2"), model.selection("FACE", "Face_3_3"), model.selection("FACE", "Face_3_4"), model.selection("FACE", "Face_3_5"), model.selection("FACE", "Face_3_6"), model.selection("FACE", "Face_3_7"), model.selection("FACE", "Face_3_8"), model.selection("FACE", "Face_3_9"), model.selection("FACE", "Face_3_10"), model.selection("FACE", "Face_3_11"), model.selection("FACE", "Face_3_12"), model.selection("FACE", "Face_4_1"), model.selection("COMPOUND", "LinearCopy_1_1"), model.selection("COMPOUND", "LinearCopy_2_1"), model.selection("COMPOUND", "LinearCopy_3_1"), model.selection("COMPOUND", "LinearCopy_4_1"), model.selection("COMPOUND", "LinearCopy_5_1")] +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], Split_1_objects_2) model.do() model.end() from GeomAPI import GeomAPI_Shape -model.testNbResults(Fill_1, 1) -model.testNbSubResults(Fill_1, [0]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.SOLID, [0]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.FACE, [60]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.EDGE, [273]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.VERTEX, [546]) +model.testNbResults(Split_1, 1) +model.testNbSubResults(Split_1, [0]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.SOLID, [0]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.FACE, [60]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.EDGE, [273]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.VERTEX, [546]) assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/Test2636.py b/src/FeaturesPlugin/Test/Test2636.py index 8ad1eea3a..2c762767a 100644 --- a/src/FeaturesPlugin/Test/Test2636.py +++ b/src/FeaturesPlugin/Test/Test2636.py @@ -367,44 +367,44 @@ Edge_1_objects = [model.selection("EDGE", "Sketch_2/SketchLine_27"), model.selec Edge_1 = model.addEdge(Part_2_doc, Edge_1_objects) Extrusion_1_objects = [model.selection("EDGE", "Edge_1_1"), model.selection("EDGE", "Edge_1_2"), model.selection("EDGE", "Edge_1_3"), model.selection("EDGE", "Edge_1_4"), model.selection("EDGE", "Edge_1_5"), model.selection("EDGE", "Edge_1_6"), model.selection("EDGE", "Edge_1_7"), model.selection("EDGE", "Edge_1_8"), model.selection("EDGE", "Edge_1_9"), model.selection("EDGE", "Edge_1_10"), model.selection("EDGE", "Edge_1_11"), model.selection("EDGE", "Edge_1_12"), model.selection("EDGE", "Edge_1_13"), model.selection("EDGE", "Edge_1_14")] Extrusion_1 = model.addExtrusion(Part_2_doc, Extrusion_1_objects, model.selection("EDGE", "PartSet/OX"), 300, 0) -Fill_1_objects_2 = [model.selection("FACE", "Extrusion_1_1"), model.selection("FACE", "Extrusion_1_2"), model.selection("FACE", "Extrusion_1_3"), model.selection("FACE", "Extrusion_1_4"), model.selection("FACE", "Extrusion_1_5"), model.selection("FACE", "Extrusion_1_6"), model.selection("FACE", "Extrusion_1_7"), model.selection("FACE", "Extrusion_1_8"), model.selection("FACE", "Extrusion_1_9"), model.selection("FACE", "Extrusion_1_10"), model.selection("FACE", "Extrusion_1_11"), model.selection("FACE", "Extrusion_1_12"), model.selection("FACE", "Extrusion_1_13"), model.selection("FACE", "Extrusion_1_14")] -Fill_1 = model.addFill(Part_2_doc, [model.selection("COMPSOLID", "Revolution_1_1")], Fill_1_objects_2) -Group_1_objects = [model.selection("SOLID", "Fill_1_1_25"), model.selection("SOLID", "Fill_1_1_28"), model.selection("SOLID", "Fill_1_1_26"), model.selection("SOLID", "Fill_1_1_27"), model.selection("SOLID", "Fill_1_1_31"), model.selection("SOLID", "Fill_1_1_35"), model.selection("SOLID", "Fill_1_1_36"), model.selection("SOLID", "Fill_1_1_32"), model.selection("SOLID", "Fill_1_1_34"), model.selection("SOLID", "Fill_1_1_30"), model.selection("SOLID", "Fill_1_1_33"), model.selection("SOLID", "Fill_1_1_29")] +Split_1_objects_2 = [model.selection("FACE", "Extrusion_1_1"), model.selection("FACE", "Extrusion_1_2"), model.selection("FACE", "Extrusion_1_3"), model.selection("FACE", "Extrusion_1_4"), model.selection("FACE", "Extrusion_1_5"), model.selection("FACE", "Extrusion_1_6"), model.selection("FACE", "Extrusion_1_7"), model.selection("FACE", "Extrusion_1_8"), model.selection("FACE", "Extrusion_1_9"), model.selection("FACE", "Extrusion_1_10"), model.selection("FACE", "Extrusion_1_11"), model.selection("FACE", "Extrusion_1_12"), model.selection("FACE", "Extrusion_1_13"), model.selection("FACE", "Extrusion_1_14")] +Split_1 = model.addSplit(Part_2_doc, [model.selection("COMPSOLID", "Revolution_1_1")], Split_1_objects_2) +Group_1_objects = [model.selection("SOLID", "Split_1_1_25"), model.selection("SOLID", "Split_1_1_28"), model.selection("SOLID", "Split_1_1_26"), model.selection("SOLID", "Split_1_1_27"), model.selection("SOLID", "Split_1_1_31"), model.selection("SOLID", "Split_1_1_35"), model.selection("SOLID", "Split_1_1_36"), model.selection("SOLID", "Split_1_1_32"), model.selection("SOLID", "Split_1_1_34"), model.selection("SOLID", "Split_1_1_30"), model.selection("SOLID", "Split_1_1_33"), model.selection("SOLID", "Split_1_1_29")] Group_1 = model.addGroup(Part_2_doc, Group_1_objects) Group_1.setName("CORPS") Group_1.result().setName("CORPS") -Group_2_objects = [model.selection("SOLID", "Fill_1_1_41"), model.selection("SOLID", "Fill_1_1_49"), model.selection("SOLID", "Fill_1_1_69"), model.selection("SOLID", "Fill_1_1_71"), model.selection("SOLID", "Fill_1_1_51"), model.selection("SOLID", "Fill_1_1_43"), model.selection("SOLID", "Fill_1_1_44"), model.selection("SOLID", "Fill_1_1_67"), model.selection("SOLID", "Fill_1_1_39"), model.selection("SOLID", "Fill_1_1_47"), model.selection("SOLID", "Fill_1_1_45"), model.selection("SOLID", "Fill_1_1_37"), model.selection("SOLID", "Fill_1_1_65"), model.selection("SOLID", "Fill_1_1_66"), model.selection("SOLID", "Fill_1_1_38"), model.selection("SOLID", "Fill_1_1_46"), model.selection("SOLID", "Fill_1_1_48"), model.selection("SOLID", "Fill_1_1_40"), model.selection("SOLID", "Fill_1_1_68"), model.selection("SOLID", "Fill_1_1_42"), model.selection("SOLID", "Fill_1_1_70"), model.selection("SOLID", "Fill_1_1_50"), model.selection("SOLID", "Fill_1_1_52"), model.selection("SOLID", "Fill_1_1_72"), model.selection("SOLID", "Fill_1_1_63"), model.selection("SOLID", "Fill_1_1_64"), model.selection("SOLID", "Fill_1_1_61"), model.selection("SOLID", "Fill_1_1_62"), model.selection("SOLID", "Fill_1_1_58"), model.selection("SOLID", "Fill_1_1_57"), model.selection("SOLID", "Fill_1_1_54"), model.selection("SOLID", "Fill_1_1_53"), model.selection("SOLID", "Fill_1_1_55"), model.selection("SOLID", "Fill_1_1_56"), model.selection("SOLID", "Fill_1_1_60"), model.selection("SOLID", "Fill_1_1_59")] +Group_2_objects = [model.selection("SOLID", "Split_1_1_41"), model.selection("SOLID", "Split_1_1_49"), model.selection("SOLID", "Split_1_1_69"), model.selection("SOLID", "Split_1_1_71"), model.selection("SOLID", "Split_1_1_51"), model.selection("SOLID", "Split_1_1_43"), model.selection("SOLID", "Split_1_1_44"), model.selection("SOLID", "Split_1_1_67"), model.selection("SOLID", "Split_1_1_39"), model.selection("SOLID", "Split_1_1_47"), model.selection("SOLID", "Split_1_1_45"), model.selection("SOLID", "Split_1_1_37"), model.selection("SOLID", "Split_1_1_65"), model.selection("SOLID", "Split_1_1_66"), model.selection("SOLID", "Split_1_1_38"), model.selection("SOLID", "Split_1_1_46"), model.selection("SOLID", "Split_1_1_48"), model.selection("SOLID", "Split_1_1_40"), model.selection("SOLID", "Split_1_1_68"), model.selection("SOLID", "Split_1_1_42"), model.selection("SOLID", "Split_1_1_70"), model.selection("SOLID", "Split_1_1_50"), model.selection("SOLID", "Split_1_1_52"), model.selection("SOLID", "Split_1_1_72"), model.selection("SOLID", "Split_1_1_63"), model.selection("SOLID", "Split_1_1_64"), model.selection("SOLID", "Split_1_1_61"), model.selection("SOLID", "Split_1_1_62"), model.selection("SOLID", "Split_1_1_58"), model.selection("SOLID", "Split_1_1_57"), model.selection("SOLID", "Split_1_1_54"), model.selection("SOLID", "Split_1_1_53"), model.selection("SOLID", "Split_1_1_55"), model.selection("SOLID", "Split_1_1_56"), model.selection("SOLID", "Split_1_1_60"), model.selection("SOLID", "Split_1_1_59")] Group_2 = model.addGroup(Part_2_doc, Group_2_objects) Group_2.setName("TETE") Group_2.result().setName("TETE") -Group_3_objects = [model.selection("SOLID", "Fill_1_1_2"), model.selection("SOLID", "Fill_1_1_1"), model.selection("SOLID", "Fill_1_1_5"), model.selection("SOLID", "Fill_1_1_9"), model.selection("SOLID", "Fill_1_1_13"), model.selection("SOLID", "Fill_1_1_14"), model.selection("SOLID", "Fill_1_1_15"), model.selection("SOLID", "Fill_1_1_19"), model.selection("SOLID", "Fill_1_1_11"), model.selection("SOLID", "Fill_1_1_12"), model.selection("SOLID", "Fill_1_1_24"), model.selection("SOLID", "Fill_1_1_23"), model.selection("SOLID", "Fill_1_1_16"), model.selection("SOLID", "Fill_1_1_8"), model.selection("SOLID", "Fill_1_1_20"), model.selection("SOLID", "Fill_1_1_4"), model.selection("SOLID", "Fill_1_1_3"), model.selection("SOLID", "Fill_1_1_7"), model.selection("SOLID", "Fill_1_1_10"), model.selection("SOLID", "Fill_1_1_6")] +Group_3_objects = [model.selection("SOLID", "Split_1_1_2"), model.selection("SOLID", "Split_1_1_1"), model.selection("SOLID", "Split_1_1_5"), model.selection("SOLID", "Split_1_1_9"), model.selection("SOLID", "Split_1_1_13"), model.selection("SOLID", "Split_1_1_14"), model.selection("SOLID", "Split_1_1_15"), model.selection("SOLID", "Split_1_1_19"), model.selection("SOLID", "Split_1_1_11"), model.selection("SOLID", "Split_1_1_12"), model.selection("SOLID", "Split_1_1_24"), model.selection("SOLID", "Split_1_1_23"), model.selection("SOLID", "Split_1_1_16"), model.selection("SOLID", "Split_1_1_8"), model.selection("SOLID", "Split_1_1_20"), model.selection("SOLID", "Split_1_1_4"), model.selection("SOLID", "Split_1_1_3"), model.selection("SOLID", "Split_1_1_7"), model.selection("SOLID", "Split_1_1_10"), model.selection("SOLID", "Split_1_1_6")] Group_3 = model.addGroup(Part_2_doc, Group_3_objects) Group_3.setName("PIED") Group_3.result().setName("PIED") -Group_4 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Fill_1_1_36/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_7")]) +Group_4 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Split_1_1_36/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_7")]) Group_4.setName("corps_hauteur") Group_4.result().setName("corps_hauteur") -Group_5 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Fill_1_1_11/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_5")]) +Group_5 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Split_1_1_11/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_5")]) Group_5.setName("pied_hauteur") Group_5.result().setName("pied_hauteur") -Group_6 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Fill_1_1_24/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_6")]) +Group_6 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Split_1_1_24/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_6")]) Group_6.setName("chanfrein") Group_6.result().setName("chanfrein") -Group_7 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Fill_1_1_72/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchArc_1_2")]) +Group_7 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Split_1_1_72/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchArc_1_2")]) Group_7.setName("filet") Group_7.result().setName("filet") -Group_8 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Fill_1_1_42/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_9")]) +Group_8 = model.addGroup(Part_2_doc, [model.selection("EDGE", "Split_1_1_42/Generated_Edge&Sketch_2/SketchLine_31&Sketch_1/SketchLine_9")]) Group_8.setName("tete_bas") Group_8.result().setName("tete_bas") -Group_9_objects = [model.selection("FACE", "Fill_1_1_12/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_11/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_9/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_8/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_4/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_1/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_2/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Fill_1_1_5/Modified_Face&Sketch_1/SketchLine_5")] +Group_9_objects = [model.selection("FACE", "Split_1_1_12/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_11/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_9/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_8/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_4/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_1/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_2/Modified_Face&Sketch_1/SketchLine_5"), model.selection("FACE", "Split_1_1_5/Modified_Face&Sketch_1/SketchLine_5")] Group_9 = model.addGroup(Part_2_doc, Group_9_objects) Group_9.setName("ADH_PIEDS") Group_9.result().setName("ADH_PIEDS") -Group_10_objects = [model.selection("FACE", "Fill_1_1_13/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_14/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_25/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_26/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_15/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_27/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_19/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_31/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_23/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_35/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_24/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_36/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_32/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_20/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_16/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Fill_1_1_28/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Fill_1_1_70/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_42/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_68/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_40/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_66/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_38/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_37/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_65/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_39/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_67/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_69/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_41/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_43/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_71/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_44/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Fill_1_1_72/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Fill_1_1_52/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_44/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_43/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_51/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_50/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_42/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_40/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_48/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_46/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_38/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_37/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_45/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_39/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_47/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_49/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Fill_1_1_41/Modified_Face&Sketch_1/SketchLine_9")] +Group_10_objects = [model.selection("FACE", "Split_1_1_13/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_14/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_25/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_26/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_15/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_27/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_19/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_31/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_23/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_35/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_24/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_36/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_32/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_20/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_16/Modified_Face&Sketch_1/SketchLine_6"), model.selection("FACE", "Split_1_1_28/Modified_Face&Sketch_1/SketchLine_7"), model.selection("FACE", "Split_1_1_70/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_42/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_68/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_40/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_66/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_38/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_37/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_65/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_39/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_67/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_69/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_41/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_43/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_71/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_44/Modified_Face&Sketch_1/SketchLine_8"), model.selection("FACE", "Split_1_1_72/Modified_Face&Sketch_1/SketchArc_1_2"), model.selection("FACE", "Split_1_1_52/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_44/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_43/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_51/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_50/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_42/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_40/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_48/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_46/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_38/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_37/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_45/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_39/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_47/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_49/Modified_Face&Sketch_1/SketchLine_9"), model.selection("FACE", "Split_1_1_41/Modified_Face&Sketch_1/SketchLine_9")] Group_10 = model.addGroup(Part_2_doc, Group_10_objects) Group_10.setName("CONTACT_VIS") Group_10.result().setName("CONTACT_VIS") -Translation_1 = model.addTranslation(Part_2_doc, [model.selection("COMPSOLID", "Fill_1_1")], 0, 100, 0) +Translation_1 = model.addTranslation(Part_2_doc, [model.selection("COMPSOLID", "Split_1_1")], 0, 100, 0) AngularCopy_1 = model.addMultiRotation(Part_2_doc, [model.selection("COMPSOLID", "Translation_1_1")], model.selection("EDGE", "PartSet/OX"), 4) model.do() diff --git a/src/FeaturesPlugin/Test/Test2751.py b/src/FeaturesPlugin/Test/Test2751.py index debebb1b0..647854b43 100644 --- a/src/FeaturesPlugin/Test/Test2751.py +++ b/src/FeaturesPlugin/Test/Test2751.py @@ -86,7 +86,7 @@ SketchConstraintDistance_1 = Sketch_2.setDistance(SketchPoint_3.coordinates(), S model.do() Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "all-in-Sketch_2")], model.selection(), 10, 0) AngularCopy_1 = model.addMultiRotation(Part_1_doc, [model.selection("COMPOUND", "all-in-Extrusion_1")], model.selection("EDGE", "PartSet/OZ"), "(90-2*a)/(n-1)", "n") -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", (30, 30, 0))], [model.selection("COMPOUND", (29.25281542867235, 29.25281542867235, 5))]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", (30, 30, 0))], [model.selection("COMPOUND", (29.25281542867235, 29.25281542867235, 5))]) model.end() assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanFill.py b/src/FeaturesPlugin/Test/TestBooleanSplit.py similarity index 90% rename from src/FeaturesPlugin/Test/TestBooleanFill.py rename to src/FeaturesPlugin/Test/TestBooleanSplit.py index c0ae6b123..8a65fb465 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFill.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit.py @@ -34,8 +34,8 @@ SketchLine_2 = Sketch_2.addLine(100, 25, 60, 75) SketchLine_3 = Sketch_2.addLine(60, 75, 25, 25) model.do() Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "Sketch_1"), model.selection("COMPOUND", "Sketch_2")], model.selection(), 100, 0) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], [model.selection("SOLID", "Extrusion_1_2")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], [model.selection("SOLID", "Extrusion_1_2")]) model.do() model.end() -assert (len(Fill_1.results()) > 0) +assert (len(Split_1.results()) > 0) assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanFillWithPlane.py b/src/FeaturesPlugin/Test/TestBooleanSplitWithPlane.py similarity index 85% rename from src/FeaturesPlugin/Test/TestBooleanFillWithPlane.py rename to src/FeaturesPlugin/Test/TestBooleanSplitWithPlane.py index 9a38e4dae..4a1f91674 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFillWithPlane.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplitWithPlane.py @@ -54,19 +54,19 @@ SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_7.result()) SketchConstraintVertical_4 = Sketch_1.setVertical(SketchLine_8.result()) model.do() Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", GeomAPI_Pnt(17.35551764280096, -11.01190794150899, 0))], model.selection(), 100, 0) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", GeomAPI_Pnt(-0.3180832609141306, -28.0220443670531, 50.00000000000001))], [model.selection("FACE", "PartSet/YOZ")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", GeomAPI_Pnt(-0.3180832609141306, -28.0220443670531, 50.00000000000001))], [model.selection("FACE", "PartSet/YOZ")]) model.do() -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() from GeomAPI import GeomAPI_Shape -model.testNbResults(Fill_1, 1) -model.testNbSubResults(Fill_1, [4]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.SOLID, [4]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.FACE, [30]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.EDGE, [132]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.VERTEX, [264]) -model.testResultsVolumes(Fill_1, [11003613.329450136050581932067871094]) +model.testNbResults(Split_1, 1) +model.testNbSubResults(Split_1, [4]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.SOLID, [4]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.FACE, [30]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.EDGE, [132]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.VERTEX, [264]) +model.testResultsVolumes(Split_1, [11003613.329450136050581932067871094]) assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanFill_ErrorMsg.py b/src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py similarity index 93% rename from src/FeaturesPlugin/Test/TestBooleanFill_ErrorMsg.py rename to src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py index 2c933bf98..31059ee17 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFill_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py @@ -29,7 +29,7 @@ aPartResult = modelAPI_ResultPart(aPartFeature.firstResult()) aPart = aPartResult.partDoc() aSession.startOperation() -Fill_1 = aPart.addFeature("Fill") -Fill_1.execute() -assert(Fill_1.error() != "") +Split_1 = aPart.addFeature("Split") +Split_1.execute() +assert(Split_1.error() != "") aSession.finishOperation() diff --git a/src/FeaturesPlugin/Test/TestFillSolidEdge.py b/src/FeaturesPlugin/Test/TestScriptSolidEdge.py similarity index 88% rename from src/FeaturesPlugin/Test/TestFillSolidEdge.py rename to src/FeaturesPlugin/Test/TestScriptSolidEdge.py index 2eb143b60..6f9e0e90e 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidEdge.py +++ b/src/FeaturesPlugin/Test/TestScriptSolidEdge.py @@ -36,11 +36,11 @@ SketchLine_3 = SketchProjection_2.createdFeature() SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_3.result()) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("EDGE", "Edge_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [1], [7], [30], [60]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [1], [7], [30], [60]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillCompFaceSolid.py b/src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py similarity index 89% rename from src/FeaturesPlugin/Test/TestFillCompFaceSolid.py rename to src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py index 54926d025..cc87ae9bc 100644 --- a/src/FeaturesPlugin/Test/TestFillCompFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py @@ -51,12 +51,12 @@ SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).s model.do() Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), "Shift", True) Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) -Fill_2 = model.addFill(Part_1_doc, [model.selection("COMPOUND", "Fill_1_1")], [model.selection("SOLID", "Box_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("COMPOUND", "Split_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkResult(Fill_2, model, 1, [6], [0], [6], [22], [44]) -model.testHaveNamingSubshapes(Fill_2, model, Part_1_doc) +model.checkResult(Split_2, model, 1, [6], [0], [6], [22], [44]) +model.testHaveNamingSubshapes(Split_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillCompsolidPlane.py b/src/FeaturesPlugin/Test/TestSplitCompsolidPlane.py similarity index 76% rename from src/FeaturesPlugin/Test/TestFillCompsolidPlane.py rename to src/FeaturesPlugin/Test/TestSplitCompsolidPlane.py index a8abbd78e..dd2ead462 100644 --- a/src/FeaturesPlugin/Test/TestFillCompsolidPlane.py +++ b/src/FeaturesPlugin/Test/TestSplitCompsolidPlane.py @@ -32,16 +32,16 @@ SketchCircle_2 = Sketch_1.addCircle(37.8779560884558, 0, 17.74637067763095) SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.result(), SketchCircle_2.center()) model.do() Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], model.selection(), 10, 0) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1_1"), model.selection("SOLID", "Extrusion_1_1_2")], [model.selection("FACE", "PartSet/XOZ")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1_1"), model.selection("SOLID", "Extrusion_1_1_2")], [model.selection("FACE", "PartSet/XOZ")]) model.do() model.end() from GeomAPI import GeomAPI_Shape -model.testNbResults(Fill_1, 1) -model.testNbSubResults(Fill_1, [5]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.SOLID, [5]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.FACE, [25]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.EDGE, [90]) -model.testNbSubShapes(Fill_1, GeomAPI_Shape.VERTEX, [180]) -model.testResultsVolumes(Fill_1, [16831.622023411000554915517568588]) +model.testNbResults(Split_1, 1) +model.testNbSubResults(Split_1, [5]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.SOLID, [5]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.FACE, [25]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.EDGE, [90]) +model.testNbSubShapes(Split_1, GeomAPI_Shape.VERTEX, [180]) +model.testResultsVolumes(Split_1, [16831.622023411000554915517568588]) diff --git a/src/FeaturesPlugin/Test/TestFillEdgeEdge.py b/src/FeaturesPlugin/Test/TestSplitEdgeEdge.py similarity index 89% rename from src/FeaturesPlugin/Test/TestFillEdgeEdge.py rename to src/FeaturesPlugin/Test/TestSplitEdgeEdge.py index 71d79a876..ffd475172 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeEdge.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeEdge.py @@ -37,11 +37,11 @@ SketchConstraintCoincidence_2 = Sketch_2.setCoincident(SketchLine_2.endPoint(), model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) Edge_2 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_2")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("EDGE", "Edge_2_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("EDGE", "Edge_2_1")]) model.do() -model.checkResult(Fill_1,model,1,[3],[0],[0],[3],[6]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[3],[0],[0],[3],[6]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py b/src/FeaturesPlugin/Test/TestSplitEdgeEdgeIntersected.py similarity index 87% rename from src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py rename to src/FeaturesPlugin/Test/TestSplitEdgeEdgeIntersected.py index 11dac36f0..51128802c 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeEdgeIntersected.py @@ -33,11 +33,11 @@ SketchLine_2 = Sketch_2.addLine(-42.46271611030479, 53.71965718432511, 14.830757 model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) Edge_2 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_2")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("EDGE", "Edge_2_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("EDGE", "Edge_2_1")]) model.do() -model.checkResult(Fill_1,model,1,[2],[0],[0],[2],[4]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[2],[0],[0],[2],[4]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeFace.py b/src/FeaturesPlugin/Test/TestSplitEdgeFace.py similarity index 91% rename from src/FeaturesPlugin/Test/TestFillEdgeFace.py rename to src/FeaturesPlugin/Test/TestSplitEdgeFace.py index b887f137f..29b1edc4c 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeFace.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeFace.py @@ -41,11 +41,11 @@ Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Sketch_1/Face-Sk SketchLine_5 = Sketch_2.addLine(-53.77011318694006, -47.84888937635935, 60.89888292381829, 36.13719175945) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_5")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("FACE", "Face_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [3], [0], [0], [3], [6]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [3], [0], [0], [3], [6]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeShell.py b/src/FeaturesPlugin/Test/TestSplitEdgeShell.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillEdgeShell.py rename to src/FeaturesPlugin/Test/TestSplitEdgeShell.py index dc8557db1..95f35922d 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeShell.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeShell.py @@ -48,11 +48,11 @@ Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) SketchLine_3 = Sketch_2.addLine(-64.49168769733997, 17.16789081864163, 146.7677170722727, 22.9901626941168) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_3")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SHELL", "Shell_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [3], [0], [0], [3], [6]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [3], [0], [0], [3], [6]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeSolid.py b/src/FeaturesPlugin/Test/TestSplitEdgeSolid.py similarity index 88% rename from src/FeaturesPlugin/Test/TestFillEdgeSolid.py rename to src/FeaturesPlugin/Test/TestSplitEdgeSolid.py index 11f88c260..62f071176 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeSolid.py @@ -36,11 +36,11 @@ SketchLine_3 = SketchProjection_2.createdFeature() SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_3.result()) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SOLID", "Box_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [0], [1], [2]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [0], [1], [2]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py b/src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py similarity index 89% rename from src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py rename to src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py index 73bf80681..8a208f26a 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py @@ -37,11 +37,11 @@ SketchConstraintMiddle_1 = Sketch_1.setMiddlePoint(SketchAPI_Point(SketchPoint_1 SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_1.result(), 20) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SOLID", "Cone_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SOLID", "Cone_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [3], [0], [0], [3], [6]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [3], [0], [0], [3], [6]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeVertex.py b/src/FeaturesPlugin/Test/TestSplitEdgeVertex.py similarity index 88% rename from src/FeaturesPlugin/Test/TestFillEdgeVertex.py rename to src/FeaturesPlugin/Test/TestSplitEdgeVertex.py index 1ddc71865..df39f8d16 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeVertex.py @@ -36,10 +36,10 @@ SketchPoint_1 = SketchProjection_1.createdFeature() SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_1.result(), SketchAPI_Point(SketchPoint_1).coordinates()) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[2],[0],[0],[2],[4]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[2],[0],[0],[2],[4]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeWire.py b/src/FeaturesPlugin/Test/TestSplitEdgeWire.py similarity index 91% rename from src/FeaturesPlugin/Test/TestFillEdgeWire.py rename to src/FeaturesPlugin/Test/TestSplitEdgeWire.py index 02520267a..d72dc816a 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeWire.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeWire.py @@ -41,11 +41,11 @@ model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) Wire_1_objects = [model.selection("EDGE", "Sketch_2/SketchLine_5"), model.selection("EDGE", "Sketch_2/SketchLine_2"), model.selection("EDGE", "Sketch_2/SketchLine_3"), model.selection("EDGE", "Sketch_2/SketchLine_4")] Wire_1 = model.addWire(Part_1_doc, Wire_1_objects) -Fill_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("WIRE", "Wire_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [3], [0], [0], [3], [6]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [3], [0], [0], [3], [6]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceEdge.py b/src/FeaturesPlugin/Test/TestSplitFaceEdge.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillFaceEdge.py rename to src/FeaturesPlugin/Test/TestSplitFaceEdge.py index 555d6e869..d0dfa6913 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceEdge.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceEdge.py @@ -41,11 +41,11 @@ Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Sketch_1/Face-Sk SketchLine_5 = Sketch_2.addLine(-53.77011318694006, -47.84888937635935, 60.89888292381829, 36.13719175945) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_5")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[2],[0],[2],[8],[16]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[2],[0],[2],[8],[16]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py b/src/FeaturesPlugin/Test/TestSplitFaceEdgeInside.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py rename to src/FeaturesPlugin/Test/TestSplitFaceEdgeInside.py index a069f8829..8e6a64f83 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceEdgeInside.py @@ -44,11 +44,11 @@ model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_4")]) Face_1_objects = [model.selection("EDGE", "Sketch_1/SketchLine_2"), model.selection("EDGE", "Sketch_1/SketchLine_3"), model.selection("EDGE", "Sketch_1/SketchArc_1_2"), model.selection("EDGE", "Sketch_1/SketchLine_1")] Face_1 = model.addFace(Part_1_doc, Face_1_objects) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[1],[5],[10]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[1],[5],[10]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py b/src/FeaturesPlugin/Test/TestSplitFaceEdgePerpendicular.py similarity index 93% rename from src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py rename to src/FeaturesPlugin/Test/TestSplitFaceEdgePerpendicular.py index 388522bfa..ab3c668e4 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceEdgePerpendicular.py @@ -45,11 +45,11 @@ model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_7")]) Face_1_objects = [model.selection("EDGE", "Sketch_1/SketchLine_1"), model.selection("EDGE", "Sketch_1/SketchLine_6"), model.selection("EDGE", "Sketch_1/SketchLine_5"), model.selection("EDGE", "Sketch_1/SketchLine_4"), model.selection("EDGE", "Sketch_1/SketchLine_3"), model.selection("EDGE", "Sketch_1/SketchLine_2")] Face_1 = model.addFace(Part_1_doc, Face_1_objects) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[1],[6],[13]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[1],[6],[13]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceFace.py b/src/FeaturesPlugin/Test/TestSplitFaceFace.py similarity index 94% rename from src/FeaturesPlugin/Test/TestFillFaceFace.py rename to src/FeaturesPlugin/Test/TestSplitFaceFace.py index 07d47a4f9..63246d207 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceFace.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceFace.py @@ -56,11 +56,11 @@ SketchConstraintRadius_2 = Sketch_2.setRadius(SketchArc_2.results()[1], "R") model.do() Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_1r-SketchLine_3f-SketchArc_1_2f_wire")]) Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_4r-SketchLine_5f-SketchArc_2_2f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Face_2_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Face_2_1")]) model.do() -model.checkResult(Fill_1, model, 1, [2], [0], [2], [6], [12]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [2], [0], [2], [6], [12]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceShell.py b/src/FeaturesPlugin/Test/TestSplitFaceShell.py similarity index 96% rename from src/FeaturesPlugin/Test/TestFillFaceShell.py rename to src/FeaturesPlugin/Test/TestSplitFaceShell.py index 548b3c4d2..958986077 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceShell.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceShell.py @@ -101,11 +101,11 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-Sketc Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_3f-SketchLine_4f-SketchLine_6f_wire")]) Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) Face_3 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_9f-SketchLine_11f-SketchLine_12f-SketchLine_15r-SketchLine_14r-SketchLine_13r-SketchLine_16f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_3_1")], [model.selection("SHELL", "Shell_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_3_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [3], [0], [3], [14], [28]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [3], [0], [3], [14], [28]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceSolid.py b/src/FeaturesPlugin/Test/TestSplitFaceSolid.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillFaceSolid.py rename to src/FeaturesPlugin/Test/TestSplitFaceSolid.py index 55ad8491c..11b61e8ff 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceSolid.py @@ -50,11 +50,11 @@ SketchConstraintDistanceVertical_1 = Sketch_1.setVerticalDistance(SketchAPI_Line SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).startPoint(), SketchLine_3.startPoint(), "Shift", True) model.do() Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("SOLID", "Box_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [4], [0], [4], [15], [30]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [4], [0], [4], [15], [30]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceVertex.py b/src/FeaturesPlugin/Test/TestSplitFaceVertex.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillFaceVertex.py rename to src/FeaturesPlugin/Test/TestSplitFaceVertex.py index 6893a60b0..f18749d27 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceVertex.py @@ -43,11 +43,11 @@ model.do() Face_1_objects = [model.selection("EDGE", "Sketch_1/SketchLine_1"), model.selection("EDGE", "Sketch_1/SketchLine_4"), model.selection("EDGE", "Sketch_1/SketchLine_3"), model.selection("EDGE", "Sketch_1/SketchLine_2")] Face_1 = model.addFace(Part_1_doc, Face_1_objects) Vertex_1 = model.addVertex(Part_1_doc, [model.selection("VERTEX", "Point_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[1],[4],[9]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[1],[4],[9]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceWire.py b/src/FeaturesPlugin/Test/TestSplitFaceWire.py similarity index 93% rename from src/FeaturesPlugin/Test/TestFillFaceWire.py rename to src/FeaturesPlugin/Test/TestSplitFaceWire.py index 6245b2933..8470e912b 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceWire.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceWire.py @@ -53,11 +53,11 @@ SketchConstraintCoincidence_10 = Sketch_2.setCoincident(SketchLine_4.startPoint( model.do() Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_1r-SketchLine_3f-SketchArc_1_2f_wire")]) Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_4r-SketchLine_5f-SketchLine_6f-SketchLine_7f-SketchLine_8f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("WIRE", "Wire_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [5], [0], [5], [21], [42]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [5], [0], [5], [21], [42]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellConstrPlane.py b/src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py similarity index 91% rename from src/FeaturesPlugin/Test/TestFillShellConstrPlane.py rename to src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py index 6600f67b2..fff13d49b 100644 --- a/src/FeaturesPlugin/Test/TestFillShellConstrPlane.py +++ b/src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py @@ -43,11 +43,11 @@ model.do() Wire_1 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchArc_1_2"), model.selection("EDGE", "Sketch_1/SketchArc_2_2")]) Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], model.selection(), 70, 0) Shell_1 = model.addShell(Part_1_doc, [model.selection("SHELL", "Extrusion_1_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("FACE", "PartSet/XOZ")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("FACE", "PartSet/XOZ")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[3],[12],[24]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[3],[12],[24]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellEdge.py b/src/FeaturesPlugin/Test/TestSplitShellEdge.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillShellEdge.py rename to src/FeaturesPlugin/Test/TestSplitShellEdge.py index 8ee5cca39..0cbf86955 100644 --- a/src/FeaturesPlugin/Test/TestFillShellEdge.py +++ b/src/FeaturesPlugin/Test/TestSplitShellEdge.py @@ -48,11 +48,11 @@ Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) SketchLine_3 = Sketch_2.addLine(-64.49168769733997, 17.16789081864163, 146.7677170722727, 22.9901626941168) model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_3")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("EDGE", "Edge_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[2],[8],[18]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[2],[8],[18]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellFace.py b/src/FeaturesPlugin/Test/TestSplitShellFace.py similarity index 96% rename from src/FeaturesPlugin/Test/TestFillShellFace.py rename to src/FeaturesPlugin/Test/TestSplitShellFace.py index 8e2cf0d14..9591f5269 100644 --- a/src/FeaturesPlugin/Test/TestFillShellFace.py +++ b/src/FeaturesPlugin/Test/TestSplitShellFace.py @@ -99,11 +99,11 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-Sketc Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_3f-SketchLine_4f-SketchLine_6f_wire")]) Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) Face_3 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_9f-SketchLine_11f-SketchLine_12f-SketchLine_15r-SketchLine_14r-SketchLine_13r_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("FACE", "Face_3_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("FACE", "Face_3_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [4], [13], [26]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [4], [13], [26]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellShell.py b/src/FeaturesPlugin/Test/TestSplitShellShell.py similarity index 96% rename from src/FeaturesPlugin/Test/TestFillShellShell.py rename to src/FeaturesPlugin/Test/TestSplitShellShell.py index 670a89748..e9f7aae53 100644 --- a/src/FeaturesPlugin/Test/TestFillShellShell.py +++ b/src/FeaturesPlugin/Test/TestSplitShellShell.py @@ -79,11 +79,11 @@ Face_3 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-Sketc Face_4 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_7r-SketchLine_12r-SketchLine_11r_wire")]) Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) Shell_2 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_3_1"), model.selection("FACE", "Face_4_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("SHELL", "Shell_2_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("SHELL", "Shell_2_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [4], [15], [30]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [4], [15], [30]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellSolid.py b/src/FeaturesPlugin/Test/TestSplitShellSolid.py similarity index 86% rename from src/FeaturesPlugin/Test/TestFillShellSolid.py rename to src/FeaturesPlugin/Test/TestSplitShellSolid.py index 08f10b53f..7170826b9 100644 --- a/src/FeaturesPlugin/Test/TestFillShellSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitShellSolid.py @@ -51,13 +51,13 @@ SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).s model.do() Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), "Shift", True) Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) -Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Fill_1_1_2"), model.selection("FACE", "Fill_1_1_1")]) -Fill_2 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("SOLID", "Box_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) +Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Split_1_1_2"), model.selection("FACE", "Split_1_1_1")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkResult(Fill_2, model, 1, [0], [0], [6], [22], [44]) -model.testHaveNamingSubshapes(Fill_2, model, Part_1_doc) +model.checkResult(Split_2, model, 1, [0], [0], [6], [22], [44]) +model.testHaveNamingSubshapes(Split_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellVertex.py b/src/FeaturesPlugin/Test/TestSplitShellVertex.py similarity index 91% rename from src/FeaturesPlugin/Test/TestFillShellVertex.py rename to src/FeaturesPlugin/Test/TestSplitShellVertex.py index a3062224c..962661df8 100644 --- a/src/FeaturesPlugin/Test/TestFillShellVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitShellVertex.py @@ -41,11 +41,11 @@ Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Wire_1_1" Shell_1 = model.addShell(Part_1_doc, [model.selection("SHELL", "Extrusion_1_1")]) Point_2 = model.addPoint(Part_1_doc, 0, 0, 10) Vertex_1 = model.addVertex(Part_1_doc, [model.selection("VERTEX", "Point_1")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[2],[9],[18]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[2],[9],[18]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellWire.py b/src/FeaturesPlugin/Test/TestSplitShellWire.py similarity index 95% rename from src/FeaturesPlugin/Test/TestFillShellWire.py rename to src/FeaturesPlugin/Test/TestSplitShellWire.py index 998cd655e..9f0783234 100644 --- a/src/FeaturesPlugin/Test/TestFillShellWire.py +++ b/src/FeaturesPlugin/Test/TestSplitShellWire.py @@ -76,11 +76,11 @@ Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-Sketc Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) Wire_1_objects = [model.selection("EDGE", "Sketch_2/SketchLine_7"), model.selection("EDGE", "Sketch_2/SketchLine_8"), model.selection("EDGE", "Sketch_2/SketchLine_9"), model.selection("EDGE", "Sketch_2/SketchLine_10")] Wire_1 = model.addWire(Part_1_doc, Wire_1_objects) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("WIRE", "Wire_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [8], [30], [60]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [8], [30], [60]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py b/src/FeaturesPlugin/Test/TestSplitSolid2ConstructionPlanes.py similarity index 81% rename from src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py rename to src/FeaturesPlugin/Test/TestSplitSolid2ConstructionPlanes.py index 86b3d0548..d542ae0fb 100644 --- a/src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py +++ b/src/FeaturesPlugin/Test/TestSplitSolid2ConstructionPlanes.py @@ -26,11 +26,11 @@ partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() Cone_1 = model.addCone(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), model.selection("EDGE", "PartSet/OZ"), 10, 5, 10) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Cone_1_1")], [model.selection("FACE", "PartSet/YOZ"), model.selection("FACE", "PartSet/XOZ")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Cone_1_1")], [model.selection("FACE", "PartSet/YOZ"), model.selection("FACE", "PartSet/XOZ")]) model.do() -model.checkResult(Fill_1,model,1,[4],[4],[20],[72],[144]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[4],[4],[20],[72],[144]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidCompFace.py b/src/FeaturesPlugin/Test/TestSplitSolidCompFace.py similarity index 89% rename from src/FeaturesPlugin/Test/TestFillSolidCompFace.py rename to src/FeaturesPlugin/Test/TestSplitSolidCompFace.py index 5e137fdc7..d4fb49d9d 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidCompFace.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidCompFace.py @@ -51,12 +51,12 @@ SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).s model.do() Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), "Shift/3", True) Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) -Fill_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("COMPOUND", "Fill_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("COMPOUND", "Split_1_1")]) model.do() -model.checkResult(Fill_2, model, 1, [2], [2], [14], [60], [120]) -model.testHaveNamingSubshapes(Fill_2, model, Part_1_doc) +model.checkResult(Split_2, model, 1, [2], [2], [14], [60], [120]) +model.testHaveNamingSubshapes(Split_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidCompShell.py b/src/FeaturesPlugin/Test/TestSplitSolidCompShell.py similarity index 87% rename from src/FeaturesPlugin/Test/TestFillSolidCompShell.py rename to src/FeaturesPlugin/Test/TestSplitSolidCompShell.py index bd641f1fd..cbfcf0aaa 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidCompShell.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidCompShell.py @@ -51,14 +51,14 @@ SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).s model.do() Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), "Shift/3", True) Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) -Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Fill_1_1_2"), model.selection("FACE", "Fill_1_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) +Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Split_1_1_2"), model.selection("FACE", "Split_1_1_1")]) LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], model.selection("EDGE", "PartSet/OZ"), 1, 3) -Fill_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("COMPOUND", "LinearCopy_1_1")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("COMPOUND", "LinearCopy_1_1")]) model.do() -model.checkResult(Fill_2, model, 1, [4], [4], [30], [132], [264]) -model.testHaveNamingSubshapes(Fill_2, model, Part_1_doc) +model.checkResult(Split_2, model, 1, [4], [4], [30], [132], [264]) +model.testHaveNamingSubshapes(Split_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidFace.py b/src/FeaturesPlugin/Test/TestSplitSolidFace.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillSolidFace.py rename to src/FeaturesPlugin/Test/TestSplitSolidFace.py index 5ad553c8b..5bddf0679 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidFace.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidFace.py @@ -50,11 +50,11 @@ SketchConstraintDistanceVertical_1 = Sketch_1.setVerticalDistance(SketchAPI_Line SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).startPoint(), SketchLine_3.startPoint(), "Shift", True) model.do() Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("FACE", "Face_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [2], [2], [12], [48], [96]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [2], [2], [12], [48], [96]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidShell.py b/src/FeaturesPlugin/Test/TestSplitSolidShell.py similarity index 86% rename from src/FeaturesPlugin/Test/TestFillSolidShell.py rename to src/FeaturesPlugin/Test/TestSplitSolidShell.py index 5264d051c..2a45ab6e9 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidShell.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidShell.py @@ -51,13 +51,13 @@ SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).s model.do() Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), "Shift/3", True) Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) -Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Fill_1_1_2"), model.selection("FACE", "Fill_1_1_1")]) -Fill_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("SHELL", "Shell_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Plane_2")]) +Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Split_1_1_2"), model.selection("FACE", "Split_1_1_1")]) +Split_2 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkResult(Fill_2, model, 1, [2], [2], [14], [60], [120]) -model.testHaveNamingSubshapes(Fill_2, model, Part_1_doc) +model.checkResult(Split_2, model, 1, [2], [2], [14], [60], [120]) +model.testHaveNamingSubshapes(Split_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireEdge.py b/src/FeaturesPlugin/Test/TestSplitWireEdge.py similarity index 91% rename from src/FeaturesPlugin/Test/TestFillWireEdge.py rename to src/FeaturesPlugin/Test/TestSplitWireEdge.py index c97e89302..d7fa3d998 100644 --- a/src/FeaturesPlugin/Test/TestFillWireEdge.py +++ b/src/FeaturesPlugin/Test/TestSplitWireEdge.py @@ -41,11 +41,11 @@ model.do() Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1")]) Wire_1_objects = [model.selection("EDGE", "Sketch_2/SketchLine_5"), model.selection("EDGE", "Sketch_2/SketchLine_2"), model.selection("EDGE", "Sketch_2/SketchLine_3"), model.selection("EDGE", "Sketch_2/SketchLine_4")] Wire_1 = model.addWire(Part_1_doc, Wire_1_objects) -Fill_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("EDGE", "Edge_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[0],[6],[12]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[0],[6],[12]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireFace.py b/src/FeaturesPlugin/Test/TestSplitWireFace.py similarity index 94% rename from src/FeaturesPlugin/Test/TestFillWireFace.py rename to src/FeaturesPlugin/Test/TestSplitWireFace.py index c6c4d2881..fc2588bdb 100644 --- a/src/FeaturesPlugin/Test/TestFillWireFace.py +++ b/src/FeaturesPlugin/Test/TestSplitWireFace.py @@ -59,11 +59,11 @@ SketchConstraintCoincidence_12 = Sketch_2.setCoincident(SketchLine_4.startPoint( model.do() Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_1r-SketchLine_3f-SketchArc_1_2f_wire")]) Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_4r-SketchLine_5f-SketchLine_7f-SketchLine_8f-SketchLine_9f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("FACE", "Face_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [0], [6], [12]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [0], [6], [12]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireShell.py b/src/FeaturesPlugin/Test/TestSplitWireShell.py similarity index 96% rename from src/FeaturesPlugin/Test/TestFillWireShell.py rename to src/FeaturesPlugin/Test/TestSplitWireShell.py index 8b9006137..fc6b66e60 100644 --- a/src/FeaturesPlugin/Test/TestFillWireShell.py +++ b/src/FeaturesPlugin/Test/TestSplitWireShell.py @@ -101,11 +101,11 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-Sketc Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_3f-SketchLine_4f-SketchLine_6f_wire")]) Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_9f-SketchLine_11f-SketchLine_12f-SketchLine_15r-SketchLine_14r-SketchLine_13r-SketchLine_16f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("SHELL", "Shell_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [0], [10], [20]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [0], [10], [20]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireSolid.py b/src/FeaturesPlugin/Test/TestSplitWireSolid.py similarity index 92% rename from src/FeaturesPlugin/Test/TestFillWireSolid.py rename to src/FeaturesPlugin/Test/TestSplitWireSolid.py index 590420a21..35d870139 100644 --- a/src/FeaturesPlugin/Test/TestFillWireSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitWireSolid.py @@ -50,11 +50,11 @@ SketchConstraintDistanceVertical_1 = Sketch_1.setVerticalDistance(SketchAPI_Line SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_1).startPoint(), SketchLine_3.startPoint(), "Shift", True) model.do() Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchArc_1_2f-SketchLine_2f-SketchLine_3f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("SOLID", "Box_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [0], [9], [18]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [0], [9], [18]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireVertex.py b/src/FeaturesPlugin/Test/TestSplitWireVertex.py similarity index 91% rename from src/FeaturesPlugin/Test/TestFillWireVertex.py rename to src/FeaturesPlugin/Test/TestSplitWireVertex.py index f6d405d49..5129c27c3 100644 --- a/src/FeaturesPlugin/Test/TestFillWireVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitWireVertex.py @@ -42,11 +42,11 @@ SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_1.startPoint() model.do() Wire_1_objects = [model.selection("EDGE", "Sketch_1/SketchLine_1"), model.selection("EDGE", "Sketch_1/SketchLine_2"), model.selection("EDGE", "Sketch_1/SketchLine_3")] Wire_1 = model.addWire(Part_1_doc, Wire_1_objects) -Fill_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkResult(Fill_1,model,1,[0],[0],[0],[4],[8]) -model.testHaveNamingSubshapes(Fill_1,model,Part_1_doc) +model.checkResult(Split_1,model,1,[0],[0],[0],[4],[8]) +model.testHaveNamingSubshapes(Split_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireWire.py b/src/FeaturesPlugin/Test/TestSplitWireWire.py similarity index 94% rename from src/FeaturesPlugin/Test/TestFillWireWire.py rename to src/FeaturesPlugin/Test/TestSplitWireWire.py index 8daed1bbe..5b93720bb 100644 --- a/src/FeaturesPlugin/Test/TestFillWireWire.py +++ b/src/FeaturesPlugin/Test/TestSplitWireWire.py @@ -56,11 +56,11 @@ SketchConstraintRadius_2 = Sketch_2.setRadius(SketchArc_2.results()[1], "R") model.do() Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_1/Face-SketchLine_1r-SketchLine_3f-SketchArc_1_2f_wire")]) Wire_2 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Face-SketchLine_4r-SketchLine_5f-SketchArc_2_2f_wire")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("WIRE", "Wire_2_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("WIRE", "Wire_2_1")]) model.do() -model.checkResult(Fill_1, model, 1, [0], [0], [0], [4], [8]) -model.testHaveNamingSubshapes(Fill_1, model, Part_1_doc) +model.checkResult(Split_1, model, 1, [0], [0], [0], [4], [8]) +model.testHaveNamingSubshapes(Split_1, model, Part_1_doc) model.end() diff --git a/src/ModelAPI/Test/Test2401.py b/src/ModelAPI/Test/Test2401.py index 57125b4fd..ac2c1e6b2 100644 --- a/src/ModelAPI/Test/Test2401.py +++ b/src/ModelAPI/Test/Test2401.py @@ -69,7 +69,7 @@ SketchConstraintHorizontal_2 = Sketch_2.setHorizontal(SketchLine_10.result()) SketchConstraintVertical_3 = Sketch_2.setVertical(SketchLine_11.result()) model.do() Face_1 = model.addFace(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchLine_8r-SketchLine_9f-SketchLine_10f-SketchLine_11f")]) -Fill_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], [model.selection("FACE", "Face_1_1")]) +Split_1 = model.addSplit(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() # now add an additional edge to the first sketch as it is described in the issue @@ -79,6 +79,6 @@ SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchLine_4.endPoint(), model.end() # check that the plane is located as previously -model.testNbSubResults(Fill_1, [2]) -model.testResultsVolumes(Fill_1, [120]) +model.testNbSubResults(Split_1, [2]) +model.testResultsVolumes(Split_1, [120]) assert(model.checkPythonDump()) -- 2.39.2