From c7883041b5bedc605890958bfc618d46f9df9cda Mon Sep 17 00:00:00 2001 From: azv Date: Mon, 13 May 2019 08:11:47 +0300 Subject: [PATCH] Task 3.2. Concealment into multi-level Compounds Update behavior of CUT operation to keep hierarchy of compounds. --- src/FeaturesAPI/FeaturesAPI_BooleanCut.cpp | 19 ++- src/FeaturesAPI/FeaturesAPI_BooleanCut.h | 6 +- src/FeaturesPlugin/CMakeLists.txt | 5 +- src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp | 20 +++ src/FeaturesPlugin/FeaturesPlugin_Boolean.h | 5 + .../FeaturesPlugin_BooleanCommon.cpp | 11 +- .../FeaturesPlugin_BooleanCut.cpp | 63 ++++++++- .../FeaturesPlugin_BooleanCut.h | 3 + .../FeaturesPlugin_BooleanFuse.cpp | 11 +- ...anCommon_MultiLevelCompound_v20190506_2.py | 10 +- ...TestBooleanCut_MultiLevelCompound_v0_1.py} | 6 +- .../TestBooleanCut_MultiLevelCompound_v0_2.py | 121 ++++++++++++++++++ ...oleanCut_MultiLevelCompound_v20190506_1.py | 63 +++++++++ ...oleanCut_MultiLevelCompound_v20190506_2.py | 121 ++++++++++++++++++ 14 files changed, 426 insertions(+), 38 deletions(-) rename src/FeaturesPlugin/Test/{TestBooleanCut_MultiLevelCompound0.py => TestBooleanCut_MultiLevelCompound_v0_1.py} (97%) create mode 100644 src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py create mode 100644 src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py create mode 100644 src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py diff --git a/src/FeaturesAPI/FeaturesAPI_BooleanCut.cpp b/src/FeaturesAPI/FeaturesAPI_BooleanCut.cpp index 5b81a2be3..b0bbd4cb6 100644 --- a/src/FeaturesAPI/FeaturesAPI_BooleanCut.cpp +++ b/src/FeaturesAPI/FeaturesAPI_BooleanCut.cpp @@ -34,10 +34,12 @@ FeaturesAPI_BooleanCut::FeaturesAPI_BooleanCut(const std::shared_ptr& theFeature, const std::list& theMainObjects, - const std::list& theToolObjects) + const std::list& theToolObjects, + const int theVersion) : ModelHighAPI_Interface(theFeature) { if(initialize()) { + fillAttribute(theVersion, theFeature->integer(FeaturesPlugin_Boolean::VERSION_ID())); fillAttribute(theMainObjects, mymainObjects); fillAttribute(theToolObjects, mytoolObjects); @@ -79,17 +81,26 @@ void FeaturesAPI_BooleanCut::dump(ModelHighAPI_Dumper& theDumper) const aBase->selectionList(FeaturesPlugin_BooleanCut::OBJECT_LIST_ID()); AttributeSelectionListPtr aTools = aBase->selectionList(FeaturesPlugin_BooleanCut::TOOL_LIST_ID()); + AttributeIntegerPtr aVersion = + aBase->integer(FeaturesPlugin_BooleanCut::VERSION_ID()); - theDumper << "(" << aDocName << ", " << anObjects << ", " << aTools << ")" << std::endl; + theDumper << "(" << aDocName << ", " << anObjects << ", " << aTools; + + if (aVersion && aVersion->isInitialized()) + theDumper << ", " << aVersion->value(); + + theDumper << ")" << std::endl; } //================================================================================================== BooleanCutPtr addCut(const std::shared_ptr& thePart, const std::list& theMainObjects, - const std::list& theToolObjects) + const std::list& theToolObjects, + const int theVersion) { std::shared_ptr aFeature = thePart->addFeature(FeaturesAPI_BooleanCut::ID()); return BooleanCutPtr(new FeaturesAPI_BooleanCut(aFeature, theMainObjects, - theToolObjects)); + theToolObjects, + theVersion)); } diff --git a/src/FeaturesAPI/FeaturesAPI_BooleanCut.h b/src/FeaturesAPI/FeaturesAPI_BooleanCut.h index 82eb5ad99..b7d113aac 100644 --- a/src/FeaturesAPI/FeaturesAPI_BooleanCut.h +++ b/src/FeaturesAPI/FeaturesAPI_BooleanCut.h @@ -44,7 +44,8 @@ public: FEATURESAPI_EXPORT FeaturesAPI_BooleanCut(const std::shared_ptr& theFeature, const std::list& theMainObjects, - const std::list& theToolObjects); + const std::list& theToolObjects, + const int theVersion = 0); /// Destructor. FEATURESAPI_EXPORT @@ -77,6 +78,7 @@ typedef std::shared_ptr BooleanCutPtr; FEATURESAPI_EXPORT BooleanCutPtr addCut(const std::shared_ptr& thePart, const std::list& theMainObjects, - const std::list& theToolObjects); + const std::list& theToolObjects, + const int theVersion = 0); #endif // FeaturesAPI_BooleanCut_H_ diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index 8fbf6f076..3d99fb446 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -464,7 +464,10 @@ ADD_UNIT_TESTS(TestExtrusion.py TestBooleanCommon_MultiLevelCompound_v0_2.py TestBooleanCommon_MultiLevelCompound_v20190506_1.py TestBooleanCommon_MultiLevelCompound_v20190506_2.py - TestBooleanCut_MultiLevelCompound0.py + TestBooleanCut_MultiLevelCompound_v0_1.py + TestBooleanCut_MultiLevelCompound_v0_2.py + TestBooleanCut_MultiLevelCompound_v20190506_1.py + TestBooleanCut_MultiLevelCompound_v20190506_2.py TestBooleanFuse_MultiLevelCompound_v0_1.py TestBooleanFuse_MultiLevelCompound_v0_2.py TestBooleanFuse_MultiLevelCompound_v0_3.py diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp index ec55ff5e3..e39c1f99f 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp @@ -65,6 +65,21 @@ void FeaturesPlugin_Boolean::initAttributes() ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TOOL_LIST_ID()); } +//================================================================================================= +void FeaturesPlugin_Boolean::initVersion(const int theVersion) +{ + AttributePtr aVerAttr = data()->addAttribute(VERSION_ID(), ModelAPI_AttributeInteger::typeId()); + aVerAttr->setIsArgument(false); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), VERSION_ID()); + if (!integer(VERSION_ID())->isInitialized() && + !selectionList(OBJECT_LIST_ID())->isInitialized() && + !selectionList(TOOL_LIST_ID())->isInitialized()) { + // this is a newly created feature (not read from file), + // so, initialize the latest version + integer(VERSION_ID())->setValue(theVersion); + } +} + //================================================================================================= FeaturesPlugin_Boolean::OperationType FeaturesPlugin_Boolean::operationType() { @@ -368,6 +383,11 @@ bool FeaturesPlugin_Boolean::processCompound( ListOfShape aUsedInOperationShapes; ListOfShape aNotUsedShapes; theCompoundHierarchy.SplitCompound(theCompound, aUsedInOperationShapes, aNotUsedShapes); + if (theResultCompound) { + // Not necessary to keep all subs of the current compound, + // all unused solids are already stored in the result compound. + aNotUsedShapes.clear(); + } std::shared_ptr aMakeShapeList(new GeomAlgoAPI_MakeShapeList()); std::shared_ptr aBoolAlgo( diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.h b/src/FeaturesPlugin/FeaturesPlugin_Boolean.h index f2f11b354..6fe5a24d6 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.h +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.h @@ -78,6 +78,11 @@ protected: /// Use plugin manager for features creation. FeaturesPlugin_Boolean(const OperationType theOperationType); + /// Initialize version field of the Boolean feature. + /// The version is initialized for newly created features, + /// not read from previously stored document. + void initVersion(const int theVersion); + /// Load Naming data structure of the feature to the document void loadNamingDS(std::shared_ptr theResultBody, const std::shared_ptr theBaseShape, diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp index 484bd867d..9dd105a9d 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp @@ -54,16 +54,7 @@ void FeaturesPlugin_BooleanCommon::initAttributes() data()->addAttribute(OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()); data()->addAttribute(TOOL_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()); - AttributePtr aVerAttr = data()->addAttribute(VERSION_ID(), ModelAPI_AttributeInteger::typeId()); - aVerAttr->setIsArgument(false); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), VERSION_ID()); - if (!integer(VERSION_ID())->isInitialized() && - !selectionList(OBJECT_LIST_ID())->isInitialized() && - !selectionList(TOOL_LIST_ID())->isInitialized()) { - // this is a newly created feature (not read from file), - // so, initialize the latest version - integer(VERSION_ID())->setValue(THE_COMMON_VERSION_1); - } + initVersion(THE_COMMON_VERSION_1); } //================================================================================================== diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.cpp index be93d26ec..cb87cb69a 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.cpp @@ -35,12 +35,21 @@ #include #include +static const int THE_CUT_VERSION_1 = 20190506; + //================================================================================================== FeaturesPlugin_BooleanCut::FeaturesPlugin_BooleanCut() : FeaturesPlugin_Boolean(FeaturesPlugin_Boolean::BOOL_CUT) { } +//================================================================================================== +void FeaturesPlugin_BooleanCut::initAttributes() +{ + FeaturesPlugin_Boolean::initAttributes(); + initVersion(THE_CUT_VERSION_1); +} + //================================================================================================== void FeaturesPlugin_BooleanCut::execute() { @@ -60,10 +69,22 @@ void FeaturesPlugin_BooleanCut::execute() return; } + // version of CUT feature + int aCutVersion = version(); + std::vector aResultBaseAlgoList; ListOfShape aResultShapesList; std::string anError; + std::shared_ptr aMakeShapeList(new GeomAlgoAPI_MakeShapeList()); + + GeomShapePtr aResultCompound; + if (aCutVersion == THE_CUT_VERSION_1) { + // merge hierarchies of compounds containing objects and tools + aResultCompound = + keepUnusedSubsOfCompound(GeomShapePtr(), anObjects, aTools, aMakeShapeList); + } + // For solids cut each object with all tools. bool isOk = true; for (ObjectHierarchy::Iterator anObjectsIt = anObjects.Begin(); @@ -78,28 +99,60 @@ void FeaturesPlugin_BooleanCut::execute() // Compound handling isOk = processCompound(GeomAlgoAPI_Tools::BOOL_CUT, anObjects, aParent, aTools.Objects(), - aResultIndex, aResultBaseAlgoList, aResultShapesList); + aResultIndex, aResultBaseAlgoList, aResultShapesList, + aResultCompound); } else if (aShapeType == GeomAPI_Shape::COMPSOLID) { // Compsolid handling isOk = processCompsolid(GeomAlgoAPI_Tools::BOOL_CUT, anObjects, aParent, aTools.Objects(), ListOfShape(), - aResultIndex, aResultBaseAlgoList, aResultShapesList); + aResultIndex, aResultBaseAlgoList, aResultShapesList, + aResultCompound); } } else { // process object as is isOk = processObject(GeomAlgoAPI_Tools::BOOL_CUT, anObject, aTools.Objects(), aPlanes, - aResultIndex, aResultBaseAlgoList, aResultShapesList); + aResultIndex, aResultBaseAlgoList, aResultShapesList, + aResultCompound); + } + } + + GeomAPI_ShapeIterator aShapeIt(aResultCompound); + if (aShapeIt.more()) { + std::shared_ptr aResultBody = + document()->createBody(data(), aResultIndex); + + ListOfShape anObjectList = anObjects.Objects(); + ListOfShape aToolsList = aTools.Objects(); + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + anObjectList, + aToolsList, + aMakeShapeList, + aResultCompound); + setResult(aResultBody, aResultIndex++); + + // merge algorithms + FeaturesPlugin_Tools::ResultBaseAlgo aRBA; + aRBA.resultBody = aResultBody; + aRBA.baseShape = anObjectList.front(); + for (std::vector::iterator + aRBAIt = aResultBaseAlgoList.begin(); + aRBAIt != aResultBaseAlgoList.end(); ++aRBAIt) { + aMakeShapeList->appendAlgo(aRBAIt->makeShape); } + aRBA.makeShape = aMakeShapeList; + aResultBaseAlgoList.clear(); + aResultBaseAlgoList.push_back(aRBA); } // Store deleted shapes after all results has been proceeded. This is to avoid issue when in one // result shape has been deleted, but in another it was modified or stayed. - GeomShapePtr aResultShapesCompound = GeomAlgoAPI_CompoundBuilder::compound(aResultShapesList); + if (!aResultCompound) + aResultCompound = GeomAlgoAPI_CompoundBuilder::compound(aResultShapesList); FeaturesPlugin_Tools::loadDeletedShapes(aResultBaseAlgoList, aTools.Objects(), - aResultShapesCompound); + aResultCompound); // remove the rest results if there were produced in the previous pass removeResults(aResultIndex); diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.h b/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.h index ffd5c3486..76ffe70b1 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.h +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanCut.h @@ -46,6 +46,9 @@ public: return MY_KIND; } + /// Request for initialization of data model of the feature: adding all attributes. + FEATURESPLUGIN_EXPORT virtual void initAttributes(); + /// Creates a new part document if needed. FEATURESPLUGIN_EXPORT virtual void execute(); diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp index 84df36d06..a68ba8f50 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp @@ -62,16 +62,7 @@ void FeaturesPlugin_BooleanFuse::initAttributes() ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), OBJECT_LIST_ID()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TOOL_LIST_ID()); - AttributePtr aVerAttr = data()->addAttribute(VERSION_ID(), ModelAPI_AttributeInteger::typeId()); - aVerAttr->setIsArgument(false); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), VERSION_ID()); - if (!integer(VERSION_ID())->isInitialized() && - !selectionList(OBJECT_LIST_ID())->isInitialized() && - !selectionList(TOOL_LIST_ID())->isInitialized()) { - // this is a newly created feature (not read from file), - // so, initialize the latest version - integer(VERSION_ID())->setValue(THE_FUSE_VERSION_1); - } + initVersion(THE_FUSE_VERSION_1); } //================================================================================================== diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py index e95f88f05..3c5b105e3 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py @@ -112,10 +112,10 @@ from GeomAPI import GeomAPI_Shape model.testNbResults(Common_1, 1) model.testNbSubResults(Common_1, [4]) -model.testNbSubShapes(Common_1, GeomAPI_Shape.SOLID, [7]) -model.testNbSubShapes(Common_1, GeomAPI_Shape.FACE, [36]) -model.testNbSubShapes(Common_1, GeomAPI_Shape.EDGE, [134]) -model.testNbSubShapes(Common_1, GeomAPI_Shape.VERTEX, [268]) -model.testResultsVolumes(Common_1, [22834.734413125825]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.SOLID, [6]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.FACE, [33]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.EDGE, [128]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.VERTEX, [256]) +model.testResultsVolumes(Common_1, [16551.5491059462365]) assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound0.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py similarity index 97% rename from src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound0.py rename to src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py index a9001af7d..2acd77192 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound0.py +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py @@ -45,7 +45,9 @@ SketchConstraintRadius_2 = Sketch_2.setRadius(SketchCircle_2.results()[1], 3) model.do() Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchCircle_2_2f")], model.selection(), 5, 5) Cut_1 = model.addCut(Part_1_doc, [model.selection("SOLID", "LinearCopy_1_1_1_2")], [model.selection("SOLID", "Extrusion_2_1")]) -model.do() + +model.testHaveNamingSubshapes(Cut_1, model, Part_1_doc) + model.end() from GeomAPI import GeomAPI_Shape @@ -57,3 +59,5 @@ model.testNbSubShapes(Cut_1, GeomAPI_Shape.FACE, [8]) model.testNbSubShapes(Cut_1, GeomAPI_Shape.EDGE, [18]) model.testNbSubShapes(Cut_1, GeomAPI_Shape.VERTEX, [36]) model.testResultsVolumes(Cut_1, [1429.424657383355906858923844993]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py new file mode 100644 index 000000000..7a29bc0aa --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py @@ -0,0 +1,121 @@ +# Copyright (C) 2014-2019 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() +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False) +SketchLine_1 = SketchProjection_1.createdFeature() +SketchCircle_1 = Sketch_1.addCircle(0, 0, 10) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchAPI_Line(SketchLine_1).startPoint(), SketchCircle_1.center()) +SketchConstraintRadius_1 = Sketch_1.setRadius(SketchCircle_1.results()[1], 10) +SketchCircle_2 = Sketch_1.addCircle(10, 0, 10) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.result(), SketchCircle_2.center()) +SketchConstraintEqual_1 = Sketch_1.setEqual(SketchCircle_1.results()[1], SketchCircle_2.results()[1]) +SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchAPI_Line(SketchLine_1).startPoint(), SketchCircle_2.center(), 10) +model.do() +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], model.selection(), 20, 0) +Sketch_2 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchProjection_2 = Sketch_2.addProjection(model.selection("EDGE", "PartSet/OY"), False) +SketchLine_2 = SketchProjection_2.createdFeature() +SketchCircle_3 = Sketch_2.addCircle(0, -7, 10) +SketchConstraintCoincidence_3 = Sketch_2.setCoincident(SketchLine_2.result(), SketchCircle_3.center()) +SketchConstraintRadius_2 = Sketch_2.setRadius(SketchCircle_3.results()[1], 10) +SketchConstraintDistanceVertical_1 = Sketch_2.setVerticalDistance(SketchCircle_3.center(), SketchAPI_Line(SketchLine_2).startPoint(), 7) +SketchCircle_4 = Sketch_2.addCircle(40, -27, 10) +SketchConstraintEqual_2 = Sketch_2.setEqual(SketchCircle_4.results()[1], SketchCircle_3.results()[1]) +SketchConstraintDistanceHorizontal_2 = Sketch_2.setHorizontalDistance(SketchCircle_3.center(), SketchCircle_4.center(), 40) +SketchConstraintDistanceVertical_2 = Sketch_2.setVerticalDistance(SketchCircle_4.center(), SketchCircle_3.center(), 20) +model.do() +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "Sketch_2")], model.selection(), 20, 0) +Compound_1 = model.addCompound(Part_1_doc, [model.selection("SOLID", "Extrusion_2_1"), model.selection("SOLID", "Extrusion_2_2")]) +Compound_2 = model.addCompound(Part_1_doc, [model.selection("COMPOUND", "Compound_1_1"), model.selection("COMPSOLID", "Extrusion_1_1")]) +Compound_2.result().subResult(0).setColor(255, 170, 0) +Compound_2.result().subResult(0).subResult(0).setColor(255, 170, 0) +Compound_2.result().subResult(0).subResult(1).setColor(255, 170, 0) +Compound_2.result().subResult(1).setColor(0, 85, 255) +Compound_2.result().subResult(1).subResult(0).setColor(0, 85, 255) +Compound_2.result().subResult(1).subResult(1).setColor(0, 85, 255) +Compound_2.result().subResult(1).subResult(2).setColor(0, 85, 255) +Sketch_3 = model.addSketch(Part_1_doc, model.defaultPlane("YOZ")) +SketchLine_3 = Sketch_3.addLine(7, 0, -7, 0) +SketchLine_4 = Sketch_3.addLine(-7, 0, -7, 5) +SketchLine_5 = Sketch_3.addLine(-7, 5, 7, 5) +SketchLine_6 = Sketch_3.addLine(7, 5, 7, 0) +SketchConstraintCoincidence_4 = Sketch_3.setCoincident(SketchLine_6.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_5 = Sketch_3.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchConstraintCoincidence_6 = Sketch_3.setCoincident(SketchLine_4.endPoint(), SketchLine_5.startPoint()) +SketchConstraintCoincidence_7 = Sketch_3.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint()) +SketchConstraintHorizontal_1 = Sketch_3.setHorizontal(SketchLine_3.result()) +SketchConstraintVertical_1 = Sketch_3.setVertical(SketchLine_4.result()) +SketchConstraintHorizontal_2 = Sketch_3.setHorizontal(SketchLine_5.result()) +SketchConstraintVertical_2 = Sketch_3.setVertical(SketchLine_6.result()) +SketchProjection_3 = Sketch_3.addProjection(model.selection("EDGE", "PartSet/OZ"), False) +SketchLine_7 = SketchProjection_3.createdFeature() +SketchConstraintDistance_1 = Sketch_3.setDistance(SketchLine_5.endPoint(), SketchLine_7.result(), 7, True) +SketchConstraintMiddle_1 = Sketch_3.setMiddlePoint(SketchAPI_Line(SketchLine_7).startPoint(), SketchLine_3.result()) +SketchConstraintLength_1 = Sketch_3.setLength(SketchLine_4.result(), 5) +SketchLine_8 = Sketch_3.addLine(7, 7, -7.000000000000001, 7) +SketchLine_9 = Sketch_3.addLine(-7.000000000000001, 7, -7.000000000000001, 10) +SketchLine_10 = Sketch_3.addLine(-7.000000000000001, 10, 7, 10) +SketchLine_11 = Sketch_3.addLine(7, 10, 7, 7) +SketchConstraintCoincidence_8 = Sketch_3.setCoincident(SketchLine_11.endPoint(), SketchLine_8.startPoint()) +SketchConstraintCoincidence_9 = Sketch_3.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint()) +SketchConstraintCoincidence_10 = Sketch_3.setCoincident(SketchLine_9.endPoint(), SketchLine_10.startPoint()) +SketchConstraintCoincidence_11 = Sketch_3.setCoincident(SketchLine_10.endPoint(), SketchLine_11.startPoint()) +SketchConstraintHorizontal_3 = Sketch_3.setHorizontal(SketchLine_8.result()) +SketchConstraintVertical_3 = Sketch_3.setVertical(SketchLine_9.result()) +SketchConstraintHorizontal_4 = Sketch_3.setHorizontal(SketchLine_10.result()) +SketchConstraintVertical_4 = Sketch_3.setVertical(SketchLine_11.result()) +SketchConstraintCoincidence_12 = Sketch_3.setCoincident(SketchLine_9.startPoint(), SketchLine_4.result()) +SketchConstraintCoincidence_13 = Sketch_3.setCoincident(SketchLine_8.startPoint(), SketchLine_6.result()) +SketchConstraintLength_2 = Sketch_3.setLength(SketchLine_9.result(), 3) +SketchConstraintDistance_2 = Sketch_3.setDistance(SketchLine_9.startPoint(), SketchLine_5.result(), 2, True) +model.do() +Extrusion_3 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_3/Face-SketchLine_6r-SketchLine_5r-SketchLine_4r-SketchLine_3r")], model.selection(), 50, -10) +Extrusion_4 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_3/Face-SketchLine_11r-SketchLine_10r-SketchLine_9r-SketchLine_8r")], model.selection(), 60, 20) +AngularCopy_1 = model.addMultiRotation(Part_1_doc, [model.selection("SOLID", "Extrusion_4_1")], model.selection("EDGE", "PartSet/OZ"), 90, 2) +Compound_3 = model.addCompound(Part_1_doc, [model.selection("SOLID", "Extrusion_3_1"), model.selection("COMPOUND", "AngularCopy_1_1")]) +Compound_3.result().subResult(0).setColor(0, 170, 0) +Compound_3.result().subResult(1).setColor(0, 255, 0) +Compound_3.result().subResult(1).subResult(0).setColor(0, 255, 0) +Compound_3.result().subResult(1).subResult(1).setColor(0, 255, 0) +Cut_1 = model.addCut(Part_1_doc, [model.selection("SOLID", "Compound_2_1_1_1"), model.selection("SOLID", "Compound_2_1_2_3")], [model.selection("SOLID", "Compound_3_1_2_2")]) + +model.testHaveNamingSubshapes(Cut_1, model, Part_1_doc) + +model.end() + +from GeomAPI import GeomAPI_Shape + +model.testNbResults(Cut_1, 2) +model.testNbSubResults(Cut_1, [2, 3]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.SOLID, [2, 3]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.FACE, [10, 21]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.EDGE, [36, 98]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.VERTEX, [72, 196]) +model.testResultsVolumes(Cut_1, [11801.1921223872, 9624.313983209351]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py new file mode 100644 index 000000000..0729e5bb0 --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py @@ -0,0 +1,63 @@ +# Copyright (C) 2014-2019 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() +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchCircle_1 = Sketch_1.addCircle(10, 25, 5) +SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) +SketchPoint_1 = SketchProjection_1.createdFeature() +SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchCircle_1.center(), 10) +SketchConstraintDistanceVertical_1 = Sketch_1.setVerticalDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchCircle_1.center(), 25) +SketchConstraintRadius_1 = Sketch_1.setRadius(SketchCircle_1.results()[1], 5) +model.do() +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchCircle_1_2r")], model.selection(), 10, 0) +AngularCopy_1 = model.addMultiRotation(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], model.selection("EDGE", "PartSet/OZ"), 30, 2) +LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("COMPOUND", "AngularCopy_1_1")], model.selection("EDGE", "PartSet/OY"), 20, 2) +Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "LinearCopy_1_1_1_2/MF:Translated&Extrusion_1_1/To_Face")) +SketchProjection_2 = Sketch_2.addProjection(model.selection("VERTEX", "[LinearCopy_1_1_1_2/MF:Translated&Sketch_1/SketchCircle_1_2][LinearCopy_1_1_1_2/MF:Translated&Extrusion_1_1/To_Face]__cc"), False) +SketchPoint_2 = SketchProjection_2.createdFeature() +SketchCircle_2 = Sketch_2.addCircle(-3.839745962155611, 26.65063509461097, 3) +SketchConstraintCoincidence_1 = Sketch_2.setCoincident(SketchPoint_2.result(), SketchCircle_2.center()) +SketchConstraintRadius_2 = Sketch_2.setRadius(SketchCircle_2.results()[1], 3) +model.do() +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchCircle_2_2f")], model.selection(), 5, 5) +Cut_1 = model.addCut(Part_1_doc, [model.selection("SOLID", "LinearCopy_1_1_1_2")], [model.selection("SOLID", "Extrusion_2_1")], 20190506) + +model.testHaveNamingSubshapes(Cut_1, model, Part_1_doc) + +model.end() + +from GeomAPI import GeomAPI_Shape + +model.testNbResults(Cut_1, 1) +model.testNbSubResults(Cut_1, [3]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.SOLID, [4]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.FACE, [14]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.EDGE, [30]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.VERTEX, [60]) +model.testResultsVolumes(Cut_1, [3000.22098417825282]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py new file mode 100644 index 000000000..7c9432f9f --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py @@ -0,0 +1,121 @@ +# Copyright (C) 2014-2019 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() +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False) +SketchLine_1 = SketchProjection_1.createdFeature() +SketchCircle_1 = Sketch_1.addCircle(0, 0, 10) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchAPI_Line(SketchLine_1).startPoint(), SketchCircle_1.center()) +SketchConstraintRadius_1 = Sketch_1.setRadius(SketchCircle_1.results()[1], 10) +SketchCircle_2 = Sketch_1.addCircle(10, 0, 10) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.result(), SketchCircle_2.center()) +SketchConstraintEqual_1 = Sketch_1.setEqual(SketchCircle_1.results()[1], SketchCircle_2.results()[1]) +SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchAPI_Line(SketchLine_1).startPoint(), SketchCircle_2.center(), 10) +model.do() +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], model.selection(), 20, 0) +Sketch_2 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchProjection_2 = Sketch_2.addProjection(model.selection("EDGE", "PartSet/OY"), False) +SketchLine_2 = SketchProjection_2.createdFeature() +SketchCircle_3 = Sketch_2.addCircle(0, -7, 10) +SketchConstraintCoincidence_3 = Sketch_2.setCoincident(SketchLine_2.result(), SketchCircle_3.center()) +SketchConstraintRadius_2 = Sketch_2.setRadius(SketchCircle_3.results()[1], 10) +SketchConstraintDistanceVertical_1 = Sketch_2.setVerticalDistance(SketchCircle_3.center(), SketchAPI_Line(SketchLine_2).startPoint(), 7) +SketchCircle_4 = Sketch_2.addCircle(40, -27, 10) +SketchConstraintEqual_2 = Sketch_2.setEqual(SketchCircle_4.results()[1], SketchCircle_3.results()[1]) +SketchConstraintDistanceHorizontal_2 = Sketch_2.setHorizontalDistance(SketchCircle_3.center(), SketchCircle_4.center(), 40) +SketchConstraintDistanceVertical_2 = Sketch_2.setVerticalDistance(SketchCircle_4.center(), SketchCircle_3.center(), 20) +model.do() +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "Sketch_2")], model.selection(), 20, 0) +Compound_1 = model.addCompound(Part_1_doc, [model.selection("SOLID", "Extrusion_2_1"), model.selection("SOLID", "Extrusion_2_2")]) +Compound_2 = model.addCompound(Part_1_doc, [model.selection("COMPOUND", "Compound_1_1"), model.selection("COMPSOLID", "Extrusion_1_1")]) +Compound_2.result().subResult(0).setColor(255, 170, 0) +Compound_2.result().subResult(0).subResult(0).setColor(255, 170, 0) +Compound_2.result().subResult(0).subResult(1).setColor(255, 170, 0) +Compound_2.result().subResult(1).setColor(0, 85, 255) +Compound_2.result().subResult(1).subResult(0).setColor(0, 85, 255) +Compound_2.result().subResult(1).subResult(1).setColor(0, 85, 255) +Compound_2.result().subResult(1).subResult(2).setColor(0, 85, 255) +Sketch_3 = model.addSketch(Part_1_doc, model.defaultPlane("YOZ")) +SketchLine_3 = Sketch_3.addLine(7, 0, -7, 0) +SketchLine_4 = Sketch_3.addLine(-7, 0, -7, 5) +SketchLine_5 = Sketch_3.addLine(-7, 5, 7, 5) +SketchLine_6 = Sketch_3.addLine(7, 5, 7, 0) +SketchConstraintCoincidence_4 = Sketch_3.setCoincident(SketchLine_6.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_5 = Sketch_3.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchConstraintCoincidence_6 = Sketch_3.setCoincident(SketchLine_4.endPoint(), SketchLine_5.startPoint()) +SketchConstraintCoincidence_7 = Sketch_3.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint()) +SketchConstraintHorizontal_1 = Sketch_3.setHorizontal(SketchLine_3.result()) +SketchConstraintVertical_1 = Sketch_3.setVertical(SketchLine_4.result()) +SketchConstraintHorizontal_2 = Sketch_3.setHorizontal(SketchLine_5.result()) +SketchConstraintVertical_2 = Sketch_3.setVertical(SketchLine_6.result()) +SketchProjection_3 = Sketch_3.addProjection(model.selection("EDGE", "PartSet/OZ"), False) +SketchLine_7 = SketchProjection_3.createdFeature() +SketchConstraintDistance_1 = Sketch_3.setDistance(SketchLine_5.endPoint(), SketchLine_7.result(), 7, True) +SketchConstraintMiddle_1 = Sketch_3.setMiddlePoint(SketchAPI_Line(SketchLine_7).startPoint(), SketchLine_3.result()) +SketchConstraintLength_1 = Sketch_3.setLength(SketchLine_4.result(), 5) +SketchLine_8 = Sketch_3.addLine(7, 7, -7.000000000000001, 7) +SketchLine_9 = Sketch_3.addLine(-7.000000000000001, 7, -7.000000000000001, 10) +SketchLine_10 = Sketch_3.addLine(-7.000000000000001, 10, 7, 10) +SketchLine_11 = Sketch_3.addLine(7, 10, 7, 7) +SketchConstraintCoincidence_8 = Sketch_3.setCoincident(SketchLine_11.endPoint(), SketchLine_8.startPoint()) +SketchConstraintCoincidence_9 = Sketch_3.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint()) +SketchConstraintCoincidence_10 = Sketch_3.setCoincident(SketchLine_9.endPoint(), SketchLine_10.startPoint()) +SketchConstraintCoincidence_11 = Sketch_3.setCoincident(SketchLine_10.endPoint(), SketchLine_11.startPoint()) +SketchConstraintHorizontal_3 = Sketch_3.setHorizontal(SketchLine_8.result()) +SketchConstraintVertical_3 = Sketch_3.setVertical(SketchLine_9.result()) +SketchConstraintHorizontal_4 = Sketch_3.setHorizontal(SketchLine_10.result()) +SketchConstraintVertical_4 = Sketch_3.setVertical(SketchLine_11.result()) +SketchConstraintCoincidence_12 = Sketch_3.setCoincident(SketchLine_9.startPoint(), SketchLine_4.result()) +SketchConstraintCoincidence_13 = Sketch_3.setCoincident(SketchLine_8.startPoint(), SketchLine_6.result()) +SketchConstraintLength_2 = Sketch_3.setLength(SketchLine_9.result(), 3) +SketchConstraintDistance_2 = Sketch_3.setDistance(SketchLine_9.startPoint(), SketchLine_5.result(), 2, True) +model.do() +Extrusion_3 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_3/Face-SketchLine_6r-SketchLine_5r-SketchLine_4r-SketchLine_3r")], model.selection(), 50, -10) +Extrusion_4 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_3/Face-SketchLine_11r-SketchLine_10r-SketchLine_9r-SketchLine_8r")], model.selection(), 60, 20) +AngularCopy_1 = model.addMultiRotation(Part_1_doc, [model.selection("SOLID", "Extrusion_4_1")], model.selection("EDGE", "PartSet/OZ"), 90, 2) +Compound_3 = model.addCompound(Part_1_doc, [model.selection("SOLID", "Extrusion_3_1"), model.selection("COMPOUND", "AngularCopy_1_1")]) +Compound_3.result().subResult(0).setColor(0, 170, 0) +Compound_3.result().subResult(1).setColor(0, 255, 0) +Compound_3.result().subResult(1).subResult(0).setColor(0, 255, 0) +Compound_3.result().subResult(1).subResult(1).setColor(0, 255, 0) +Cut_1 = model.addCut(Part_1_doc, [model.selection("SOLID", "Compound_2_1_1_1"), model.selection("SOLID", "Compound_2_1_2_3")], [model.selection("SOLID", "Compound_3_1_2_2")], 20190506) + +model.testHaveNamingSubshapes(Cut_1, model, Part_1_doc) + +model.end() + +from GeomAPI import GeomAPI_Shape + +model.testNbResults(Cut_1, 1) +model.testNbSubResults(Cut_1, [5]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.SOLID, [7]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.FACE, [43]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.EDGE, [182]) +model.testNbSubShapes(Cut_1, GeomAPI_Shape.VERTEX, [364]) +model.testResultsVolumes(Cut_1, [27585.506105596567]) + +assert(model.checkPythonDump()) -- 2.39.2