X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_RemoveSubShapes.cpp;h=b7fe7b8e84e02ecf635b5f963eaedefdcb790855;hb=0dcd1410a2576891475386459d068c2cd63caa09;hp=84541fcd10f55d375a68ffb9e0b750e89f46f0da;hpb=a8cfbfb436c27ff96edd5c808e9a452c35cef207;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp b/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp index 84541fcd1..b7fe7b8e8 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp @@ -1,25 +1,45 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: FeaturesPlugin_RemoveSubShapes.cpp -// Created: 14 April 2016 -// Author: Dmitry Bobylev +// 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_RemoveSubShapes.h" #include +#include #include -#include #include #include +#include #include #include +#include +#include #include #include +#include + //================================================================================================== FeaturesPlugin_RemoveSubShapes::FeaturesPlugin_RemoveSubShapes() +: myChangedInCode(false) { } @@ -28,58 +48,156 @@ void FeaturesPlugin_RemoveSubShapes::initAttributes() { data()->addAttribute(BASE_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(SUBSHAPES_ID(), ModelAPI_AttributeSelectionList::typeId()); + data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId()); + + data()->addAttribute(SUBSHAPES_TO_KEEP_ID(), ModelAPI_AttributeSelectionList::typeId()); + + data()->addAttribute(SUBSHAPES_TO_REMOVE_ID(), ModelAPI_AttributeSelectionList::typeId()); } void FeaturesPlugin_RemoveSubShapes::attributeChanged(const std::string& theID) { ModelAPI_Feature::attributeChanged(theID); + if (myChangedInCode) return; + + AttributeSelectionPtr aShapeAttrSelection = selection(BASE_SHAPE_ID()); + AttributeSelectionListPtr aSubShapesToKeepAttrList = selectionList(SUBSHAPES_TO_KEEP_ID()); + AttributeSelectionListPtr aSubShapesToRemoveAttrList = selectionList(SUBSHAPES_TO_REMOVE_ID()); + if (!aShapeAttrSelection.get() + || !aSubShapesToKeepAttrList.get() + || !aSubShapesToRemoveAttrList.get()) + { + return; + } + + ResultPtr aContext = aShapeAttrSelection->context(); + ResultBodyPtr aResultBody = + std::dynamic_pointer_cast(aContext); + if (!aResultBody.get()) { + aSubShapesToKeepAttrList->clear(); + aSubShapesToRemoveAttrList->clear(); + return; + } + const bool isHasSubs = ModelAPI_Tools::hasSubResults(aResultBody); + + GeomShapePtr aBaseShape = aShapeAttrSelection->value(); + if(!aBaseShape.get()) { + aBaseShape = aContext->shape(); + } + + myChangedInCode = true; + if(theID == BASE_SHAPE_ID()) { - AttributeSelectionPtr aShapeAttrSelection = selection(BASE_SHAPE_ID()); - AttributeSelectionListPtr aSubShapesAttrList = selectionList(SUBSHAPES_ID()); - if(!aShapeAttrSelection.get() || !aSubShapesAttrList.get()) { + aSubShapesToKeepAttrList->clear(); + aSubShapesToRemoveAttrList->clear(); + + if (!aBaseShape.get()) { return; } - aSubShapesAttrList->clear(); + std::list aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape); + for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt) + { + GeomShapePtr aSubShape = *anIt; + if(!isHasSubs) { + aSubShapesToKeepAttrList->append(aContext, aSubShape); + } else { + std::list anAllSubs; + ModelAPI_Tools::allSubs(aResultBody, anAllSubs); + std::list::iterator aSubsIt = anAllSubs.begin(); + for(; aSubsIt != anAllSubs.end(); aSubsIt++) { + ResultBodyPtr aSub = std::dynamic_pointer_cast(*aSubsIt); + if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) { + aSubShapesToKeepAttrList->append(aSub, aSubShape); + break; + } + } + } + } + } + else if (theID == SUBSHAPES_TO_KEEP_ID()) + { + aSubShapesToRemoveAttrList->clear(); - ResultPtr aContext = aShapeAttrSelection->context(); - ResultCompSolidPtr aResultCompSolid = std::dynamic_pointer_cast(aContext); - if(!aResultCompSolid.get()) { + if (!aBaseShape.get()) { return; } - GeomShapePtr aBaseShape = aShapeAttrSelection->value(); - if(!aBaseShape.get()) { - aBaseShape = aContext->shape(); - } - if(!aBaseShape.get()) { - return; + int anIndex; + const int aSubsToKeepNb = aSubShapesToKeepAttrList->size(); + std::list aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape); + for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt) + { + GeomShapePtr aSubShape = *anIt; + for(anIndex = 0; anIndex < aSubsToKeepNb; ++anIndex) { + AttributeSelectionPtr anAttrSelectionInList = aSubShapesToKeepAttrList->value(anIndex); + GeomShapePtr aSubShapeToKeep = anAttrSelectionInList->value(); + if (aSubShapeToKeep.get() && aSubShapeToKeep->isEqual(aSubShape)) { + break; + } + } + + if (anIndex == aSubsToKeepNb) { + if(!isHasSubs) { + aSubShapesToRemoveAttrList->append(aContext, aSubShape); + } else { + std::list anAllSubs; + ModelAPI_Tools::allSubs(aResultBody, anAllSubs); + std::list::iterator aSubsIt = anAllSubs.begin(); + for(; aSubsIt != anAllSubs.end(); aSubsIt++) { + ResultBodyPtr aSub = std::dynamic_pointer_cast(*aSubsIt); + if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) { + aSubShapesToRemoveAttrList->append(aSub, aSubShape); + break; + } + } + } + } } - GeomAPI_Shape::ShapeType aShapeType = aBaseShape->shapeType(); - if(aShapeType != GeomAPI_Shape::WIRE - && aShapeType != GeomAPI_Shape::SHELL - && aShapeType != GeomAPI_Shape::COMPSOLID - && aShapeType != GeomAPI_Shape::COMPOUND) { + } + else if (theID == SUBSHAPES_TO_REMOVE_ID()) + { + aSubShapesToKeepAttrList->clear(); + + if (!aBaseShape.get()) { return; } - for(GeomAPI_ShapeIterator anIt(aBaseShape); anIt.more(); anIt.next()) { - GeomShapePtr aSubShape = anIt.current(); - const int aNumOfSubs = aResultCompSolid->numberOfSubs(); - if(aNumOfSubs == 0) { - aSubShapesAttrList->append(aContext, aSubShape); - } else { - for(int anIndex = 0; anIndex < aResultCompSolid->numberOfSubs(); ++anIndex) { - ResultBodyPtr aSubResult = aResultCompSolid->subResult(anIndex); - if(aSubResult->shape()->isEqual(aSubShape)) { - aSubShapesAttrList->append(aSubResult, aSubShape); - break; + + int anIndex; + const int aSubsToRemoveNb = aSubShapesToRemoveAttrList->size(); + std::list aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape); + for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt) + { + GeomShapePtr aSubShape = *anIt; + for(anIndex = 0; anIndex < aSubsToRemoveNb; ++anIndex) { + AttributeSelectionPtr anAttrSelectionInList = aSubShapesToRemoveAttrList->value(anIndex); + GeomShapePtr aSubShapeToRemove = anAttrSelectionInList->value(); + if (aSubShapeToRemove.get() && aSubShapeToRemove->isEqual(aSubShape)) { + break; + } + } + + if (anIndex == aSubsToRemoveNb) { + if(!isHasSubs) { + aSubShapesToKeepAttrList->append(aContext, aSubShape); + } else { + std::list anAllSubs; + ModelAPI_Tools::allSubs(aResultBody, anAllSubs); + std::list::iterator aSubsIt = anAllSubs.begin(); + for(; aSubsIt != anAllSubs.end(); aSubsIt++) { + ResultBodyPtr aSub = std::dynamic_pointer_cast(*aSubsIt); + if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) { + aSubShapesToKeepAttrList->append(aSub, aSubShape); + break; + } } } } } } + + myChangedInCode = false; } //================================================================================================== @@ -87,27 +205,81 @@ void FeaturesPlugin_RemoveSubShapes::execute() { // Get base shape and sub-shapes list. AttributeSelectionPtr aShapeAttrSelection = selection(BASE_SHAPE_ID()); - AttributeSelectionListPtr aSubShapesAttrList = selectionList(SUBSHAPES_ID()); + AttributeSelectionListPtr aSubShapesAttrList = selectionList(SUBSHAPES_TO_KEEP_ID()); if(!aShapeAttrSelection.get() || !aSubShapesAttrList.get()) { return; } - // Copy base shape. + // Get base shape. GeomShapePtr aBaseShape = aShapeAttrSelection->value(); - if(!aBaseShape.get()) { - return; + + GeomShapePtr aResultShape; + int aSubsNb = aSubShapesAttrList->size(); + if(aSubsNb > 1) { + if(!aBaseShape.get()) { + return; + } + aResultShape = aBaseShape->emptyCopied(); + + // Copy sub-shapes from list to new shape. + for(int anIndex = 0; anIndex < aSubsNb; ++anIndex) { + AttributeSelectionPtr anAttrSelectionInList = aSubShapesAttrList->value(anIndex); + GeomShapePtr aShapeToAdd = anAttrSelectionInList->value(); + GeomAlgoAPI_ShapeBuilder::add(aResultShape, aShapeToAdd); + } + } else if(aSubsNb == 1) { + AttributeSelectionPtr anAttrSelectionInList = aSubShapesAttrList->value(0); + aResultShape = anAttrSelectionInList->value(); } - GeomShapePtr aResultShape = aBaseShape->emptyCopied(); + // deleted and copied must be jointed to one list which keeps all the history + GeomAlgoAPI_MakeShapeList aMakeShapeList; - // Copy sub-shapes from list to new shape. - for(int anIndex = 0; anIndex < aSubShapesAttrList->size(); ++anIndex) { - AttributeSelectionPtr anAttrSelectionInList = aSubShapesAttrList->value(anIndex); - GeomShapePtr aShapeToAdd = anAttrSelectionInList->value(); - GeomAlgoAPI_ShapeBuilder::add(aResultShape, aShapeToAdd); + // find all removed shapes + std::shared_ptr aDeletedSubs(new GeomAlgoAPI_MakeShapeCustom); + std::set aTypes; // types that where removed + aTypes.insert(GeomAPI_Shape::FACE); + + std::list aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape); + for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt) { + GeomShapePtr aSubShape = *anIt; + if (!aSubShape.get() || aSubShape->isNull()) + continue; + + int anIndex; + for(anIndex = 0; anIndex < aSubsNb; ++anIndex) { + AttributeSelectionPtr anAttrSelectionInList = aSubShapesAttrList->value(anIndex); + GeomShapePtr aLeftShape = anAttrSelectionInList->value(); + if (aSubShape->isEqual(aLeftShape)) { + break; // found in a left-list + } + } + if (anIndex == aSubsNb) { // not found in left + aDeletedSubs->addDeleted(aSubShape); + aTypes.insert(aSubShape->shapeType()); + if (aSubShape->shapeType() != GeomAPI_Shape::FACE) { + GeomAPI_ShapeExplorer aFaces(aSubShape, GeomAPI_Shape::FACE); + for(; aFaces.more(); aFaces.next()) + aDeletedSubs->addDeleted(aFaces.current()); + } + } } + aMakeShapeList.appendAlgo(aDeletedSubs); + + std::shared_ptr aCopy(new GeomAlgoAPI_Copy(aResultShape)); + aResultShape = aCopy->shape(); + aMakeShapeList.appendAlgo(aCopy); // Store result. ResultBodyPtr aResultBody = document()->createBody(data()); - aResultBody->storeModified(aBaseShape, aResultShape); + aResultBody->storeModified(aBaseShape, aResultShape, 1); + std::set::iterator aTypeIter = aTypes.begin(); + for(; aTypeIter != aTypes.end(); aTypeIter++) + aResultBody->loadDeletedShapes(&aMakeShapeList, aBaseShape, *aTypeIter, 1); + aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::FACE, + 2, "Modified_Face", *aMakeShapeList.mapOfSubShapes().get(), true, false, true); + aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::EDGE, + 3, "Modified_Edge", *aMakeShapeList.mapOfSubShapes().get(), false, false, true); + aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::VERTEX, + 4, "Modified_Vertex", *aMakeShapeList.mapOfSubShapes().get()); setResult(aResultBody); }