From: mpv Date: Wed, 28 Mar 2018 12:52:58 +0000 (+0300) Subject: Update of big models tests and the corresponding corrections. X-Git-Tag: V8_5_0rc2~8^2~22 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0d4bb6f484a079f70d051c431792399a10e7c3af;p=modules%2Fshaper.git Update of big models tests and the corresponding corrections. --- diff --git a/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp b/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp index 2f5412983..ea29c222d 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp @@ -216,9 +216,11 @@ void FeaturesPlugin_RemoveSubShapes::execute() AttributeSelectionPtr anAttrSelectionInList = aSubShapesAttrList->value(0); aResultShape = anAttrSelectionInList->value(); } + // deleted and copied must be jointed to one list which keeps all the history + GeomAlgoAPI_MakeShapeList aMakeShapeList; // find all removed shapes - GeomAlgoAPI_MakeShapeCustom aDeletedSubs; + std::shared_ptr aDeletedSubs(new GeomAlgoAPI_MakeShapeCustom); std::set aTypes; // types that where removed aTypes.insert(GeomAPI_Shape::FACE); for(GeomAPI_ShapeIterator anIt(aBaseShape); anIt.more(); anIt.next()) { @@ -233,32 +235,33 @@ void FeaturesPlugin_RemoveSubShapes::execute() } } if (anIndex == aSubsNb) { // not found in left - aDeletedSubs.addDeleted(anIt.current()); + aDeletedSubs->addDeleted(anIt.current()); aTypes.insert(anIt.current()->shapeType()); if (anIt.current()->shapeType() != GeomAPI_Shape::FACE) { GeomAPI_ShapeExplorer aFaces(anIt.current(), GeomAPI_Shape::FACE); for(; aFaces.more(); aFaces.next()) - aDeletedSubs.addDeleted(aFaces.current()); + aDeletedSubs->addDeleted(aFaces.current()); } } } + aMakeShapeList.appendAlgo(aDeletedSubs); - - GeomAlgoAPI_Copy aCopy(aResultShape); - aResultShape = aCopy.shape(); + std::shared_ptr aCopy(new GeomAlgoAPI_Copy(aResultShape)); + aResultShape = aCopy->shape(); + aMakeShapeList.appendAlgo(aCopy); // Store result. ResultBodyPtr aResultBody = document()->createBody(data()); aResultBody->storeModified(aBaseShape, aResultShape, 1); std::set::iterator aTypeIter = aTypes.begin(); for(; aTypeIter != aTypes.end(); aTypeIter++) - aResultBody->loadDeletedShapes(&aDeletedSubs, aBaseShape, *aTypeIter, 1); - aResultBody->loadAndOrientModifiedShapes(&aCopy, + aResultBody->loadDeletedShapes(&aMakeShapeList, aBaseShape, *aTypeIter, 1); + aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::FACE, 2, "Modified_Face", - *aCopy.mapOfSubShapes().get(), + *aMakeShapeList.mapOfSubShapes().get(), true, false, true); setResult(aResultBody); } diff --git a/src/GeomAPI/GeomAPI_Shape.cpp b/src/GeomAPI/GeomAPI_Shape.cpp index 9b2b5d959..49cc0cb6b 100644 --- a/src/GeomAPI/GeomAPI_Shape.cpp +++ b/src/GeomAPI/GeomAPI_Shape.cpp @@ -301,6 +301,8 @@ bool GeomAPI_Shape::isPlanar() const GeomAPI_Shape::ShapeType GeomAPI_Shape::shapeType() const { const TopoDS_Shape& aShape = impl(); + if (aShape.IsNull()) + return GeomAPI_Shape::SHAPE; ShapeType aST = GeomAPI_Shape::SHAPE; diff --git a/test.models/CSWA.py b/test.models/CSWA.py index 88870fb7f..91fe1738c 100644 --- a/test.models/CSWA.py +++ b/test.models/CSWA.py @@ -194,14 +194,14 @@ SketchConstraintCoincidence_41 = Sketch_6.setCoincident(SketchLine_14.endPoint() SketchConstraintCoincidence_41.setName("SketchConstraintCoincidence_42") model.do() ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("WIRE", "Sketch_6/Wire-SketchArc_10_2f-SketchLine_16r-SketchLine_18f-SketchLine_19r")], model.selection(), 0, 9, [model.selection("SOLID", "ExtrusionFuse_3_1")]) -Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_4")) +Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/From_Face_1")) SketchCircle_4 = Sketch_7.addCircle(45, 35, 5) -SketchLine_20 = Sketch_7.addLine(model.selection("EDGE", "ExtrusionCut_2_1/Modfied_2&ExtrusionCut_2_1/Modfied_4")) +SketchLine_20 = Sketch_7.addLine(model.selection("EDGE", "ExtrusionCut_2_1/Modfied_2&ExtrusionCut_2_1/From_Face_1")) SketchConstraintDistance_9 = Sketch_7.setDistance(SketchCircle_4.center(), SketchLine_20.result(), 10) SketchConstraintRadius_6 = Sketch_7.setRadius(SketchCircle_4.results()[1], "10/2") SketchLine_21 = Sketch_7.addLine(35, 35, 45, 35) SketchLine_21.setAuxiliary(True) -SketchPoint_5 = Sketch_7.addPoint(model.selection("VERTEX", "ExtrusionCut_2_1/Modfied_5&ExtrusionCut_2_1/Modfied_6&ExtrusionCut_2_1/Modfied_4")) +SketchPoint_5 = Sketch_7.addPoint(model.selection("VERTEX", "ExtrusionCut_2_1/Generated_Face_1&ExtrusionCut_2_1/Generated_Face_4&ExtrusionCut_2_1/From_Face_1")) SketchConstraintCoincidence_42 = Sketch_7.setCoincident(SketchLine_21.startPoint(), SketchPoint_5.result()) SketchConstraintCoincidence_42.setName("SketchConstraintCoincidence_43") SketchConstraintCoincidence_43 = Sketch_7.setCoincident(SketchCircle_4.center(), SketchLine_21.endPoint()) diff --git a/test.models/bobine_film_reel.py b/test.models/bobine_film_reel.py index 2bbe3fa8e..f4dad7328 100644 --- a/test.models/bobine_film_reel.py +++ b/test.models/bobine_film_reel.py @@ -87,7 +87,7 @@ SketchPoint_2 = Sketch_6.addPoint(model.selection("VERTEX", "PartSet/Origin")) SketchConstraintCoincidence_9 = Sketch_6.setCoincident(SketchPoint_2.coordinates(), SketchCircle_6.center()) SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_17") ExtrusionCut_1.setNestedSketch(Sketch_6) -Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_1_1/Modfied_1")) +Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_1_1/Modfied_2")) SketchCircle_7 = Sketch_7.addCircle(0, -85, 66) SketchLine_6 = Sketch_7.addLine(model.selection("EDGE", "PartSet/OY")) SketchConstraintCoincidence_10 = Sketch_7.setCoincident(SketchCircle_7.center(), SketchLine_6.result()) @@ -96,8 +96,8 @@ SketchConstraintDistance_1 = Sketch_7.setDistance(SketchCircle_7.center(), Sketc SketchMultiRotation_1 = Sketch_7.addRotation([SketchCircle_7.results()[1]], SketchLine_6.startPoint(), 120, 3) [SketchCircle_8, SketchCircle_9] = SketchMultiRotation_1.rotated() model.do() -ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_7")], model.selection(), model.selection("FACE", "ExtrusionCut_1_1/Modfied_2"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_1_1")]) -Sketch_8 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_8")) +ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_7")], model.selection(), model.selection("FACE", "ExtrusionCut_1_1/Modfied_1"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_1_1")]) +Sketch_8 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_1")) SketchLine_7 = Sketch_8.addLine(-2.320957096353877e-016, 11.00000001704673, -7, 11.00000001704673) SketchConstraintHorizontal_1 = Sketch_8.setHorizontal(SketchLine_7.result()) SketchLine_8 = Sketch_8.addLine(-7, 11.00000001704673, -6.329882773485103e-016, 30.00000001704673) @@ -126,7 +126,7 @@ SketchLine_14.result().setName("SketchLine_13") SketchLine_13.setName("SketchLine_16") SketchLine_13.result().setName("SketchLine_16") model.do() -ExtrusionCut_3 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_8/Face-SketchLine_7r-SketchLine_8r-SketchLine_10f-SketchLine_11f"), model.selection("FACE", "Sketch_8/Face-SketchLine_16f-SketchLine_17f-SketchLine_18r-SketchLine_19r"), model.selection("FACE", "Sketch_8/Face-SketchLine_12f-SketchLine_13f-SketchLine_14r-SketchLine_15r")], model.selection(), model.selection("FACE", "ExtrusionCut_2_1/Modfied_9"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_2_1")]) +ExtrusionCut_3 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_8/Face-SketchLine_7r-SketchLine_8r-SketchLine_10f-SketchLine_11f"), model.selection("FACE", "Sketch_8/Face-SketchLine_16f-SketchLine_17f-SketchLine_18r-SketchLine_19r"), model.selection("FACE", "Sketch_8/Face-SketchLine_12f-SketchLine_13f-SketchLine_14r-SketchLine_15r")], model.selection(), model.selection("FACE", "ExtrusionCut_2_1/Modfied_3"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_2_1")]) # Test reexecution after parameter change Parameter_R.setValue(50) diff --git a/test.models/case24.py b/test.models/case24.py index 247658ae5..a77f822ff 100644 --- a/test.models/case24.py +++ b/test.models/case24.py @@ -134,7 +134,7 @@ SketchLine_15.result().setName("SketchLine_19") SketchLine_16 = Sketch_3.addLine(-20, 0, 0, 0) SketchLine_16.setName("SketchLine_15") SketchLine_16.result().setName("SketchLine_15") -SketchPoint_2 = Sketch_3.addPoint(model.selection("VERTEX", "ExtrusionFuse_2_1/Modfied_7&ExtrusionFuse_2_1/Modfied_6&ExtrusionFuse_2_1/Modfied_8&ExtrusionFuse_2_1/Modfied_9")) +SketchPoint_2 = Sketch_3.addPoint(model.selection("VERTEX", "ExtrusionFuse_2_1/Modfied_9&ExtrusionFuse_2_1/Modfied_5&ExtrusionFuse_2_1/Modfied_8&ExtrusionFuse_2_1/Modfied_2")) SketchConstraintCoincidence_23 = Sketch_3.setCoincident(SketchLine_16.endPoint(), SketchPoint_2.result()) SketchLine_17 = Sketch_3.addLine(0, 0, 0, -20) SketchLine_17.setName("SketchLine_16") @@ -175,7 +175,7 @@ SketchConstraintParallel_1 = Sketch_3.setParallel(SketchLine_17.result(), Sketch SketchConstraintDistance_7 = Sketch_3.setDistance(SketchLine_21.startPoint(), SketchLine_18.result(), 3) model.do() RevolutionFuse_1 = model.addRevolutionFuse(Part_1_doc, [model.selection("COMPOUND", "Sketch_3")], model.selection("EDGE", "Sketch_3/Edge-SketchLine_21"), 71, 0, [model.selection("SOLID", "ExtrusionFuse_2_1")]) -Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "RevolutionFuse_1_1/Modfied_7")) +Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "RevolutionFuse_1_1/Modfied_4")) SketchLine_22 = Sketch_4.addLine(-3, -20, 17.00000452949485, -20) SketchLine_22.setName("SketchLine_26") SketchLine_22.result().setName("SketchLine_26") @@ -433,7 +433,7 @@ SketchLine_54.result().setName("SketchLine_55") SketchLine_54.setAuxiliary(True) SketchConstraintCoincidence_86 = Sketch_7.setCoincident(SketchLine_52.endPoint(), SketchLine_54.startPoint()) SketchConstraintCoincidence_86.setName("SketchConstraintCoincidence_96") -SketchLine_55 = Sketch_7.addLine(model.selection("EDGE", "RevolutionFuse_3_1/Modfied_11&RevolutionFuse_3_1/Modfied_8")) +SketchLine_55 = Sketch_7.addLine(model.selection("EDGE", "RevolutionFuse_3_1/Modfied_6&RevolutionFuse_3_1/Modfied_5")) SketchLine_55.setName("SketchLine_56") SketchLine_55.result().setName("SketchLine_56") SketchConstraintCoincidence_87 = Sketch_7.setCoincident(SketchLine_54.endPoint(), SketchLine_55.result()) @@ -648,7 +648,7 @@ Sketch_10 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOY")) SketchLine_77 = Sketch_10.addLine(64, 20, 89, 20) SketchLine_77.setName("SketchLine_76") SketchLine_77.result().setName("SketchLine_76") -SketchPoint_4 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_2_1/Modfied_9&RevolutionFuse_2_1/Modfied_12&RevolutionFuse_3_1/Modfied_12&RevolutionFuse_3_1/Modfied_1divided_f_1")) +SketchPoint_4 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_4/Vertex-SketchLine_22s-SketchLine_27e-SketchLine_25e")) SketchConstraintCoincidence_122 = Sketch_10.setCoincident(SketchLine_77.startPoint(), SketchPoint_4.result()) SketchConstraintCoincidence_122.setName("SketchConstraintCoincidence_120") SketchPoint_5 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_1s-SketchLine_8e-SketchLine_4e")) @@ -657,10 +657,10 @@ SketchConstraintCoincidence_123.setName("SketchConstraintCoincidence_121") SketchLine_78 = Sketch_10.addLine(64, -20, 89, -20) SketchLine_78.setName("SketchLine_77") SketchLine_78.result().setName("SketchLine_77") -SketchPoint_6 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_1_1/Modfied_4&RevolutionFuse_1_1/Modfied_10&RevolutionFuse_3_1/Modfied_13&RevolutionFuse_3_1/Modfied_1divided_f_2")) +SketchPoint_6 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_12&RevolutionFuse_1_1/Modfied_5&RevolutionFuse_3_1/Modfied_1divided_f_2&RevolutionFuse_1_1/Modfied_10")) SketchConstraintCoincidence_124 = Sketch_10.setCoincident(SketchLine_78.startPoint(), SketchPoint_6.result()) SketchConstraintCoincidence_124.setName("SketchConstraintCoincidence_122") -SketchPoint_7 = Sketch_10.addPoint(model.selection("VERTEX", "ExtrusionFuse_2_1/Modfied_3&RevolutionFuse_1_1/Modfied_4&ExtrusionFuse_2_1/Modfied_4&RevolutionFuse_3_1/Modfied_13")) +SketchPoint_7 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_2/Vertex-SketchLine_9s-SketchLine_14e-SketchLine_12e")) SketchConstraintCoincidence_125 = Sketch_10.setCoincident(SketchLine_78.endPoint(), SketchPoint_7.result()) SketchConstraintCoincidence_125.setName("SketchConstraintCoincidence_123") SketchArc_10 = Sketch_10.addArc(89.00000104846708, 1.669244441022778e-015, 89, -20, 89, 20, False) @@ -683,7 +683,7 @@ SketchConstraintCoincidence_129 = Sketch_10.setCoincident(SketchArc_11.startPoin SketchConstraintCoincidence_129.setName("SketchConstraintCoincidence_127") SketchConstraintTangent_19 = Sketch_10.setTangent(SketchArc_11.results()[1], SketchLine_78.result()) SketchConstraintTangent_19.setName("SketchConstraintTangent_24") -SketchPoint_8 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_1_1/Modfied_10&RevolutionFuse_3_1/Modfied_7&RevolutionFuse_3_1/Modfied_1divided_f_2")) +SketchPoint_8 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_1divided_f_2&RevolutionFuse_1_1/Modfied_10&RevolutionFuse_3_1/Modfied_8")) SketchConstraintCoincidence_130 = Sketch_10.setCoincident(SketchArc_11.endPoint(), SketchPoint_8.result()) SketchConstraintCoincidence_130.setName("SketchConstraintCoincidence_128") SketchArc_12 = Sketch_10.addArc(64.00001789135865, 23.01137360115889, 64, 20, 61.15622559702543, 22.02080994708722, True) @@ -694,7 +694,7 @@ SketchConstraintCoincidence_131 = Sketch_10.setCoincident(SketchArc_12.startPoin SketchConstraintCoincidence_131.setName("SketchConstraintCoincidence_129") SketchConstraintTangent_20 = Sketch_10.setTangent(SketchArc_12.results()[1], SketchLine_77.result()) SketchConstraintTangent_20.setName("SketchConstraintTangent_25") -SketchPoint_9 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_2_1/Modfied_12&RevolutionFuse_3_1/Modfied_4&RevolutionFuse_3_1/Modfied_1divided_f_1")) +SketchPoint_9 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_1divided_f_1&RevolutionFuse_2_1/Modfied_11&RevolutionFuse_3_1/Modfied_7")) SketchConstraintCoincidence_132 = Sketch_10.setCoincident(SketchArc_12.endPoint(), SketchPoint_9.result()) SketchConstraintCoincidence_132.setName("SketchConstraintCoincidence_130") SketchLine_79 = Sketch_10.addLine(61.15622559702543, 22.02080994708722, 59.81204392543111, 22.0208099470871) @@ -798,8 +798,8 @@ model.testNbResults(ExtrusionCut_4, 1) model.testNbSubResults(ExtrusionCut_4, [0]) model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.FACE, [81]) -model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.EDGE, [410]) -model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.VERTEX, [820]) +model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.EDGE, [406]) +model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.VERTEX, [812]) model.testResultsVolumes(ExtrusionCut_4, [502903.236060981987975537776947021]) assert(model.checkPythonDump()) diff --git a/test.models/clothespin.py b/test.models/clothespin.py index a7f26c547..32aa4baa4 100644 --- a/test.models/clothespin.py +++ b/test.models/clothespin.py @@ -465,7 +465,7 @@ SketchLine_56.setName("SketchLine_58") SketchLine_56.result().setName("SketchLine_58") model.do() ExtrusionFuse_1 = model.addExtrusionFuse(Part_1_doc, [model.selection("COMPOUND", "Sketch_6")], model.selection(), model.selection("FACE", "Sketch_1/Face-SketchLine_1f-SketchLine_3f-SketchLine_4f-SketchLine_5f-SketchLine_7f-SketchArc_1_2f-SketchLine_8f-SketchLine_9f-SketchLine_10r-SketchLine_11r-SketchLine_12r-SketchLine_14r-SketchArc_2_2r"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_5_1")]) -Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_9")) +Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_8")) SketchLine_64 = Sketch_7.addLine(50.25000000000001, -4.5, 31.24999999998802, -4.499999999999997) SketchLine_64.setName("SketchLine_76") SketchLine_64.result().setName("SketchLine_76") @@ -784,7 +784,7 @@ SketchConstraintCoincidence_141 = Sketch_8.setCoincident(SketchPoint_21.coordina SketchConstraintCoincidence_141.setName("SketchConstraintCoincidence_145") model.do() ExtrusionCut_7 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_8")], model.selection(), 10, 0, [model.selection("SOLID", "ExtrusionCut_6_1")]) -Sketch_9 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_32")) +Sketch_9 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_26")) SketchLine_94 = Sketch_9.addLine(21.00014787857639, 4.163450069699051, 21.00014787857639, 0) SketchLine_94.setName("SketchLine_107") SketchLine_94.result().setName("SketchLine_107") @@ -1396,7 +1396,7 @@ SketchLine_162.setName("SketchLine_58") SketchLine_162.result().setName("SketchLine_58") model.do() ExtrusionFuse_2 = model.addExtrusionFuse(Part_2_doc, [model.selection("COMPOUND", "Sketch_6")], model.selection(), model.selection("FACE", "Sketch_1/Face-SketchLine_1f-SketchLine_3f-SketchLine_4f-SketchLine_5f-SketchLine_7f-SketchArc_1_2f-SketchLine_8f-SketchLine_9f-SketchLine_10r-SketchLine_11r-SketchLine_12r-SketchLine_14r-SketchArc_2_2r"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_5_1")]) -Sketch_17 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_9")) +Sketch_17 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_8")) SketchLine_170 = Sketch_17.addLine(50.25000000000001, -4.5, 31.24999999998802, -4.499999999999997) SketchLine_170.setName("SketchLine_76") SketchLine_170.result().setName("SketchLine_76") @@ -1715,7 +1715,7 @@ SketchConstraintCoincidence_314 = Sketch_18.setCoincident(SketchPoint_45.coordin SketchConstraintCoincidence_314.setName("SketchConstraintCoincidence_145") model.do() ExtrusionCut_16 = model.addExtrusionCut(Part_2_doc, [model.selection("COMPOUND", "Sketch_8")], model.selection(), 10, 0, [model.selection("SOLID", "ExtrusionCut_6_1")]) -Sketch_19 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_32")) +Sketch_19 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_26")) SketchLine_200 = Sketch_19.addLine(21.00014787857639, 4.163450069699051, 21.00014787857639, 0) SketchLine_200.setName("SketchLine_107") SketchLine_200.result().setName("SketchLine_107") @@ -1885,7 +1885,7 @@ SketchConstraintDistance_34 = Sketch_20.setDistance(SketchLine_211.result(), Ske model.do() ExtrusionCut_18 = model.addExtrusionCut(Part_2_doc, [model.selection("WIRE", "Sketch_10/Wire-SketchCircle_1_2f")], model.selection(), 0, 0.75, [model.selection("SOLID", "ExtrusionCut_8_1")]) model.do() -Rotation_1 = model.addRotation(partSet, [model.selection("COMPOUND", "Part_2/")], model.selection("EDGE", "Part_1/ExtrusionCut_9_1/Modfied_1&ExtrusionCut_7_1/Modfied_33"), 180) +Rotation_1 = model.addRotation(partSet, [model.selection("COMPOUND", "Part_2/")], model.selection("EDGE", "Part_1/ExtrusionCut_9_1/Modfied_1&ExtrusionCut_7_1/Modfied_31"), 180) Placement_1 = model.addPlacement(partSet, [model.selection("COMPOUND", "Rotation_1/")], model.selection("FACE", "Rotation_1/ExtrusionCut_5_1/Modfied_1"), model.selection("FACE", "Part_1/ExtrusionCut_5_1/Modfied_1"), False, True) Rotation_2 = model.addRotation(partSet, [model.selection("COMPOUND", "Placement_1/")], model.selection("EDGE", "Part_1/ExtrusionCut_5_1/Modfied_5&ExtrusionCut_8_1/Modfied_3"), 7) Rotation_2.result().setColor(255, 85, 0)