From 9115b3cbfd263b5f8e10dd4e2f633f193c95e3c4 Mon Sep 17 00:00:00 2001 From: mpv Date: Tue, 9 Jan 2018 17:37:55 +0300 Subject: [PATCH] Debug for the issue #2391 --- src/FeaturesPlugin/FeaturesPlugin_Fillet.cpp | 1 - src/Model/Model_Update.cpp | 26 ++- src/ModelAPI/Test/Test2391.py | 226 +++++++++++++++++++ 3 files changed, 250 insertions(+), 3 deletions(-) create mode 100644 src/ModelAPI/Test/Test2391.py diff --git a/src/FeaturesPlugin/FeaturesPlugin_Fillet.cpp b/src/FeaturesPlugin/FeaturesPlugin_Fillet.cpp index 0df54c189..30f922aa8 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Fillet.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Fillet.cpp @@ -208,7 +208,6 @@ void FeaturesPlugin_Fillet::loadNamingDS( const int aSubsolidsTag = 4; theResultBody->storeModified(theBaseShape, theResultShape, aSubsolidsTag); - theResultBody->storeGenerated(theBaseShape, theResultShape); const std::string aModFaceName = "Modified_Face"; const std::string aFilletFaceName = "Fillet_Face"; diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp index 8e2ac8137..c412f3ea3 100755 --- a/src/Model/Model_Update.cpp +++ b/src/Model/Model_Update.cpp @@ -47,7 +47,7 @@ #include Model_Update MY_UPDATER_INSTANCE; /// the only one instance initialized on load of the library -//#define DEB_UPDATE +#define DEB_UPDATE Model_Update::Model_Update() { @@ -87,6 +87,7 @@ bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) { if (!theFeature->data()->isValid()) return false; // delete an extrusion created on the sketch + bool isNotExecuted = theFeature->isPersistentResult() && !std::dynamic_pointer_cast((theFeature)->document())->executeFeatures(); if (isNotExecuted) { @@ -301,12 +302,16 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag const std::set >& aRefs = (*anObjIter)->data()->refsToMe(); std::set >::const_iterator aRefIter = aRefs.cbegin(); + FeaturePtr aReason; + ResultPtr aReasonResult = std::dynamic_pointer_cast(*anObjIter); + if (aReasonResult.get()) + aReason = (*anObjIter)->document()->feature(aReasonResult); for(; aRefIter != aRefs.cend(); aRefIter++) { if (!(*aRefIter)->owner()->data()->isValid()) continue; FeaturePtr anUpdated = std::dynamic_pointer_cast((*aRefIter)->owner()); if (anUpdated.get()) { - if (addModified(anUpdated, FeaturePtr())) + if (addModified(anUpdated, aReason)) aSomeModified = true; } } @@ -593,6 +598,23 @@ bool Model_Update::processFeature(FeaturePtr theFeature) CompositeFeaturePtr aCurrentOwner = ModelAPI_Tools::compositeOwner(theFeature->document()->currentFeature(false)); isPostponedMain = aCurrentOwner.get() && aCompos->isSub(aCurrentOwner); + } else if (theFeature->getKind() == "Sketch" && + std::dynamic_pointer_cast((theFeature)->document())->executeFeatures()) { + // send event that sketch is prepared to be recomputed + static Events_ID anID = Events_Loop::eventByName("SketchPrepared"); + std::shared_ptr aMsg(new Events_Message(anID, this)); + Events_Loop* aLoop = Events_Loop::loop(); + aLoop->send(aMsg); + // check that sub-elements of sketch are updated => sketch must be re-processed + std::set aWholeR; + allReasons(theFeature, aWholeR); + std::set::iterator aRIter = aWholeR.begin(); + for(; aRIter != aWholeR.end(); aRIter++) { + if (myModified.find(*aRIter) != myModified.end()) { + processFeature(theFeature); + return true; + } + } } #ifdef DEB_UPDATE diff --git a/src/ModelAPI/Test/Test2391.py b/src/ModelAPI/Test/Test2391.py new file mode 100644 index 000000000..20d2655e0 --- /dev/null +++ b/src/ModelAPI/Test/Test2391.py @@ -0,0 +1,226 @@ +## Copyright (C) 2014-2017 CEA/DEN, EDF R&D +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## +## See http:##www.salome-platform.org/ or +## email : webmaster.salome@opencascade.com +## + +from SketchAPI import * +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +WidthParam = model.addParameter(Part_1_doc, "Width", "64") +model.addParameter(Part_1_doc, "Depth", "33") +model.addParameter(Part_1_doc, "D1_out", "38") +model.addParameter(Part_1_doc, "D2_out", "33") +model.addParameter(Part_1_doc, "D3_out", "30") +model.addParameter(Part_1_doc, "D4_out", "20") +model.addParameter(Part_1_doc, "D1_in", "21") +model.addParameter(Part_1_doc, "D2_in", "5") +model.addParameter(Part_1_doc, "Channel_Depth", "1.3") +model.addParameter(Part_1_doc, "Channel_Width", "1.5") +model.addParameter(Part_1_doc, "Drill1_Loc", "7.5") +model.addParameter(Part_1_doc, "Drill1_Radius", "2.25") +model.addParameter(Part_1_doc, "Drill1Holder_Width", "8") +model.addParameter(Part_1_doc, "Drill2_Loc", "6.5") +model.addParameter(Part_1_doc, "Drill2_Radius", "1.4") +model.addParameter(Part_1_doc, "Drill2_InnerRadius", "0.5") +model.addParameter(Part_1_doc, "Drill2_DepthMin", "6.5") +model.addParameter(Part_1_doc, "Drill2_DepthMax", "7.5") +model.addParameter(Part_1_doc, "Chamfer", "0.5") +model.addParameter(Part_1_doc, "Fillet1", "5") +model.addParameter(Part_1_doc, "Fillet2", "0.3") +model.addParameter(Part_1_doc, "Fillet3", "0.5") +model.addParameter(Part_1_doc, "Slot_Width", "8") +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchLine_1 = Sketch_1.addLine(0, 3, 0.5, 2.5) +SketchLine_2 = Sketch_1.addLine(0.5, 2.5, 9.5, 2.5) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) +SketchLine_3 = Sketch_1.addLine(9.5, 2.5, 9.5, 3.1) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) +SketchLine_4 = Sketch_1.addLine(9.5, 3.1, 24.86574363608673, 3.1) +SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchLine_5 = Sketch_1.addLine(24.86574363608673, 3.1, 26, 3.3) +SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_5.startPoint()) +SketchLine_6 = Sketch_1.addLine(26, 3.3, 26, 5.5) +SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint()) +SketchLine_7 = Sketch_1.addLine(31, 10.5, 64, 10.5) +SketchLine_8 = Sketch_1.addLine(64, 10.5, 64, 15) +SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_7.endPoint(), SketchLine_8.startPoint()) +SketchLine_9 = Sketch_1.addLine(64, 15, 61, 15) +SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint()) +SketchLine_10 = Sketch_1.addLine(61, 15, 61, 12.75) +SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_9.endPoint(), SketchLine_10.startPoint()) +SketchLine_11 = Sketch_1.addLine(61, 12.75, 58, 12.75) +SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchLine_10.endPoint(), SketchLine_11.startPoint()) +SketchLine_12 = Sketch_1.addLine(58, 12.75, 58, 14) +SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchLine_11.endPoint(), SketchLine_12.startPoint()) +SketchLine_13 = Sketch_1.addLine(58, 14, 57, 15) +SketchConstraintCoincidence_11 = Sketch_1.setCoincident(SketchLine_12.endPoint(), SketchLine_13.startPoint()) +SketchLine_14 = Sketch_1.addLine(57, 15, 54, 15) +SketchConstraintCoincidence_12 = Sketch_1.setCoincident(SketchLine_13.endPoint(), SketchLine_14.startPoint()) +SketchLine_15 = Sketch_1.addLine(54, 15, 52.5, 16.5) +SketchConstraintCoincidence_13 = Sketch_1.setCoincident(SketchLine_14.endPoint(), SketchLine_15.startPoint()) +SketchLine_16 = Sketch_1.addLine(52.5, 16.5, 35, 16.5) +SketchConstraintCoincidence_14 = Sketch_1.setCoincident(SketchLine_15.endPoint(), SketchLine_16.startPoint()) +SketchLine_17 = Sketch_1.addLine(35, 16.5, 34, 15.5) +SketchConstraintCoincidence_15 = Sketch_1.setCoincident(SketchLine_16.endPoint(), SketchLine_17.startPoint()) +SketchLine_18 = Sketch_1.addLine(34, 15.5, 32, 15.5) +SketchConstraintCoincidence_16 = Sketch_1.setCoincident(SketchLine_17.endPoint(), SketchLine_18.startPoint()) +SketchLine_19 = Sketch_1.addLine(32, 15.5, 32, 19) +SketchConstraintCoincidence_17 = Sketch_1.setCoincident(SketchLine_18.endPoint(), SketchLine_19.startPoint()) +SketchLine_20 = Sketch_1.addLine(32, 19, 22.5, 19) +SketchConstraintCoincidence_18 = Sketch_1.setCoincident(SketchLine_19.endPoint(), SketchLine_20.startPoint()) +SketchLine_21 = Sketch_1.addLine(22.5, 19, 22.5, 13) +SketchConstraintCoincidence_19 = Sketch_1.setCoincident(SketchLine_20.endPoint(), SketchLine_21.startPoint()) +SketchLine_22 = Sketch_1.addLine(22.5, 13, 22, 12.5) +SketchConstraintCoincidence_20 = Sketch_1.setCoincident(SketchLine_21.endPoint(), SketchLine_22.startPoint()) +SketchLine_23 = Sketch_1.addLine(22, 12.5, 22, 10) +SketchConstraintCoincidence_21 = Sketch_1.setCoincident(SketchLine_22.endPoint(), SketchLine_23.startPoint()) +SketchLine_24 = Sketch_1.addLine(22, 10, 20, 10) +SketchConstraintCoincidence_22 = Sketch_1.setCoincident(SketchLine_23.endPoint(), SketchLine_24.startPoint()) +SketchLine_25 = Sketch_1.addLine(20, 10, 20, 8.699999999999999) +SketchConstraintCoincidence_23 = Sketch_1.setCoincident(SketchLine_24.endPoint(), SketchLine_25.startPoint()) +SketchLine_26 = Sketch_1.addLine(20, 8.699999999999999, 18.5, 8.699999999999999) +SketchConstraintCoincidence_24 = Sketch_1.setCoincident(SketchLine_25.endPoint(), SketchLine_26.startPoint()) +SketchLine_27 = Sketch_1.addLine(18.5, 8.699999999999999, 18.5, 10) +SketchConstraintCoincidence_25 = Sketch_1.setCoincident(SketchLine_26.endPoint(), SketchLine_27.startPoint()) +SketchLine_28 = Sketch_1.addLine(18.5, 10, 10.5, 10) +SketchConstraintCoincidence_26 = Sketch_1.setCoincident(SketchLine_27.endPoint(), SketchLine_28.startPoint()) +SketchLine_29 = Sketch_1.addLine(10.5, 10, 10.5, 8.699999999999999) +SketchConstraintCoincidence_27 = Sketch_1.setCoincident(SketchLine_28.endPoint(), SketchLine_29.startPoint()) +SketchLine_30 = Sketch_1.addLine(10.5, 8.699999999999999, 9, 8.699999999999999) +SketchConstraintCoincidence_28 = Sketch_1.setCoincident(SketchLine_29.endPoint(), SketchLine_30.startPoint()) +SketchLine_31 = Sketch_1.addLine(9, 8.699999999999999, 9, 10) +SketchConstraintCoincidence_29 = Sketch_1.setCoincident(SketchLine_30.endPoint(), SketchLine_31.startPoint()) +SketchLine_32 = Sketch_1.addLine(9, 10, 0.5, 10) +SketchConstraintCoincidence_30 = Sketch_1.setCoincident(SketchLine_31.endPoint(), SketchLine_32.startPoint()) +SketchLine_33 = Sketch_1.addLine(0.5, 10, 0, 9.5) +SketchConstraintCoincidence_31 = Sketch_1.setCoincident(SketchLine_32.endPoint(), SketchLine_33.startPoint()) +SketchLine_34 = Sketch_1.addLine(0, 9.5, 0, 3) +SketchConstraintCoincidence_32 = Sketch_1.setCoincident(SketchLine_33.endPoint(), SketchLine_34.startPoint()) +SketchConstraintCoincidence_33 = Sketch_1.setCoincident(SketchLine_1.startPoint(), SketchLine_34.endPoint()) +SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_2.result()) +SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_3.result()) +SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_4.result()) +SketchConstraintAngle_1 = Sketch_1.setAngleComplementary(SketchLine_4.result(), SketchLine_5.result(), 10.00000000008873) +SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_6.result()) +SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_7.result()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) +SketchPoint_1 = SketchProjection_1.createdFeature() +SketchConstraintDistanceVertical_1 = Sketch_1.setVerticalDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_1.endPoint(), "D2_in/2") +SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_8.result()) +SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_9.result()) +SketchConstraintParallel_1 = Sketch_1.setParallel(SketchLine_16.result(), SketchLine_7.result()) +SketchConstraintAngle_2 = Sketch_1.setAngleComplementary(SketchLine_15.result(), SketchLine_16.result(), 45.00000000000006) +SketchConstraintAngle_3 = Sketch_1.setAngleComplementary(SketchLine_13.result(), SketchLine_14.result(), 45.00000000000006) +SketchConstraintVertical_4 = Sketch_1.setVertical(SketchLine_12.result()) +SketchConstraintVertical_5 = Sketch_1.setVertical(SketchLine_10.result()) +SketchConstraintHorizontal_5 = Sketch_1.setHorizontal(SketchLine_11.result()) +SketchConstraintPerpendicular_1 = Sketch_1.setPerpendicular(SketchLine_17.result(), SketchLine_15.result()) +SketchConstraintVertical_6 = Sketch_1.setVertical(SketchLine_19.result()) +SketchConstraintHorizontal_6 = Sketch_1.setHorizontal(SketchLine_18.result()) +SketchConstraintParallel_2 = Sketch_1.setParallel(SketchLine_20.result(), SketchLine_7.result()) +SketchConstraintParallel_3 = Sketch_1.setParallel(SketchLine_21.result(), SketchLine_19.result()) +SketchConstraintVertical_7 = Sketch_1.setVertical(SketchLine_23.result()) +SketchConstraintHorizontal_7 = Sketch_1.setHorizontal(SketchLine_24.result()) +SketchConstraintCollinear_1 = Sketch_1.setCollinear(SketchLine_28.result(), SketchLine_24.result()) +SketchConstraintCollinear_2 = Sketch_1.setCollinear(SketchLine_32.result(), SketchLine_28.result()) +SketchConstraintVertical_8 = Sketch_1.setVertical(SketchLine_34.result()) +SketchConstraintHorizontal_8 = Sketch_1.setHorizontal(SketchLine_30.result()) +SketchConstraintCollinear_3 = Sketch_1.setCollinear(SketchLine_26.result(), SketchLine_30.result()) +SketchConstraintVertical_9 = Sketch_1.setVertical(SketchLine_31.result()) +SketchConstraintVertical_10 = Sketch_1.setVertical(SketchLine_29.result()) +SketchConstraintVertical_11 = Sketch_1.setVertical(SketchLine_27.result()) +SketchConstraintVertical_12 = Sketch_1.setVertical(SketchLine_25.result()) +SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_24.result(), "D4_out/2", True) +SketchConstraintDistance_2 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_30.result(), "D4_out/2-Channel_Depth", True) +SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchLine_34.endPoint(), SketchLine_1.endPoint(), "Chamfer") +SketchConstraintDistanceVertical_2 = Sketch_1.setVerticalDistance(SketchLine_1.endPoint(), SketchLine_1.startPoint(), "Chamfer") +SketchConstraintDistanceHorizontal_2 = Sketch_1.setHorizontalDistance(SketchLine_34.startPoint(), SketchLine_33.startPoint(), "Chamfer") +SketchConstraintDistanceVertical_3 = Sketch_1.setVerticalDistance(SketchLine_34.startPoint(), SketchLine_33.startPoint(), "Chamfer") +SketchProjection_2 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False) +SketchLine_35 = SketchProjection_2.createdFeature() +SketchConstraintDistance_3 = Sketch_1.setDistance(SketchLine_3.endPoint(), SketchLine_35.result(), "D2_in/2+0.6", True) +SketchConstraintDistanceHorizontal_3 = Sketch_1.setHorizontalDistance(SketchLine_3.endPoint(), SketchLine_5.endPoint(), "Depth/2") +SketchConstraintDistance_4 = Sketch_1.setDistance(SketchLine_5.endPoint(), SketchLine_35.result(), "D2_in/2+0.8", True) +SketchArc_1 = Sketch_1.addArc(31, 5.5, 31, 10.5, 26, 5.5, False) +SketchConstraintCoincidence_34 = Sketch_1.setCoincident(SketchArc_1.startPoint(), SketchLine_7.startPoint()) +SketchConstraintCoincidence_35 = Sketch_1.setCoincident(SketchArc_1.endPoint(), SketchLine_6.endPoint()) +SketchConstraintTangent_1 = Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_7.result()) +SketchConstraintTangent_2 = Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_6.result()) +SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_1.results()[1], "Fillet1") +SketchConstraintDistance_5 = Sketch_1.setDistance(SketchLine_7.endPoint(), SketchLine_35.result(), "D1_in/2", True) +SketchConstraintAngle_4 = Sketch_1.setAngleComplementary(SketchLine_23.result(), SketchLine_22.result(), 44.99999999999992) +SketchConstraintCollinear_4 = Sketch_1.setCollinear(SketchLine_14.result(), SketchLine_9.result()) +SketchConstraintDistanceHorizontal_4 = Sketch_1.setHorizontalDistance(SketchLine_34.startPoint(), SketchLine_23.startPoint(), "Width/32*11") +SketchConstraintDistanceHorizontal_5 = Sketch_1.setHorizontalDistance(SketchLine_23.startPoint(), SketchLine_22.startPoint(), "Chamfer") +SketchConstraintDistanceHorizontal_6 = Sketch_1.setHorizontalDistance(SketchLine_15.startPoint(), SketchLine_8.endPoint(), 10) +SketchConstraintDistance_6 = Sketch_1.setDistance(SketchLine_8.endPoint(), SketchLine_35.result(), "D3_out/2", True) +SketchConstraintDistance_7 = Sketch_1.setDistance(SketchLine_11.startPoint(), SketchLine_35.result(), "(D3_out+D1_in)/4", True) +SketchConstraintDistanceHorizontal_7 = Sketch_1.setHorizontalDistance(SketchLine_10.startPoint(), SketchLine_8.endPoint(), 3) +SketchConstraintDistanceHorizontal_8 = Sketch_1.setHorizontalDistance(SketchLine_12.endPoint(), SketchLine_10.startPoint(), 3) +SketchConstraintEqual_1 = Sketch_1.setEqual(SketchLine_30.result(), SketchLine_26.result()) +SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_26.result(), "Channel_Width") +SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_28.result(), "Drill1Holder_Width") +SketchConstraintDistanceHorizontal_9 = Sketch_1.setHorizontalDistance(SketchArc_1.center(), SketchLine_7.endPoint(), "Depth") +SketchConstraintDistance_8 = Sketch_1.setDistance(SketchLine_16.startPoint(), SketchLine_35.result(), "D2_out/2", True) +SketchConstraintDistanceHorizontal_10 = Sketch_1.setHorizontalDistance(SketchLine_20.startPoint(), SketchLine_8.endPoint(), "Width/2") +SketchConstraintDistance_9 = Sketch_1.setDistance(SketchLine_17.endPoint(), SketchLine_35.result(), "D2_out/2-1", True) +SketchConstraintDistanceHorizontal_11 = Sketch_1.setHorizontalDistance(SketchLine_20.startPoint(), SketchLine_17.endPoint(), 2) +SketchConstraintCoincidence_36 = Sketch_1.setCoincident(SketchAPI_Line(SketchLine_35).startPoint(), SketchLine_34.result()) +SketchConstraintDistance_10 = Sketch_1.setDistance(SketchAPI_Line(SketchLine_35).startPoint(), SketchLine_20.result(), "D1_out/2", True) +SketchPoint_2 = Sketch_1.addPoint(14.5, 10) +SketchConstraintCoincidence_37 = Sketch_1.setCoincident(SketchPoint_2.coordinates(), SketchLine_28.result()) +SketchConstraintMiddle_1 = Sketch_1.setMiddlePoint(SketchPoint_2.coordinates(), SketchLine_28.result()) +SketchConstraintDistanceHorizontal_12 = Sketch_1.setHorizontalDistance(SketchPoint_2.coordinates(), SketchLine_24.startPoint(), "Drill1_Loc") +SketchConstraintDistanceHorizontal_13 = Sketch_1.setHorizontalDistance(SketchLine_34.startPoint(), SketchLine_9.startPoint(), "Width") +SketchConstraintDistanceHorizontal_14 = Sketch_1.setHorizontalDistance(SketchLine_14.startPoint(), SketchLine_12.endPoint(), 1) +SketchConstraintDistance_11 = Sketch_1.setDistance(SketchLine_23.startPoint(), SketchLine_35.result(), "(D4_out+D2_in)/2", True) +model.do() +Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], model.selection("EDGE", "PartSet/OX"), 360, 0) +Plane_4 = model.addPlane(Part_1_doc, model.selection("EDGE", "PartSet/OY"), model.selection("VERTEX", "Sketch_1/Vertex-SketchPoint_2"), True) +Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) +SketchProjection_3 = Sketch_2.addProjection(model.selection("VERTEX", "Sketch_1/Vertex-SketchPoint_2"), False) +SketchPoint_3 = SketchProjection_3.createdFeature() +SketchProjection_4 = Sketch_2.addProjection(model.selection("EDGE", "Revolution_1_1/Generated_Face_28"), False) +SketchLine_36 = SketchProjection_4.createdFeature() +SketchCircle_1 = Sketch_2.addCircle(14.5, 0, 2.25) +SketchConstraintCoincidence_38 = Sketch_2.setCoincident(SketchPoint_3.result(), SketchCircle_1.center()) +SketchConstraintRadius_2 = Sketch_2.setRadius(SketchCircle_1.results()[1], "Drill1_Radius") +model.do() +ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchCircle_1_2f")], model.selection(), model.selection("FACE", "PartSet/XOZ"), 0, model.selection(), 0, [model.selection("SOLID", "Revolution_1_1")]) +Fillet_1 = model.addFillet(Part_1_doc, [model.selection("EDGE", "Revolution_1_1/Generated_Face_14&Revolution_1_1/Generated_Face_15")], "Fillet1") +Fillet_2_objects = [model.selection("FACE", "Revolution_1_1/Generated_Face_4"), model.selection("FACE", "Revolution_1_1/Generated_Face_6"), model.selection("FACE", "Revolution_1_1/Generated_Face_8"), model.selection("FACE", "Revolution_1_1/Generated_Face_10")] +Fillet_2 = model.addFillet(Part_1_doc, Fillet_2_objects, "Fillet2") +model.do() + +# update a parameter Width value to 80 and check that result is correct +WidthParam.setValue(80) +model.do() + +import ModelAPI +assert(ModelAPI.ModelAPI_Session.get().validators().validate(Fillet_2.feature())) + +from GeomAPI import * +model.testHaveNamingByType(Fillet_2, model, Part_1_doc, GeomAPI_Shape.FACE) + +model.end() + +assert(model.checkPythonDump()) -- 2.30.2