X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Rotation.cpp;h=cfbc56c8d5c71588ac8f5302c5f1a8a52c4661bc;hb=ae99406621a38cdc90d921b9ba63caaf9d84198e;hp=81e24480297f5e0f658bd7e9a00952e0353ae018;hpb=6bd91d6692dfbfa6462e4b6463ff113ad51b3782;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp old mode 100755 new mode 100644 index 81e244802..cfbc56c8d --- a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -25,16 +24,24 @@ #include #include #include +#include +#include #include +#include +#include +#include #include #include #include +#include #include #include +static const std::string ROTATION_VERSION_1("v9.5"); + //================================================================================================= FeaturesPlugin_Rotation::FeaturesPlugin_Rotation() { @@ -60,6 +67,11 @@ void FeaturesPlugin_Rotation::initAttributes() ModelAPI_AttributeSelection::typeId()); data()->addAttribute(FeaturesPlugin_Rotation::END_POINT_ID(), ModelAPI_AttributeSelection::typeId()); + + if (!aSelection->isInitialized()) { + // new feature, not read from file + data()->setVersion(ROTATION_VERSION_1); + } } //================================================================================================= @@ -68,37 +80,18 @@ void FeaturesPlugin_Rotation::execute() AttributeStringPtr aMethodTypeAttr = string(FeaturesPlugin_Rotation::CREATION_METHOD()); std::string aMethodType = aMethodTypeAttr->value(); - if (aMethodType == CREATION_METHOD_BY_ANGLE()) { - performTranslationByAxisAndAngle(); - } + GeomTrsfPtr aTrsf; + if (aMethodType == CREATION_METHOD_BY_ANGLE()) + aTrsf = rotationByAxisAndAngle(); + else if (aMethodType == CREATION_METHOD_BY_THREE_POINTS()) + aTrsf = rotationByThreePoints(); - if (aMethodType == CREATION_METHOD_BY_THREE_POINTS()) { - performTranslationByThreePoints(); - } + performRotation(aTrsf); } //================================================================================================= -void FeaturesPlugin_Rotation::performTranslationByAxisAndAngle() +GeomTrsfPtr FeaturesPlugin_Rotation::rotationByAxisAndAngle() { - // Getting objects. - ListOfShape anObjects; - std::list aContextes; - AttributeSelectionListPtr anObjectsSelList = - selectionList(FeaturesPlugin_Rotation::OBJECTS_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); - aContextes.push_back(anObjectAttr->context()); - } - //Getting axis. static const std::string aSelectionError = "Error: The axis shape selection is bad."; AttributeSelectionPtr anObjRef = selection(AXIS_OBJECT_ID()); @@ -110,7 +103,7 @@ void FeaturesPlugin_Rotation::performTranslationByAxisAndAngle() } if (!aShape.get()) { setError(aSelectionError); - return; + return GeomTrsfPtr(); } GeomEdgePtr anEdge; @@ -123,100 +116,25 @@ void FeaturesPlugin_Rotation::performTranslationByAxisAndAngle() GeomAPI_ShapeIterator anIt(aShape); anEdge = anIt.current()->edge(); } - else - { - setError(aSelectionError); - return; - } if (!anEdge.get()) { setError(aSelectionError); - return; + return GeomTrsfPtr(); } std::shared_ptr anAxis (new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction())); - - // Getting angle. double anAngle = real(FeaturesPlugin_Rotation::ANGLE_ID())->value(); - // Rotating each object. - int aResultIndex = 0; - std::list::iterator aContext = aContextes.begin(); - for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); - anObjectsIt++, aContext++) { - std::shared_ptr aBaseShape = *anObjectsIt; - bool isPart = aContext->get() && (*aContext)->groupName() == ModelAPI_ResultPart::group(); - - // Setting result. - if (isPart) { - std::shared_ptr aTrsf(new GeomAPI_Trsf()); - aTrsf->setRotation(anAxis, anAngle); - ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); - ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); - aResultPart->setTrsf(*aContext, aTrsf); - setResult(aResultPart, aResultIndex); - } else { - GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, anAxis, anAngle); - - if (!aRotationAlgo.check()) { - setError(aRotationAlgo.getError()); - return; - } - - aRotationAlgo.build(); - - // Checking that the algorithm worked properly. - if(!aRotationAlgo.isDone()) { - static const std::string aFeatureError = "Error: Rotation algorithm failed."; - setError(aFeatureError); - break; - } - if(aRotationAlgo.shape()->isNull()) { - static const std::string aShapeError = "Error: Resulting shape is Null."; - setError(aShapeError); - break; - } - if(!aRotationAlgo.isValid()) { - std::string aFeatureError = "Error: Resulting shape is not valid."; - setError(aFeatureError); - break; - } - - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - loadNamingDS(aRotationAlgo, aResultBody, aBaseShape); - setResult(aResultBody, aResultIndex); - } - aResultIndex++; - } - - // Remove the rest results if there were produced in the previous pass. - removeResults(aResultIndex); + GeomTrsfPtr aTrsf(new GeomAPI_Trsf()); + aTrsf->setRotation(anAxis, anAngle); + return aTrsf; } //================================================================================================= -void FeaturesPlugin_Rotation::performTranslationByThreePoints() +GeomTrsfPtr FeaturesPlugin_Rotation::rotationByThreePoints() { - // Getting objects. - ListOfShape anObjects; - std::list aContextes; - AttributeSelectionListPtr anObjectsSelList = - selectionList(FeaturesPlugin_Rotation::OBJECTS_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); - aContextes.push_back(anObjectAttr->context()); - } - // Getting the center point and two points (start and end) std::shared_ptr aCenterPoint; std::shared_ptr aStartPoint; @@ -227,87 +145,93 @@ void FeaturesPlugin_Rotation::performTranslationByThreePoints() selection(FeaturesPlugin_Rotation::START_POINT_ID()); std::shared_ptr anEndPointRef = selection(FeaturesPlugin_Rotation::END_POINT_ID()); - if ((aCenterRef.get() != NULL) && (aStartPointRef.get() != NULL) - && (anEndPointRef.get() != NULL)) { + if ((aCenterRef.get() != NULL) && + (aStartPointRef.get() != NULL) && + (anEndPointRef.get() != NULL)) { GeomShapePtr aCenterShape = aCenterRef->value(); - if (!aCenterShape.get()) + if (!aCenterShape.get() && aCenterRef->context().get()) aCenterShape = aCenterRef->context()->shape(); GeomShapePtr aStartShape = aStartPointRef->value(); - if (!aStartShape.get()) + if (!aStartShape.get() && aStartPointRef->context().get()) aStartShape = aStartPointRef->context()->shape(); - GeomShapePtr anEndShape = anEndPointRef->value(); - if (!anEndShape.get()) + GeomShapePtr anEndShape = anEndPointRef->value(); + if (!anEndShape.get() && anEndPointRef->context().get()) anEndShape = anEndPointRef->context()->shape(); if (aStartShape && anEndShape && aCenterShape) { aCenterPoint = GeomAlgoAPI_PointBuilder::point(aCenterShape); aStartPoint = GeomAlgoAPI_PointBuilder::point(aStartShape); anEndPoint = GeomAlgoAPI_PointBuilder::point(anEndShape); } - } - // Rotating each object. - int aResultIndex = 0; - std::list::iterator aContext = aContextes.begin(); - for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); - anObjectsIt++, aContext++) { - std::shared_ptr aBaseShape = *anObjectsIt; - bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); - - // Setting result. - if (isPart) { - std::shared_ptr aTrsf(new GeomAPI_Trsf()); - aTrsf->setRotation(aCenterPoint, aStartPoint, anEndPoint); - ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); - ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); - aResultPart->setTrsf(*aContext, aTrsf); - setResult(aResultPart, aResultIndex); - } else { - GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, aCenterPoint, aStartPoint, anEndPoint); - - if (!aRotationAlgo.check()) { - setError(aRotationAlgo.getError()); - return; - } - - aRotationAlgo.build(); - - // Checking that the algorithm worked properly. - if(!aRotationAlgo.isDone()) { - static const std::string aFeatureError = "Error: Rotation algorithm failed."; - setError(aFeatureError); - break; - } - if(aRotationAlgo.shape()->isNull()) { - static const std::string aShapeError = "Error : Resulting shape is Null."; - setError(aShapeError); - break; - } - if(!aRotationAlgo.isValid()) { - std::string aFeatureError = "Error: Resulting shape is not valid."; - setError(aFeatureError); - break; - } - - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - loadNamingDS(aRotationAlgo, aResultBody, aBaseShape); - setResult(aResultBody, aResultIndex); - } - aResultIndex++; + if (!aCenterPoint || !aStartPoint || !anEndPoint) + return GeomTrsfPtr(); } + + GeomTrsfPtr aTrsf(new GeomAPI_Trsf()); + aTrsf->setRotation(aCenterPoint, aStartPoint, anEndPoint); + return aTrsf; } //================================================================================================= -void FeaturesPlugin_Rotation::loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo, - std::shared_ptr theResultBody, - std::shared_ptr theBaseShape) +void FeaturesPlugin_Rotation::performRotation(const GeomTrsfPtr& theTrsf) { - // Store result. - theResultBody->storeModified(theBaseShape, theRotaionAlgo.shape()); + if (!theTrsf) { + setError("Invalid transformation."); + return; + } - std::string aRotatedName = "Rotated"; - std::shared_ptr aSubShapes = theRotaionAlgo.mapOfSubShapes(); + bool isKeepSubShapes = data()->version() == ROTATION_VERSION_1; + + // Getting objects. + GeomAPI_ShapeHierarchy anObjects; + std::list aParts; + ResultPtr aTextureSource; + AttributeSelectionListPtr anObjSelList = selectionList(OBJECTS_LIST_ID()); + if (!FeaturesPlugin_Tools::shapesFromSelectionList( + anObjSelList, isKeepSubShapes, anObjects, aParts, aTextureSource)) + return; - FeaturesPlugin_Tools::storeModifiedShapes(theRotaionAlgo, theResultBody, - theBaseShape, 1, 2, 3, aRotatedName, - *aSubShapes.get()); + std::string anError; + int aResultIndex = 0; + // Rotating each part. + for (std::list::iterator aPRes = aParts.begin(); aPRes != aParts.end(); ++aPRes) { + ResultPartPtr anOriginal = std::dynamic_pointer_cast(*aPRes); + ResultPartPtr aResultPart = document()->copyPart(anOriginal, data(), aResultIndex); + aResultPart->setTrsf(anOriginal, theTrsf); + setResult(aResultPart, aResultIndex++); + } + + // Collect transformations for each object in a part. + std::shared_ptr aMakeShapeList(new GeomAlgoAPI_MakeShapeList); + for(GeomAPI_ShapeHierarchy::iterator anObjectsIt = anObjects.begin(); + anObjectsIt != anObjects.end(); ++anObjectsIt) { + std::shared_ptr aBaseShape = *anObjectsIt; + std::shared_ptr aRotationAlgo( + new GeomAlgoAPI_Transform(aBaseShape, theTrsf)); + + // Checking that the algorithm worked properly. + if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aRotationAlgo, getKind(), anError)) { + setError(anError); + break; + } + + anObjects.markModified(aBaseShape, aRotationAlgo->shape()); + aMakeShapeList->appendAlgo(aRotationAlgo); + } + + // Build results of the rotation. + const ListOfShape& anOriginalShapes = anObjects.objects(); + ListOfShape aTopLevel; + anObjects.topLevelObjects(aTopLevel); + for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) { + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(), + aMakeShapeList, *anIt, "Rotated"); + // Copy image data, if any + ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody); + setResult(aResultBody, aResultIndex++); + } + + // Remove the rest results if there were produced in the previous pass. + removeResults(aResultIndex); }