From 1c211701f7bcc21ef86892d889d7c58e9b276adb Mon Sep 17 00:00:00 2001 From: azv Date: Sat, 11 May 2019 22:19:00 +0300 Subject: [PATCH] Task 3.2. Concealment into multi-level Compounds Update behavior of COMMON operation to keep hierarchy of compounds. --- src/FeaturesAPI/FeaturesAPI_BooleanCommon.cpp | 25 ++- src/FeaturesAPI/FeaturesAPI_BooleanCommon.h | 12 +- src/FeaturesPlugin/CMakeLists.txt | 5 +- src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp | 160 +++++++++++++----- src/FeaturesPlugin/FeaturesPlugin_Boolean.h | 30 +++- .../FeaturesPlugin_BooleanCommon.cpp | 73 +++++++- .../FeaturesPlugin_BooleanFuse.cpp | 36 +--- .../FeaturesPlugin_BooleanFuse.h | 12 -- ...tBooleanCommon_MultiLevelCompound_v0_1.py} | 10 +- ...stBooleanCommon_MultiLevelCompound_v0_2.py | 121 +++++++++++++ ...anCommon_MultiLevelCompound_v20190506_1.py | 96 +++++++++++ ...anCommon_MultiLevelCompound_v20190506_2.py | 121 +++++++++++++ 12 files changed, 585 insertions(+), 116 deletions(-) rename src/FeaturesPlugin/Test/{TestBooleanCommon_MultiLevelCompound0.py => TestBooleanCommon_MultiLevelCompound_v0_1.py} (97%) create mode 100644 src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py create mode 100644 src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py create mode 100644 src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py diff --git a/src/FeaturesAPI/FeaturesAPI_BooleanCommon.cpp b/src/FeaturesAPI/FeaturesAPI_BooleanCommon.cpp index b036ab38e..d928b89da 100644 --- a/src/FeaturesAPI/FeaturesAPI_BooleanCommon.cpp +++ b/src/FeaturesAPI/FeaturesAPI_BooleanCommon.cpp @@ -34,11 +34,13 @@ FeaturesAPI_BooleanCommon::FeaturesAPI_BooleanCommon( //================================================================================================== FeaturesAPI_BooleanCommon::FeaturesAPI_BooleanCommon( const std::shared_ptr& theFeature, - const std::list& theMainObjects) + const std::list& theMainObjects, + const int theVersion) : ModelHighAPI_Interface(theFeature) { if(initialize()) { fillAttribute(FeaturesPlugin_BooleanCommon::CREATION_METHOD_SIMPLE(), mycreationMethod); + fillAttribute(theVersion, theFeature->integer(FeaturesPlugin_Boolean::VERSION_ID())); fillAttribute(theMainObjects, mymainObjects); execute(false); @@ -49,11 +51,13 @@ FeaturesAPI_BooleanCommon::FeaturesAPI_BooleanCommon( FeaturesAPI_BooleanCommon::FeaturesAPI_BooleanCommon( 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(FeaturesPlugin_BooleanCommon::CREATION_METHOD_ADVANCED(), mycreationMethod); + fillAttribute(theVersion, theFeature->integer(FeaturesPlugin_Boolean::VERSION_ID())); fillAttribute(theMainObjects, mymainObjects); fillAttribute(theToolObjects, mytoolObjects); @@ -111,6 +115,8 @@ void FeaturesAPI_BooleanCommon::dump(ModelHighAPI_Dumper& theDumper) const aBase->selectionList(FeaturesPlugin_BooleanCommon::OBJECT_LIST_ID()); AttributeSelectionListPtr aTools = aBase->selectionList(FeaturesPlugin_BooleanCommon::TOOL_LIST_ID()); + AttributeIntegerPtr aVersion = + aBase->integer(FeaturesPlugin_BooleanCommon::VERSION_ID()); theDumper << "(" << aDocName << ", " << anObjects; @@ -118,24 +124,31 @@ void FeaturesAPI_BooleanCommon::dump(ModelHighAPI_Dumper& theDumper) const theDumper << ", " << aTools; } + if (aVersion && aVersion->isInitialized()) { + theDumper << ", " << aVersion->value(); + } + theDumper << ")" << std::endl; } //================================================================================================== BooleanCommonPtr addCommon(const std::shared_ptr& thePart, - const std::list& theMainObjects) + const std::list& theMainObjects, + const int theVersion) { std::shared_ptr aFeature = thePart->addFeature(FeaturesAPI_BooleanCommon::ID()); - return BooleanCommonPtr(new FeaturesAPI_BooleanCommon(aFeature, theMainObjects)); + return BooleanCommonPtr(new FeaturesAPI_BooleanCommon(aFeature, theMainObjects, theVersion)); } //================================================================================================== BooleanCommonPtr addCommon(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_BooleanCommon::ID()); return BooleanCommonPtr(new FeaturesAPI_BooleanCommon(aFeature, theMainObjects, - theToolObjects)); + theToolObjects, + theVersion)); } diff --git a/src/FeaturesAPI/FeaturesAPI_BooleanCommon.h b/src/FeaturesAPI/FeaturesAPI_BooleanCommon.h index 9005aed2b..3470276b7 100644 --- a/src/FeaturesAPI/FeaturesAPI_BooleanCommon.h +++ b/src/FeaturesAPI/FeaturesAPI_BooleanCommon.h @@ -43,13 +43,15 @@ public: /// Constructor with values. FEATURESAPI_EXPORT FeaturesAPI_BooleanCommon(const std::shared_ptr& theFeature, - const std::list& theMainObjects); + const std::list& theMainObjects, + const int theVersion = 0); /// Constructor with values. FEATURESAPI_EXPORT FeaturesAPI_BooleanCommon(const std::shared_ptr& theFeature, const std::list& theMainObjects, - const std::list& theToolObjects); + const std::list& theToolObjects, + const int theVersion = 0); /// Destructor. FEATURESAPI_EXPORT @@ -87,13 +89,15 @@ typedef std::shared_ptr BooleanCommonPtr; /// \brief Create Boolean Common feature. FEATURESAPI_EXPORT BooleanCommonPtr addCommon(const std::shared_ptr& thePart, - const std::list& theMainObjects); + const std::list& theMainObjects, + const int theVersion = 0); /// \ingroup CPPHighAPI /// \brief Create Boolean Common feature. FEATURESAPI_EXPORT BooleanCommonPtr addCommon(const std::shared_ptr& thePart, const std::list& theMainObjects, - const std::list& theToolObjects); + const std::list& theToolObjects, + const int theVersion = 0); #endif // FeaturesAPI_BooleanCommon_H_ diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index 82fd74586..8fbf6f076 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -460,7 +460,10 @@ ADD_UNIT_TESTS(TestExtrusion.py Test2826.py Test2854.py Test2878.py - TestBooleanCommon_MultiLevelCompound0.py + TestBooleanCommon_MultiLevelCompound_v0_1.py + TestBooleanCommon_MultiLevelCompound_v0_2.py + TestBooleanCommon_MultiLevelCompound_v20190506_1.py + TestBooleanCommon_MultiLevelCompound_v20190506_2.py TestBooleanCut_MultiLevelCompound0.py TestBooleanFuse_MultiLevelCompound_v0_1.py TestBooleanFuse_MultiLevelCompound_v0_2.py diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp index 856d8d467..ec55ff5e3 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp @@ -154,7 +154,8 @@ bool FeaturesPlugin_Boolean::processObject( const ListOfShape& thePlanes, int& theResultIndex, std::vector& theResultBaseAlgoList, - ListOfShape& theResultShapesList) + ListOfShape& theResultShapesList, + GeomShapePtr theResultCompound) { ListOfShape aListWithObject; aListWithObject.push_back(theObject); @@ -209,22 +210,31 @@ bool FeaturesPlugin_Boolean::processObject( GeomAPI_ShapeIterator aShapeIt(aResShape); if (aShapeIt.more() || aResShape->shapeType() == GeomAPI_Shape::VERTEX) { - std::shared_ptr aResultBody = - document()->createBody(data(), theResultIndex); + std::shared_ptr aResultBody; - // tools should be added to the list to fulfill the correct history of modification - aListWithObject.insert(aListWithObject.end(), theTools.begin(), theTools.end()); - - ListOfShape aUsedTools = theTools; - aUsedTools.insert(aUsedTools.end(), thePlanes.begin(), thePlanes.end()); + if (theResultCompound) { // store BOP result to the compound + std::shared_ptr aBuilder(new GeomAlgoAPI_ShapeBuilder); + aBuilder->add(theResultCompound, aResShape); + aMakeShapeList->appendAlgo(aBuilder); + } + else { // create a separate ResultBody + aResultBody = document()->createBody(data(), theResultIndex); + + // tools should be added to the list to fulfill the correct history of modification + aListWithObject.insert(aListWithObject.end(), theTools.begin(), theTools.end()); + + ListOfShape aUsedTools = theTools; + aUsedTools.insert(aUsedTools.end(), thePlanes.begin(), thePlanes.end()); + + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + aListWithObject, + aUsedTools, + aMakeShapeList, + aResShape); + setResult(aResultBody, theResultIndex); + ++theResultIndex; + } - FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, - aListWithObject, - aUsedTools, - aMakeShapeList, - aResShape); - setResult(aResultBody, theResultIndex); - ++theResultIndex; FeaturesPlugin_Tools::ResultBaseAlgo aRBA; aRBA.resultBody = aResultBody; @@ -245,7 +255,8 @@ bool FeaturesPlugin_Boolean::processCompsolid( const ListOfShape& thePlanes, int& theResultIndex, std::vector& theResultBaseAlgoList, - ListOfShape& theResultShapesList) + ListOfShape& theResultShapesList, + GeomShapePtr theResultCompound) { ListOfShape aUsedInOperationSolids; ListOfShape aNotUsedSolids; @@ -306,24 +317,32 @@ bool FeaturesPlugin_Boolean::processCompsolid( GeomAPI_ShapeIterator aShapeIt(aResultShape); if (aShapeIt.more() || aResultShape->shapeType() == GeomAPI_Shape::VERTEX) { - std::shared_ptr aResultBody = - document()->createBody(data(), theResultIndex); + std::shared_ptr aResultBody; - ListOfShape aCompSolidList; - aCompSolidList.push_back(theCompsolid); - // tools should be added to the list to fulfill the correct history of modification - aCompSolidList.insert(aCompSolidList.end(), theTools.begin(), theTools.end()); - - ListOfShape aUsedTools = theTools; - aUsedTools.insert(aUsedTools.end(), thePlanes.begin(), thePlanes.end()); - - FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, - aCompSolidList, - aUsedTools, - aMakeShapeList, - aResultShape); - setResult(aResultBody, theResultIndex); - ++theResultIndex; + if (theResultCompound) { // store BOP result to the compound + std::shared_ptr aBuilder(new GeomAlgoAPI_ShapeBuilder); + aBuilder->add(theResultCompound, aResultShape); + aMakeShapeList->appendAlgo(aBuilder); + } + else { // create a separate ResultBody + aResultBody = document()->createBody(data(), theResultIndex); + + ListOfShape aCompSolidList; + aCompSolidList.push_back(theCompsolid); + // tools should be added to the list to fulfill the correct history of modification + aCompSolidList.insert(aCompSolidList.end(), theTools.begin(), theTools.end()); + + ListOfShape aUsedTools = theTools; + aUsedTools.insert(aUsedTools.end(), thePlanes.begin(), thePlanes.end()); + + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + aCompSolidList, + aUsedTools, + aMakeShapeList, + aResultShape); + setResult(aResultBody, theResultIndex); + ++theResultIndex; + } FeaturesPlugin_Tools::ResultBaseAlgo aRBA; aRBA.resultBody = aResultBody; @@ -343,7 +362,8 @@ bool FeaturesPlugin_Boolean::processCompound( const ListOfShape& theTools, int& theResultIndex, std::vector& theResultBaseAlgoList, - ListOfShape& theResultShapesList) + ListOfShape& theResultShapesList, + GeomShapePtr theResultCompound) { ListOfShape aUsedInOperationShapes; ListOfShape aNotUsedShapes; @@ -387,18 +407,26 @@ bool FeaturesPlugin_Boolean::processCompound( GeomAPI_ShapeIterator aShapeIt(aResultShape); if (aShapeIt.more() || aResultShape->shapeType() == GeomAPI_Shape::VERTEX) { - std::shared_ptr aResultBody = - document()->createBody(data(), theResultIndex); - - ListOfShape aCompoundList; - aCompoundList.push_back(theCompound); - FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, - aCompoundList, - theTools, - aMakeShapeList, - aResultShape); - setResult(aResultBody, theResultIndex); - ++theResultIndex; + std::shared_ptr aResultBody; + + if (theResultCompound) { // store BOP result to the compound + std::shared_ptr aBuilder(new GeomAlgoAPI_ShapeBuilder); + aBuilder->add(theResultCompound, aResultShape); + aMakeShapeList->appendAlgo(aBuilder); + } + else { // create a separate ResultBody + aResultBody = document()->createBody(data(), theResultIndex); + + ListOfShape aCompoundList; + aCompoundList.push_back(theCompound); + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + aCompoundList, + theTools, + aMakeShapeList, + aResultShape); + setResult(aResultBody, theResultIndex); + ++theResultIndex; + } FeaturesPlugin_Tools::ResultBaseAlgo aRBA; aRBA.resultBody = aResultBody; @@ -410,6 +438,46 @@ bool FeaturesPlugin_Boolean::processCompound( return true; } +//================================================================================================== +GeomShapePtr FeaturesPlugin_Boolean::keepUnusedSubsOfCompound( + const GeomShapePtr& theResult, + const ObjectHierarchy& theObjectsHierarchy, + const ObjectHierarchy& theToolsHierarchy, + std::shared_ptr theMakeShapeList) +{ + ListOfShape aCompounds; + theObjectsHierarchy.CompoundsOfUnusedObjects(aCompounds); + theToolsHierarchy.CompoundsOfUnusedObjects(aCompounds); + + GeomShapePtr aResultShape = theResult; + if (!aCompounds.empty()) { + aResultShape = aCompounds.front(); + aCompounds.pop_front(); + + std::shared_ptr aBuilder(new GeomAlgoAPI_ShapeBuilder); + for (ListOfShape::iterator anIt = aCompounds.begin(); anIt != aCompounds.end(); ++anIt) { + for (GeomAPI_ShapeIterator aSub(*anIt); aSub.more(); aSub.next()) + aBuilder->add(aResultShape, aSub.current()); + } + + if (theResult) + aBuilder->add(aResultShape, theResult); + + theMakeShapeList->appendAlgo(aBuilder); + } + return aResultShape; +} + +//================================================================================================= +int FeaturesPlugin_Boolean::version() +{ + AttributeIntegerPtr aVersionAttr = integer(VERSION_ID()); + int aVersion = 0; + if (aVersionAttr && aVersionAttr->isInitialized()) + aVersion = aVersionAttr->value(); + return aVersion; +} + //================================================================================================= void FeaturesPlugin_Boolean::ObjectHierarchy::AddObject(const GeomShapePtr& theObject) diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.h b/src/FeaturesPlugin/FeaturesPlugin_Boolean.h index 9f6f21628..f2f11b354 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.h +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.h @@ -29,6 +29,7 @@ #include class ModelAPI_Result; +class GeomAlgoAPI_MakeShapeList; /// \class FeaturesPlugin_Boolean /// \ingroup Plugins @@ -168,7 +169,9 @@ protected: ObjectHierarchy& theObjects, ListOfShape& thePlanesList); - /// Perform Boolean operation of the object with the tools + /// Perform Boolean operation of the object with the tools. + /// In case of theResultCompound is not empty, the result of Boolean operation + /// is added to this compound, and corresponding ResultBody is not generated. /// \return \c false if something went wrong bool processObject(const GeomAlgoAPI_Tools::BOPType theBooleanType, const GeomShapePtr& theObject, @@ -176,9 +179,12 @@ protected: const ListOfShape& thePlanes, int& theResultIndex, std::vector& theResultBaseAlgoList, - ListOfShape& theResultShapesList); + ListOfShape& theResultShapesList, + GeomShapePtr theResulCompound = GeomShapePtr()); /// Perform Boolean operation of the Compsolid with the tools + /// In case of theResultCompound is not empty, the result of Boolean operation + /// is added to this compound, and corresponding ResultBody is not generated. /// \return \c false if something went wrong bool processCompsolid(const GeomAlgoAPI_Tools::BOPType theBooleanType, const ObjectHierarchy& theCompsolidHierarchy, @@ -187,9 +193,12 @@ protected: const ListOfShape& thePlanes, int& theResultIndex, std::vector& theResultBaseAlgoList, - ListOfShape& theResultShapesList); + ListOfShape& theResultShapesList, + GeomShapePtr theResulCompound = GeomShapePtr()); /// Perform Boolean operation of the Compound with the tools + /// In case of theResultCompound is not empty, the result of Boolean operation + /// is added to this compound, and corresponding ResultBody is not generated. /// \return \c false if something went wrong bool processCompound(const GeomAlgoAPI_Tools::BOPType theBooleanType, const ObjectHierarchy& theCompoundHierarchy, @@ -197,7 +206,20 @@ protected: const ListOfShape& theTools, int& theResultIndex, std::vector& theResultBaseAlgoList, - ListOfShape& theResultShapesList); + ListOfShape& theResultShapesList, + GeomShapePtr theResulCompound = GeomShapePtr()); + + /// Process unused sub-shapes of compounds. + /// Keep the compound hierarchy, but merge top-level compounds + /// into a single compound and add the result of the FUSE operation. + GeomShapePtr keepUnusedSubsOfCompound( + const GeomShapePtr& theResult, + const ObjectHierarchy& theObjectsHierarchy, + const ObjectHierarchy& theToolsHierarchy, + std::shared_ptr theMakeShapeList); + + /// Return version of the feature + int version(); private: void parentForShape(const GeomShapePtr& theShape, diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp index af2d556f1..c5b28fbaf 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanCommon.cpp @@ -20,9 +20,12 @@ #include "FeaturesPlugin_BooleanCommon.h" #include +#include #include #include +#include #include +#include #include #include @@ -35,6 +38,7 @@ #include #include +static const int THE_COMMON_VERSION_1 = 20190506; //================================================================================================== FeaturesPlugin_BooleanCommon::FeaturesPlugin_BooleanCommon() @@ -49,6 +53,17 @@ 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); + } } //================================================================================================== @@ -82,7 +97,12 @@ void FeaturesPlugin_BooleanCommon::execute() return; } + // version of COMMON feature + int aCommonVersion = version(); + int aResultIndex = 0; + GeomShapePtr aResultCompound; + std::string anError; std::shared_ptr aMakeShapeList(new GeomAlgoAPI_MakeShapeList()); std::vector aResultBaseAlgoList; @@ -106,6 +126,12 @@ void FeaturesPlugin_BooleanCommon::execute() aMakeShapeList->appendAlgo(aCommonAlgo); } + if (aCommonVersion == THE_COMMON_VERSION_1) { + // merge hierarchies of compounds containing objects and tools + // and append the result of the FUSE operation + aShape = keepUnusedSubsOfCompound(aShape, anObjects, aTools, aMakeShapeList); + } + GeomAPI_ShapeIterator aShapeIt(aShape); if (aShapeIt.more() || aShape->shapeType() == GeomAPI_Shape::VERTEX) { std::shared_ptr aResultBody = @@ -132,6 +158,12 @@ void FeaturesPlugin_BooleanCommon::execute() aResultShapesList.push_back(aShape); } } else { + if (aCommonVersion == THE_COMMON_VERSION_1) { + // merge hierarchies of compounds containing objects and tools + aResultCompound = + keepUnusedSubsOfCompound(GeomShapePtr(), anObjects, aTools, aMakeShapeList); + } + bool isOk = true; for (ObjectHierarchy::Iterator anObjectsIt = anObjects.Begin(); anObjectsIt != anObjects.End() && isOk; @@ -146,29 +178,60 @@ void FeaturesPlugin_BooleanCommon::execute() // Compound handling isOk = processCompound(GeomAlgoAPI_Tools::BOOL_COMMON, anObjects, aParent, aTools.Objects(), - aResultIndex, aResultBaseAlgoList, aResultShapesList); + aResultIndex, aResultBaseAlgoList, aResultShapesList, + aResultCompound); } else if (aShapeType == GeomAPI_Shape::COMPSOLID) { // Compsolid handling isOk = processCompsolid(GeomAlgoAPI_Tools::BOOL_COMMON, anObjects, aParent, aTools.Objects(), ListOfShape(), - aResultIndex, aResultBaseAlgoList, aResultShapesList); + aResultIndex, aResultBaseAlgoList, aResultShapesList, + aResultCompound); } } else { // process object as is isOk = processObject(GeomAlgoAPI_Tools::BOOL_COMMON, 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_BooleanFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp index 65e5c0f4c..84df36d06 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp @@ -113,12 +113,7 @@ void FeaturesPlugin_BooleanFuse::execute() } // version of FUSE feature - AttributeIntegerPtr aVersionAttr = integer(VERSION_ID()); - int aFuseVersion = 0; - if (aVersionAttr && aVersionAttr->isInitialized()) - aFuseVersion = aVersionAttr->value(); - -//// isSimpleCreation = isSimpleCreation && aFuseVersion < THE_FUSE_VERSION_1; + int aFuseVersion = version(); // Collecting all solids which will be fused. ListOfShape aSolidsToFuse; @@ -274,32 +269,3 @@ void FeaturesPlugin_BooleanFuse::execute() // remove the rest results if there were produced in the previous pass removeResults(aResultIndex); } - -//================================================================================================== -GeomShapePtr FeaturesPlugin_BooleanFuse::keepUnusedSubsOfCompound( - const GeomShapePtr& theFuseResult, - const ObjectHierarchy& theObjectsHierarchy, - const ObjectHierarchy& theToolsHierarchy, - std::shared_ptr theMakeShapeList) -{ - ListOfShape aCompounds; - theObjectsHierarchy.CompoundsOfUnusedObjects(aCompounds); - theToolsHierarchy.CompoundsOfUnusedObjects(aCompounds); - - GeomShapePtr aResultShape = theFuseResult; - if (!aCompounds.empty()) { - aResultShape = aCompounds.front(); - aCompounds.pop_front(); - - std::shared_ptr aBuilder(new GeomAlgoAPI_ShapeBuilder); - for (ListOfShape::iterator anIt = aCompounds.begin(); anIt != aCompounds.end(); ++anIt) { - for (GeomAPI_ShapeIterator aSub(*anIt); aSub.more(); aSub.next()) - aBuilder->add(aResultShape, aSub.current()); - } - - aBuilder->add(aResultShape, theFuseResult); - - theMakeShapeList->appendAlgo(aBuilder); - } - return aResultShape; -} diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.h b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.h index f94498406..a16c8781a 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.h +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.h @@ -22,8 +22,6 @@ #include "FeaturesPlugin_Boolean.h" -class GeomAlgoAPI_MakeShapeList; - /// \class FeaturesPlugin_BooleanFuse /// \ingroup Plugins /// \brief Feature for applying of Boolean Fuse operation. @@ -97,16 +95,6 @@ public: /// Use plugin manager for features creation. FeaturesPlugin_BooleanFuse(); - -private: - /// Process unused sub-shapes of compounds. - /// Keep the compound hierarchy, but merge top-level compounds - /// into a single compound and add the result of the FUSE operation. - GeomShapePtr keepUnusedSubsOfCompound( - const GeomShapePtr& theFuseResult, - const ObjectHierarchy& theObjectsHierarchy, - const ObjectHierarchy& theToolsHierarchy, - std::shared_ptr theMakeShapeList); }; #endif diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound0.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py similarity index 97% rename from src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound0.py rename to src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py index 705125adf..3869c13ff 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound0.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py @@ -33,8 +33,8 @@ LinearCopy_2.result().subResult(0).subResult(1).setColor(255, 170, 0) LinearCopy_2.result().subResult(1).subResult(0).setColor(0, 0, 255) LinearCopy_2.result().subResult(1).subResult(1).setColor(0, 0, 255) Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("YOZ")) -SketchLine_1 = Sketch_1.addLine(7, 0, -6.999999999999999, 0) -SketchLine_2 = Sketch_1.addLine(-6.999999999999999, 0, -7, 5) +SketchLine_1 = Sketch_1.addLine(7, 0, -7, 0) +SketchLine_2 = Sketch_1.addLine(-7, 0, -7, 5) SketchLine_3 = Sketch_1.addLine(-7, 5, 7, 5) SketchLine_4 = Sketch_1.addLine(7, 5, 7, 0) SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) @@ -78,7 +78,9 @@ Compound_1.result().subResult(0).subResult(1).setColor(0, 170, 0) Compound_1.result().subResult(1).subResult(0).setColor(0, 255, 0) Compound_1.result().subResult(1).subResult(1).setColor(0, 255, 0) Common_1 = model.addCommon(Part_1_doc, [model.selection("SOLID", "LinearCopy_2_1_1_1"), model.selection("COMPOUND", "Compound_1_1_2")]) -model.do() + +model.testHaveNamingSubshapes(Common_1, model, Part_1_doc) + model.end() from GeomAPI import GeomAPI_Shape @@ -90,3 +92,5 @@ model.testNbSubShapes(Common_1, GeomAPI_Shape.FACE, [13]) model.testNbSubShapes(Common_1, GeomAPI_Shape.EDGE, [54]) model.testNbSubShapes(Common_1, GeomAPI_Shape.VERTEX, [108]) model.testResultsVolumes(Common_1, [1147.933772988635155343217775226]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py new file mode 100644 index 000000000..87c31b6d5 --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_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) +Common_1 = model.addCommon(Part_1_doc, [model.selection("SOLID", "Compound_2_1_1_1"), model.selection("SOLID", "Compound_2_1_2_3")], [model.selection("COMPOUND", "Compound_3_1_2")]) + +model.testHaveNamingSubshapes(Common_1, model, Part_1_doc) + +model.end() + +from GeomAPI import GeomAPI_Shape + +model.testNbResults(Common_1, 2) +model.testNbSubResults(Common_1, [2, 3]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.SOLID, [2, 3]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.FACE, [9, 18]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.EDGE, [30, 74]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.VERTEX, [60, 148]) +model.testResultsVolumes(Common_1, [7048.363799144838594, 6703.185306801399747]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py new file mode 100644 index 000000000..ddbbf6fa5 --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py @@ -0,0 +1,96 @@ +# 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() +Cylinder_1 = model.addCylinder(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), model.selection("EDGE", "PartSet/OZ"), 10, 20) +LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("SOLID", "Cylinder_1_1")], model.selection("EDGE", "PartSet/OX"), 40, 2) +LinearCopy_2 = model.addMultiTranslation(Part_1_doc, [model.selection("COMPOUND", "LinearCopy_1_1")], model.selection("EDGE", "PartSet/OY"), 40, 2) +LinearCopy_2.result().subResult(0).subResult(0).setColor(255, 170, 0) +LinearCopy_2.result().subResult(0).subResult(1).setColor(255, 170, 0) +LinearCopy_2.result().subResult(1).subResult(0).setColor(0, 0, 255) +LinearCopy_2.result().subResult(1).subResult(1).setColor(0, 0, 255) +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("YOZ")) +SketchLine_1 = Sketch_1.addLine(7, 0, -7, 0) +SketchLine_2 = Sketch_1.addLine(-7, 0, -7, 5) +SketchLine_3 = Sketch_1.addLine(-7, 5, 7, 5) +SketchLine_4 = Sketch_1.addLine(7, 5, 7, 0) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) +SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_1.result()) +SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result()) +SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_3.result()) +SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_4.result()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OZ"), False) +SketchLine_5 = SketchProjection_1.createdFeature() +SketchConstraintDistance_1 = Sketch_1.setDistance(SketchLine_3.endPoint(), SketchLine_5.result(), 7, True) +SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchAPI_Line(SketchLine_5).startPoint(), SketchLine_1.result()) +SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_1.result(), 14) +SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_2.result(), 5) +SketchLine_6 = Sketch_1.addLine(5, 12, -5, 12) +SketchLine_7 = Sketch_1.addLine(-5, 12, -5, 15) +SketchLine_8 = Sketch_1.addLine(-5, 15, 5, 15) +SketchLine_9 = Sketch_1.addLine(5, 15, 5, 12) +SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_9.endPoint(), SketchLine_6.startPoint()) +SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint()) +SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_7.endPoint(), SketchLine_8.startPoint()) +SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint()) +SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_6.result()) +SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_7.result()) +SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_8.result()) +SketchConstraintVertical_4 = Sketch_1.setVertical(SketchLine_9.result()) +SketchConstraintLength_3 = Sketch_1.setLength(SketchLine_7.result(), 3) +SketchConstraintLength_4 = Sketch_1.setLength(SketchLine_8.result(), 10) +SketchConstraintDistance_2 = Sketch_1.setDistance(SketchLine_8.endPoint(), SketchLine_5.result(), 5, True) +SketchConstraintDistance_3 = Sketch_1.setDistance(SketchLine_6.startPoint(), SketchLine_3.result(), 7, True) +model.do() +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_4r-SketchLine_3r-SketchLine_2r-SketchLine_1r")], model.selection(), 60, 20) +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_9r-SketchLine_8r-SketchLine_7r-SketchLine_6r")], model.selection(), 55, 15) +LinearCopy_3 = model.addMultiTranslation(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], model.selection("EDGE", "PartSet/OY"), 40, 2) +AngularCopy_1 = model.addMultiRotation(Part_1_doc, [model.selection("SOLID", "Extrusion_2_1")], model.selection("EDGE", "PartSet/OZ"), 90, 2) +Compound_1 = model.addCompound(Part_1_doc, [model.selection("COMPOUND", "LinearCopy_3_1"), model.selection("COMPOUND", "AngularCopy_1_1")]) +Compound_1.result().subResult(0).subResult(0).setColor(0, 170, 0) +Compound_1.result().subResult(0).subResult(1).setColor(0, 170, 0) +Compound_1.result().subResult(1).subResult(0).setColor(0, 255, 0) +Compound_1.result().subResult(1).subResult(1).setColor(0, 255, 0) +Common_1 = model.addCommon(Part_1_doc, [model.selection("SOLID", "LinearCopy_2_1_1_1"), model.selection("COMPOUND", "Compound_1_1_2")], 20190506) + +model.testHaveNamingSubshapes(Common_1, model, Part_1_doc) + +model.end() + +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, [34]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.EDGE, [120]) +model.testNbSubShapes(Common_1, GeomAPI_Shape.VERTEX, [240]) +model.testResultsVolumes(Common_1, [31197.48969452739765984]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py new file mode 100644 index 000000000..e95f88f05 --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_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) +Common_1 = model.addCommon(Part_1_doc, [model.selection("SOLID", "Compound_2_1_1_1"), model.selection("SOLID", "Compound_2_1_2_3")], [model.selection("COMPOUND", "Compound_3_1_2")], 20190506) + +model.testHaveNamingSubshapes(Common_1, model, Part_1_doc) + +model.end() + +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]) + +assert(model.checkPythonDump()) -- 2.39.2