X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_MultiRotation.cpp;h=64286a9d7e6d8b70f52cbdfca3d2debc18a95d97;hb=95375993f1f35e4716475c0b0c8e265c082c875d;hp=3bd55a63a6e37509e87e02b399bc1269dd31e220;hpb=3d360f22b8a281a22799c2781cc2f69467e1a838;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp b/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp index 3bd55a63a..64286a9d7 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp @@ -1,13 +1,33 @@ -// Copyright (C) 2014-201x CEA/DEN, EDF R&D +// Copyright (C) 2017-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 +// // File: FeaturesPlugin_MultiRotation.cpp // Created: 30 Jan 2017 // Author: Clarisse Genrault (CEA) #include +#include #include +#include #include +#include #include #include @@ -15,6 +35,7 @@ #include #include #include +#include #include #include @@ -49,24 +70,29 @@ void FeaturesPlugin_MultiRotation::initAttributes() data()->addAttribute(FeaturesPlugin_MultiRotation::NB_COPIES_ANGULAR_ID(), ModelAPI_AttributeInteger::typeId()); - /*data()->addAttribute(FeaturesPlugin_MultiRotation::USE_RADIAL_DIR_ID(), +#ifdef FEATURE_MULTIROTATION_TWO_DIRECTIONS + data()->addAttribute(FeaturesPlugin_MultiRotation::USE_RADIAL_DIR_ID(), ModelAPI_AttributeString::typeId()); data()->addAttribute(FeaturesPlugin_MultiRotation::STEP_RADIAL_ID(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(FeaturesPlugin_MultiRotation::NB_COPIES_RADIAL_ID(), - ModelAPI_AttributeInteger::typeId());*/ + ModelAPI_AttributeInteger::typeId()); +#endif } //================================================================================================= void FeaturesPlugin_MultiRotation::execute() { - /*std::string useRadialDir = string(FeaturesPlugin_MultiRotation::USE_RADIAL_DIR_ID())->value(); +#ifdef FEATURE_MULTIROTATION_TWO_DIRECTIONS + std::string useRadialDir = string(FeaturesPlugin_MultiRotation::USE_RADIAL_DIR_ID())->value(); if (useRadialDir.empty()) { performRotation1D(); } else { performRotation2D(); - }*/ + } +#else performRotation1D(); +#endif } //================================================================================================= @@ -78,6 +104,7 @@ void FeaturesPlugin_MultiRotation::performRotation1D() AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_MultiRotation::OBJECTS_LIST_ID()); if (anObjectsSelList->size() == 0) { + setError("Error: empty selection list"); return; } for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) { @@ -85,7 +112,6 @@ void FeaturesPlugin_MultiRotation::performRotation1D() anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); if(!anObject.get()) { // may be for not-activated parts - eraseResults(); return; } anObjects.push_back(anObject); @@ -93,21 +119,39 @@ void FeaturesPlugin_MultiRotation::performRotation1D() } //Getting axis. - std::shared_ptr anAxis; - std::shared_ptr anEdge; - std::shared_ptr anObjRef = - selection(FeaturesPlugin_MultiRotation::AXIS_ANGULAR_ID()); - if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) { - anEdge = std::shared_ptr(new GeomAPI_Edge(anObjRef->value())); - } else if (anObjRef && !anObjRef->value() && anObjRef->context() && - anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) { - anEdge = std::shared_ptr(new GeomAPI_Edge(anObjRef->context()->shape())); + static const std::string aSelectionError = "Error: The axis shape selection is bad."; + AttributeSelectionPtr anObjRef = selection(AXIS_ANGULAR_ID()); + GeomShapePtr aShape = anObjRef->value(); + if (!aShape.get()) { + if (anObjRef->context().get()) { + aShape = anObjRef->context()->shape(); + } } - if(anEdge) { - anAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), - anEdge->line()->direction())); + if (!aShape.get()) { + setError(aSelectionError); + return; + } + + GeomEdgePtr anEdge; + if (aShape->isEdge()) + { + anEdge = aShape->edge(); + } + else if (aShape->isCompound()) + { + GeomAPI_ShapeIterator anIt(aShape); + anEdge = anIt.current()->edge(); } + if (!anEdge.get()) + { + setError(aSelectionError); + return; + } + + std::shared_ptr anAxis(new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); + // Getting number of copies. int nbCopies = integer(FeaturesPlugin_MultiRotation::NB_COPIES_ANGULAR_ID())->value(); @@ -135,7 +179,7 @@ void FeaturesPlugin_MultiRotation::performRotation1D() for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { std::shared_ptr aBaseShape = *anObjectsIt; - bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); + bool isPart = aContext->get() && (*aContext)->groupName() == ModelAPI_ResultPart::group(); // Setting result. if (isPart) { @@ -149,8 +193,10 @@ void FeaturesPlugin_MultiRotation::performRotation1D() aResultIndex++; } } else { + std::string anError; ListOfShape aListOfShape; - std::list > aListOfRotationAlgo; + std::shared_ptr + aListOfRotationAlgo(new GeomAlgoAPI_MakeShapeList); for (int i=0; i aRotationnAlgo( @@ -164,29 +210,21 @@ void FeaturesPlugin_MultiRotation::performRotation1D() aRotationnAlgo->build(); // Checking that the algorithm worked properly. - if (!aRotationnAlgo->isDone()) { - static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; - setError(aFeatureError); - break; - } - if (aRotationnAlgo->shape()->isNull()) { - static const std::string aShapeError = "Error : Resulting shape is null."; - setError(aShapeError); - break; - } - if (!aRotationnAlgo->isValid()) { - static const std::string aFeatureError = "Error : Resulting shape in not valid."; - setError(aFeatureError); + if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aRotationnAlgo, getKind(), anError)) { + setError(anError); break; } aListOfShape.push_back(aRotationnAlgo->shape()); - aListOfRotationAlgo.push_back(aRotationnAlgo); + aListOfRotationAlgo->appendAlgo(aRotationnAlgo); } std::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aListOfShape); ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - aResultBody->storeModified(aBaseShape, aCompound); - loadNamingDS(aListOfRotationAlgo, aResultBody, aBaseShape); + + ListOfShape aBaseShapes; + aBaseShapes.push_back(aBaseShape); + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, aBaseShapes, ListOfShape(), + aListOfRotationAlgo, aCompound, "Rotated"); setResult(aResultBody, aResultIndex); } @@ -198,6 +236,7 @@ void FeaturesPlugin_MultiRotation::performRotation1D() } //================================================================================================= +#ifdef FEATURE_MULTIROTATION_TWO_DIRECTIONS void FeaturesPlugin_MultiRotation::performRotation2D() { // Getting objects. @@ -213,7 +252,6 @@ void FeaturesPlugin_MultiRotation::performRotation2D() anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); if(!anObject.get()) { // may be for not-activated parts - eraseResults(); return; } anObjects.push_back(anObject); @@ -277,7 +315,7 @@ void FeaturesPlugin_MultiRotation::performRotation2D() for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { std::shared_ptr aBaseShape = *anObjectsIt; - bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); + bool isPart = aContext->get() && (*aContext)->groupName() == ModelAPI_ResultPart::group(); std::shared_ptr aDir = GeomAlgoAPI_ShapeTools::buildDirFromAxisAndShape(aBaseShape, anAxis); @@ -388,34 +426,16 @@ void FeaturesPlugin_MultiRotation::loadNamingDS2( std::shared_ptr theResultBody, std::shared_ptr theBaseShape) { - int aTag = 1; - int anIndex = 1; - std::string aRotatedName; - for (std::list >::const_iterator anIt = theListOfTranslationAlgo.begin(); anIt != theListOfTranslationAlgo.cend(); ++anIt) { - std::cout << "LOAD" << std::endl; - std::shared_ptr aSubShapes = (*anIt)->mapOfSubShapes(); - // naming of faces - aRotatedName = "Rotated_Face_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::FACE, - aTag++, aRotatedName, *aSubShapes.get(), - false, true); + theResultBody->loadModifiedShapes(*anIt, theBaseShape, GeomAPI_Shape::FACE, "Rotated_Face"); // naming of edges - aRotatedName = "Rotated_Edge_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::EDGE, - aTag++, aRotatedName, *aSubShapes.get(), - false, true); + theResultBody->loadModifiedShapes(*anIt, theBaseShape, GeomAPI_Shape::EDGE, "Rotated_Edge"); // naming of vertex - aRotatedName = "Rotated_Vertex_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::VERTEX, - aTag++, aRotatedName, *aSubShapes.get(), - false, true); - - ++anIndex; + theResultBody->loadModifiedShapes(*anIt, theBaseShape, GeomAPI_Shape::VERTEX, "Rotated_Vertex"); } } @@ -425,7 +445,6 @@ void FeaturesPlugin_MultiRotation::loadNamingDS3( std::shared_ptr theResultBody, std::shared_ptr theBaseShape, int nb) { - int aTag = 6*nb+1; int anIndex = nb+1; std::string aRotatedName; @@ -438,44 +457,10 @@ void FeaturesPlugin_MultiRotation::loadNamingDS3( for(; anExp.more(); anExp.next()) { aRotatedName = "Rotated_Face_" + std::to_string((long long) anIndex); aRotatedName = aRotatedName + "_" + std::to_string((long long) numFace); - theResultBody->generated(anExp.current(), aRotatedName, aTag++); + theResultBody->generated(anExp.current(), aRotatedName); ++numFace; } ++anIndex; } } - -//================================================================================================= -void FeaturesPlugin_MultiRotation::loadNamingDS( - std::list > theListOfRotationAlgo, - std::shared_ptr theResultBody, - std::shared_ptr theBaseShape) -{ - int aTag = 1; - int anIndex = 1; - std::string aRotatedName; - - for (std::list >::const_iterator anIt = - theListOfRotationAlgo.begin(); anIt != theListOfRotationAlgo.cend(); ++anIt) { - std::shared_ptr aSubShapes = (*anIt)->mapOfSubShapes(); - - // naming of faces - aRotatedName = "Rotated_Face_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::FACE, - aTag++, aRotatedName, *aSubShapes.get(), - false, true); - - // naming of edges - aRotatedName = "Rotated_Edge_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::EDGE, - aTag++, aRotatedName, *aSubShapes.get(), - false, true); - - // naming of vertex - aRotatedName = "Rotated_Vertex_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::VERTEX, - aTag++, aRotatedName, *aSubShapes.get(), - false, true); - ++anIndex; - } -} +#endif