X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Boolean.cpp;h=d3fcd0ba506dd41acd7efc5474a7b9b8c8da09d3;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=471e5c7c08d0ba2eadb823da7e6a483e1e8469cf;hpb=5e90be5a37588dd936e6d5f1a6426141bfda7170;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp index 471e5c7c0..d3fcd0ba5 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesPlugin_Boolean.cpp -// Created: 02 Sept 2014 -// Author: Vitaly SMETANNIKOV +// 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 +// #include "FeaturesPlugin_Boolean.h" @@ -12,241 +25,117 @@ #include #include #include +#include +#include +#include #include +#include +#include #include -#include - -#define FACE 4 -#define _MODIFY_TAG 1 -#define _DELETED_TAG 2 +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include //================================================================================================= -FeaturesPlugin_Boolean::FeaturesPlugin_Boolean() +FeaturesPlugin_Boolean::FeaturesPlugin_Boolean(const OperationType theOperationType) +: myOperationType(theOperationType) { } //================================================================================================= void FeaturesPlugin_Boolean::initAttributes() { - data()->addAttribute(FeaturesPlugin_Boolean::TYPE_ID(), ModelAPI_AttributeInteger::typeId()); - - AttributeSelectionListPtr aSelection = + AttributeSelectionListPtr aSelection = std::dynamic_pointer_cast(data()->addAttribute( FeaturesPlugin_Boolean::OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - // extrusion works with faces always - aSelection->setSelectionType("SOLID"); aSelection = std::dynamic_pointer_cast(data()->addAttribute( FeaturesPlugin_Boolean::TOOL_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - // extrusion works with faces always - aSelection->setSelectionType("SOLID"); + + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), OBJECT_LIST_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TOOL_LIST_ID()); } //================================================================================================= -std::shared_ptr FeaturesPlugin_Boolean::getShape(const std::string& theAttrName) +FeaturesPlugin_Boolean::OperationType FeaturesPlugin_Boolean::operationType() { - std::shared_ptr aObjRef = std::dynamic_pointer_cast< - ModelAPI_AttributeReference>(data()->attribute(theAttrName)); - if (aObjRef) { - std::shared_ptr aConstr = std::dynamic_pointer_cast< - ModelAPI_ResultBody>(aObjRef->value()); - if (aConstr) - return aConstr->shape(); - } - return std::shared_ptr(); + return myOperationType; } //================================================================================================= -void FeaturesPlugin_Boolean::execute() +void FeaturesPlugin_Boolean::loadNamingDS(std::shared_ptr theResultBody, + const std::shared_ptr theBaseShape, + const ListOfShape& theTools, + const std::shared_ptr theResultShape, + const GeomMakeShapePtr& theMakeShape) { - // Getting operation type. - std::shared_ptr aTypeAttr = std::dynamic_pointer_cast< - ModelAPI_AttributeInteger>(data()->attribute(FeaturesPlugin_Boolean::TYPE_ID())); - if (!aTypeAttr) + //load result + if(theBaseShape->isEqual(theResultShape)) { + theResultBody->store(theResultShape, false); return; - int aType = aTypeAttr->value(); + } - ListOfShape anObjects, aTools; + theResultBody->storeModified(theBaseShape, theResultShape); - // Getting objects. - AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Boolean::OBJECT_LIST_ID()); - if (anObjectsSelList->size() == 0) { - return; - } - for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) { - std::shared_ptr anObjectAttr = anObjectsSelList->value(anObjectsIndex); - std::shared_ptr anObject = anObjectAttr->value(); - if(!anObject.get()) { - return; - } - anObjects.push_back(anObject); - } + theResultBody->loadModifiedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::EDGE); + theResultBody->loadModifiedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::FACE); - // Getting tools. - AttributeSelectionListPtr aToolsSelList = selectionList(FeaturesPlugin_Boolean::TOOL_LIST_ID()); - if (aToolsSelList->size() == 0) { - return; - } - for(int aToolsIndex = 0; aToolsIndex < aToolsSelList->size(); aToolsIndex++) { - std::shared_ptr aToolAttr = aToolsSelList->value(aToolsIndex); - std::shared_ptr aTool = aToolAttr->value(); - if(!aTool.get()) { - return; - } - aTools.push_back(aTool); - } + theResultBody->loadDeletedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::FACE); - int aResultIndex = 0; - ListOfMakeShape aListOfMakeShape; - std::shared_ptr aResShape; - std::shared_ptr aDataMapOfShapes; - - switch(aType) { - case GeomAlgoAPI_Boolean::BOOL_CUT: { - // Cut each object with all tools - for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) { - std::shared_ptr anObject = *anObjectsIt; - aResShape = anObject; - ListOfShape aSingleObjectList; aSingleObjectList.push_back(anObject); - for(ListOfShape::iterator aToolsIt = aTools.begin(); aToolsIt != aTools.end(); aToolsIt++) { - std::shared_ptr aTool = *aToolsIt; - GeomAlgoAPI_Boolean* aBoolAlgo = new GeomAlgoAPI_Boolean(aResShape, aTool, aType); - if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) { - static const std::string aBoolAlgoError = "Boolean feature: algorithm failed"; - setError(aBoolAlgoError); - return; - } - aListOfMakeShape.push_back(aBoolAlgo->makeShape()); - aResShape = aBoolAlgo->shape(); - aBoolAlgo->mapOfShapes(aDataMapOfShapes); - } - - if(GeomAlgoAPI_ShapeProps::volume(aResShape) > 10.e-5) { - std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); - std::shared_ptr aMakeShapeList = std::shared_ptr( - new GeomAlgoAPI_MakeShapeList(aListOfMakeShape)); - - LoadNamingDS(aMakeShapeList, aResultBody, aResShape, aDataMapOfShapes, aSingleObjectList, aTools); - setResult(aResultBody, aResultIndex); - aResultIndex++; - } - } - break; - } - case GeomAlgoAPI_Boolean::BOOL_FUSE: { - // Fuse all objects. - std::shared_ptr aTempRes = anObjects.front(); - for(ListOfShape::iterator anObjectsIt = ++anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) { - std::shared_ptr anObject = *anObjectsIt; - GeomAlgoAPI_Boolean* aBoolAlgo = new GeomAlgoAPI_Boolean(aTempRes, anObject, aType); - if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) { - static const std::string aBoolAlgoError = "Boolean feature: algorithm failed"; - setError(aBoolAlgoError); - return; - } - aListOfMakeShape.push_back(aBoolAlgo->makeShape()); - aTempRes = aBoolAlgo->shape(); - } - - // Fuse all tools with result of objects fuse. - for(ListOfShape::iterator aToolsIt = aTools.begin(); aToolsIt != aTools.end(); aToolsIt++) { - std::shared_ptr aTool = *aToolsIt; - GeomAlgoAPI_Boolean* aBoolAlgo = new GeomAlgoAPI_Boolean(aTempRes, aTool, aType); - if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) { - static const std::string aBoolAlgoError = "Boolean feature: algorithm failed"; - setError(aBoolAlgoError); - return; - } - aListOfMakeShape.push_back(aBoolAlgo->makeShape()); - aTempRes = aBoolAlgo->shape(); - aBoolAlgo->mapOfShapes(aDataMapOfShapes); - } - aResShape = aTempRes; - - std::shared_ptr aResultBody = document()->createBody(data()); - std::shared_ptr aMakeShapeList = std::shared_ptr( - new GeomAlgoAPI_MakeShapeList(aListOfMakeShape)); - - LoadNamingDS(aMakeShapeList, aResultBody, aResShape, aDataMapOfShapes, anObjects, aTools); - setResult(aResultBody); - aResultIndex++; - break; - } - case GeomAlgoAPI_Boolean::BOOL_COMMON: { - // Search common between object and tool and fuse them. - for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) { - std::shared_ptr anObject = *anObjectsIt; - std::shared_ptr aTempRes; - ListOfShape aSingleObjectList; aSingleObjectList.push_back(anObject); - for(ListOfShape::iterator aToolsIt = aTools.begin(); aToolsIt != aTools.end(); aToolsIt++) { - std::shared_ptr aTool = *aToolsIt; - GeomAlgoAPI_Boolean* aBoolAlgo1 = new GeomAlgoAPI_Boolean(anObject, aTool, aType); - if(!aBoolAlgo1->isDone() || aBoolAlgo1->shape()->isNull() || !aBoolAlgo1->isValid()) { - static const std::string aBoolAlgoError = "Boolean feature: algorithm failed"; - setError(aBoolAlgoError); - return; - } - aListOfMakeShape.push_back(aBoolAlgo1->makeShape()); - - if(!aTempRes) { - aTempRes = aBoolAlgo1->shape(); - aBoolAlgo1->mapOfShapes(aDataMapOfShapes); - } else { - // Fuse common result with previous common results. - GeomAlgoAPI_Boolean* aBoolAlgo2 = new GeomAlgoAPI_Boolean(aTempRes, - aBoolAlgo1->shape(), - GeomAlgoAPI_Boolean::BOOL_FUSE); - if(!aBoolAlgo1->isDone() || aBoolAlgo1->shape()->isNull() || !aBoolAlgo1->isValid()) { - static const std::string aBoolAlgoError = "Boolean feature: algorithm failed"; - setError(aBoolAlgoError); - return; - } - aListOfMakeShape.push_back(aBoolAlgo2->makeShape()); - aTempRes = aBoolAlgo2->shape(); - aBoolAlgo2->mapOfShapes(aDataMapOfShapes); - } - } - aResShape = aTempRes; - - if(GeomAlgoAPI_ShapeProps::volume(aResShape) > 10.e-5) { - std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); - std::shared_ptr aMakeShapeList = std::shared_ptr( - new GeomAlgoAPI_MakeShapeList(aListOfMakeShape)); - - LoadNamingDS(aMakeShapeList, aResultBody, aResShape, aDataMapOfShapes, aSingleObjectList, aTools); - setResult(aResultBody, aResultIndex); - aResultIndex++; - } - } - break; - } + for (ListOfShape::const_iterator anIter = theTools.begin(); + anIter != theTools.end(); + ++anIter) + { + GeomAPI_Shape::ShapeType aShapeType = + (*anIter)->shapeType() <= GeomAPI_Shape::FACE ? GeomAPI_Shape::FACE + : GeomAPI_Shape::EDGE; + theResultBody->loadModifiedShapes(theMakeShape, *anIter, aShapeType); + + theResultBody->loadDeletedShapes(theMakeShape, *anIter, GeomAPI_Shape::FACE); } - // remove the rest results if there were produced in the previous pass - removeResults(aResultIndex); } //================================================================================================= -void FeaturesPlugin_Boolean::LoadNamingDS(std::shared_ptr theMakeShapeList, - std::shared_ptr theResultBody, - std::shared_ptr theResult, - std::shared_ptr theDataMapOfShapes, - const ListOfShape& theObjects, - const ListOfShape& theTools) +void FeaturesPlugin_Boolean::storeResult( + const ListOfShape& theObjects, + const ListOfShape& theTools, + const GeomShapePtr theResultShape, + int& theResultIndex, + std::shared_ptr theMakeShapeList, + std::vector& theResultBaseAlgoList) { - //load result - theResultBody->storeModified(theObjects.front(), theResult); - - GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape(); - - std::string aModName = "Modified"; - for(ListOfShape::const_iterator anIter = theObjects.begin(); anIter != theObjects.end(); anIter++) { - theResultBody->loadAndOrientModifiedShapes(theMakeShapeList.get(), *anIter, FACE, _MODIFY_TAG, aModName, *theDataMapOfShapes.get()); - theResultBody->loadDeletedShapes(theMakeShapeList.get(), *anIter, FACE, _DELETED_TAG); - } + if (!theResultShape) + return; - for(ListOfShape::const_iterator anIter = theTools.begin(); anIter != theTools.end(); anIter++) { - theResultBody->loadAndOrientModifiedShapes(theMakeShapeList.get(), *anIter, FACE, _MODIFY_TAG, aModName, *theDataMapOfShapes.get()); - theResultBody->loadDeletedShapes(theMakeShapeList.get(), *anIter, FACE, _DELETED_TAG); + std::shared_ptr aResultBody = + document()->createBody(data(), theResultIndex); + + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + theObjects, + theTools, + theMakeShapeList, + theResultShape); + setResult(aResultBody, theResultIndex++); + + // merge algorithms + FeaturesPlugin_Tools::ResultBaseAlgo aRBA; + aRBA.resultBody = aResultBody; + aRBA.baseShape = theObjects.front(); + for (std::vector::iterator + aRBAIt = theResultBaseAlgoList.begin(); + aRBAIt != theResultBaseAlgoList.end(); ++aRBAIt) { + theMakeShapeList->appendAlgo(aRBAIt->makeShape); } + aRBA.makeShape = theMakeShapeList; + theResultBaseAlgoList.clear(); + theResultBaseAlgoList.push_back(aRBA); }