X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Boolean.cpp;h=81848ff1131d9df47f0b2f6dd7d560bccc71243f;hb=c458464ec86d4031ff1a476d2b368146bc3c932a;hp=e582019b4839f3d18ee494cd9ff39c0f60860873;hpb=94808d50abb94b9321a5777fc14b2a221b64d205;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp index e582019b4..81848ff11 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp @@ -1,6 +1,22 @@ -// File: FeaturesPlugin_Boolean.cpp -// Created: 02 Sept 2014 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "FeaturesPlugin_Boolean.h" @@ -9,105 +25,93 @@ #include #include #include +#include +#include +#include +#include + #include -#include -using namespace std; -#ifdef _DEBUG -#include -#include -#endif - -#define FACE 4 -#define _MODIFY_TAG 1 -#define _DELETED_TAG 2 -FeaturesPlugin_Boolean::FeaturesPlugin_Boolean() +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +//================================================================================================= +FeaturesPlugin_Boolean::FeaturesPlugin_Boolean(const OperationType theOperationType) +: myOperationType(theOperationType) { } +//================================================================================================= void FeaturesPlugin_Boolean::initAttributes() { - data()->addAttribute(FeaturesPlugin_Boolean::TYPE_ID(), ModelAPI_AttributeInteger::type()); - data()->addAttribute(FeaturesPlugin_Boolean::OBJECT_ID(), ModelAPI_AttributeReference::type()); - data()->addAttribute(FeaturesPlugin_Boolean::TOOL_ID(), ModelAPI_AttributeReference::type()); + AttributeSelectionListPtr aSelection = + std::dynamic_pointer_cast(data()->addAttribute( + FeaturesPlugin_Boolean::OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); + + aSelection = std::dynamic_pointer_cast(data()->addAttribute( + FeaturesPlugin_Boolean::TOOL_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); + + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), OBJECT_LIST_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TOOL_LIST_ID()); } -boost::shared_ptr FeaturesPlugin_Boolean::getShape(const std::string& theAttrName) +//================================================================================================= +std::shared_ptr FeaturesPlugin_Boolean::getShape(const std::string& theAttrName) { - boost::shared_ptr aObjRef = boost::dynamic_pointer_cast< + std::shared_ptr aObjRef = std::dynamic_pointer_cast< ModelAPI_AttributeReference>(data()->attribute(theAttrName)); if (aObjRef) { - boost::shared_ptr aConstr = boost::dynamic_pointer_cast< + std::shared_ptr aConstr = std::dynamic_pointer_cast< ModelAPI_ResultBody>(aObjRef->value()); if (aConstr) return aConstr->shape(); } - return boost::shared_ptr(); + return std::shared_ptr(); } - -void FeaturesPlugin_Boolean::execute() +//================================================================================================= +FeaturesPlugin_Boolean::OperationType FeaturesPlugin_Boolean::operationType() { - boost::shared_ptr aTypeAttr = boost::dynamic_pointer_cast< - ModelAPI_AttributeInteger>(data()->attribute(FeaturesPlugin_Boolean::TYPE_ID())); - if (!aTypeAttr) - return; - int aType = aTypeAttr->value(); - - boost::shared_ptr anObject = this->getShape(FeaturesPlugin_Boolean::OBJECT_ID()); - if (!anObject) - return; - - boost::shared_ptr aTool = this->getShape(FeaturesPlugin_Boolean::TOOL_ID()); - if (!aTool) - return; - - boost::shared_ptr aResultBody = document()->createBody(data()); + return myOperationType; +} - GeomAlgoAPI_Boolean* aFeature = new GeomAlgoAPI_Boolean(anObject, aTool, aType); - if(aFeature && !aFeature->isDone()) { - std::string aFeatureError = "Boolean feature: algorithm failed"; - Events_Error::send(aFeatureError, this); - return; - } - // Check if shape is valid - if (aFeature->shape()->isNull()) { - std::string aShapeError = "Boolean feature: resulting shape is Null"; - Events_Error::send(aShapeError, this); -#ifdef _DEBUG - std::cerr << aShapeError << std::endl; -#endif +//================================================================================================= +void FeaturesPlugin_Boolean::loadNamingDS(std::shared_ptr theResultBody, + const std::shared_ptr theBaseShape, + const ListOfShape& theTools, + const std::shared_ptr theResultShape, + const GeomMakeShapePtr& theMakeShape) +{ + //load result + if(theBaseShape->isEqual(theResultShape)) { + theResultBody->store(theResultShape, false); return; } - if(!aFeature->isValid()) { - std::string aFeatureError = "Boolean feature: resulting shape is not valid"; - Events_Error::send(aFeatureError, this); - return; - } - //LoadNamingDS - LoadNamingDS(aFeature, aResultBody, anObject, aTool, aType); - setResult(aResultBody); -} + theResultBody->storeModified(theBaseShape, theResultShape); -//============================================================================ -void FeaturesPlugin_Boolean::LoadNamingDS(GeomAlgoAPI_Boolean* theFeature, - boost::shared_ptr theResultBody, - boost::shared_ptr theObject, - boost::shared_ptr theTool, - int theType) -{ + theResultBody->loadModifiedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::EDGE); + theResultBody->loadModifiedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::FACE); - //load result - theResultBody->storeModified(theObject, theFeature->shape()); + theResultBody->loadDeletedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::FACE); - GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape(); - theFeature->mapOfShapes(*aSubShapes); + 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); - // Put in DF modified faces - theResultBody->loadAndOrientModifiedShapes(theFeature->makeShape(), theObject, FACE, _MODIFY_TAG, *aSubShapes); - theResultBody->loadAndOrientModifiedShapes(theFeature->makeShape(), theTool, FACE, _MODIFY_TAG, *aSubShapes); - - //Put in DF deleted faces - theResultBody->loadDeletedShapes(theFeature->makeShape(), theObject, FACE, _DELETED_TAG); - theResultBody->loadDeletedShapes(theFeature->makeShape(), theTool, FACE, _DELETED_TAG); + theResultBody->loadDeletedShapes(theMakeShape, *anIter, GeomAPI_Shape::FACE); + } }