X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_ResultBody.cpp;h=603aaac4df93d98a740c804eefbafa7a4928d40d;hb=d63aa3e66ea4f15430a40d80d9ecd0c87b557e7e;hp=ba28f8b90cf9c1bbda60e646be1d94b26b9d09b3;hpb=9fadaebe6d57d0836c7997ee60eb4cfdb67e2ffb;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI_ResultBody.cpp b/src/ModelAPI/ModelAPI_ResultBody.cpp index ba28f8b90..603aaac4d 100644 --- a/src/ModelAPI/ModelAPI_ResultBody.cpp +++ b/src/ModelAPI/ModelAPI_ResultBody.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "ModelAPI_ResultBody.h" @@ -39,8 +38,8 @@ std::string ModelAPI_ResultBody::groupName() return group(); } -void ModelAPI_ResultBody::store(const std::shared_ptr& theShape, - const bool theIsStoreSameShapes) +void ModelAPI_ResultBody::store(const GeomShapePtr& theShape, + const bool theIsStoreSameShapes) { myBuilder->store(theShape, theIsStoreSameShapes); myConnect = ConnectionNotComputed; @@ -53,8 +52,8 @@ void ModelAPI_ResultBody::store(const std::shared_ptr& theShape, updateSubs(theShape); } -void ModelAPI_ResultBody::storeGenerated(const std::shared_ptr& theFromShape, - const std::shared_ptr& theToShape) +void ModelAPI_ResultBody::storeGenerated(const GeomShapePtr& theFromShape, + const GeomShapePtr& theToShape) { myBuilder->storeGenerated(theFromShape, theToShape); myConnect = ConnectionNotComputed; @@ -67,11 +66,11 @@ void ModelAPI_ResultBody::storeGenerated(const std::shared_ptr& t updateSubs(theToShape); } -void ModelAPI_ResultBody::storeModified(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, - const int theDecomposeSolidsTag) +void ModelAPI_ResultBody::storeGenerated( + const std::list& theFromShapes, const GeomShapePtr& theToShape, + const std::shared_ptr theMakeShape) { - myBuilder->storeModified(theOldShape, theNewShape, theDecomposeSolidsTag); + myBuilder->storeGenerated(theFromShapes, theToShape, theMakeShape); myConnect = ConnectionNotComputed; static Events_Loop* aLoop = Events_Loop::loop(); @@ -79,98 +78,74 @@ void ModelAPI_ResultBody::storeModified(const std::shared_ptr& th static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get(); aECreator->sendUpdated(data()->owner(), aRedispEvent); - updateSubs(theNewShape); + updateSubs(theToShape, theFromShapes, theMakeShape, true); } -void ModelAPI_ResultBody::storeWithoutNaming(const std::shared_ptr& theShape) +void ModelAPI_ResultBody::storeModified(const GeomShapePtr& theOldShape, + const GeomShapePtr& theNewShape, + const bool theIsCleanStored) { - myBuilder->storeWithoutNaming(theShape); + myBuilder->storeModified(theOldShape, theNewShape, theIsCleanStored); myConnect = ConnectionNotComputed; static Events_Loop* aLoop = Events_Loop::loop(); static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get(); aECreator->sendUpdated(data()->owner(), aRedispEvent); -} - -std::shared_ptr ModelAPI_ResultBody::shape() -{ - return myBuilder->shape(); -} -void ModelAPI_ResultBody::generated(const std::shared_ptr& theNewShape, - const std::string& theName, const int theTag) -{ - myBuilder->generated(theNewShape, theName, theTag); -} - -void ModelAPI_ResultBody::generated(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, - const int theTag) -{ - myBuilder->generated(theOldShape, theNewShape, theName, theTag); + updateSubs(theNewShape); } -void ModelAPI_ResultBody::modified(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, - const int theTag) +void ModelAPI_ResultBody::storeModified( + const std::list& theOldShapes, const GeomShapePtr& theNewShape, + const std::shared_ptr theMakeShape) { - myBuilder->modified(theOldShape, theNewShape, theName, theTag); -} + myBuilder->storeModified(theOldShapes, theNewShape, theMakeShape); + myConnect = ConnectionNotComputed; + static Events_Loop* aLoop = Events_Loop::loop(); + static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); + static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get(); + aECreator->sendUpdated(data()->owner(), aRedispEvent); -void ModelAPI_ResultBody::deleted( - const std::shared_ptr& theOldShape, const int theTag) -{ - myBuilder->deleted(theOldShape, theTag); + updateSubs(theNewShape, theOldShapes, theMakeShape, false); } -void ModelAPI_ResultBody::loadDeletedShapes(GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag) +GeomShapePtr ModelAPI_ResultBody::shape() { - myBuilder->loadDeletedShapes(theMS, theShapeIn, theKindOfShape, theTag); + return myBuilder->shape(); } -void ModelAPI_ResultBody::loadAndOrientModifiedShapes(GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, const int theKindOfShape, const int theTag, - const std::string& theName, GeomAPI_DataMapOfShapeShape& theSubShapes, - const bool theIsStoreSeparate, - const bool theIsStoreAsGenerated, - const bool /*theSplitInSubs*/) +void ModelAPI_ResultBody::generated(const GeomShapePtr& theOldShape, + const GeomShapePtr& theNewShape, + const std::string& theName) { - myBuilder->loadAndOrientModifiedShapes( - theMS, theShapeIn, theKindOfShape, theTag, theName, theSubShapes, theIsStoreSeparate, - theIsStoreAsGenerated); + myBuilder->generated(theOldShape, theNewShape, theName); } -void ModelAPI_ResultBody::loadAndOrientGeneratedShapes(GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, const int theKindOfShape, - const int theTag, const std::string& theName, GeomAPI_DataMapOfShapeShape& theSubShapes) +void ModelAPI_ResultBody::modified(const GeomShapePtr& theOldShape, + const GeomShapePtr& theNewShape, + const std::string& theName) { - myBuilder->loadAndOrientGeneratedShapes( - theMS, theShapeIn, theKindOfShape, theTag, theName, theSubShapes); + myBuilder->modified(theOldShape, theNewShape, theName); } -void ModelAPI_ResultBody::loadFirstLevel(std::shared_ptr theShape, - const std::string& theName, int& theTag) -{ - myBuilder->loadFirstLevel(theShape, theName, theTag); -} -void ModelAPI_ResultBody::loadDisconnectedEdges(std::shared_ptr theShape, - const std::string& theName, int& theTag) +void ModelAPI_ResultBody::loadDeletedShapes(const GeomMakeShapePtr& theAlgo, + const GeomShapePtr& theOldShape, + const GeomAPI_Shape::ShapeType theShapeTypeToExplore, + const GeomShapePtr& theShapesToExclude) { - myBuilder->loadDisconnectedEdges(theShape, theName, theTag); + myBuilder->loadDeletedShapes(theAlgo, theOldShape, theShapeTypeToExplore, theShapesToExclude); } -void ModelAPI_ResultBody::loadDisconnectedVertexes(std::shared_ptr theShape, - const std::string& theName, int& theTag) +void ModelAPI_ResultBody::loadFirstLevel(GeomShapePtr theShape, + const std::string& theName) { - myBuilder->loadDisconnectedVertexes(theShape, theName, theTag); + myBuilder->loadFirstLevel(theShape, theName); } +// LCOV_EXCL_START bool ModelAPI_ResultBody::isConnectedTopology() { if (myConnect == ConnectionNotComputed) { @@ -185,3 +160,4 @@ void ModelAPI_ResultBody::setDisplayed(const bool theDisplay) for (int i = 0; i < numberOfSubs(); i++) subResult(i)->setDisplayed(theDisplay); } +// LCOV_EXCL_STOP