X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FFeaturesPlugin%2FFeaturesPlugin_MultiTranslation.cpp;h=355a0fdfd2beb7c8679f3b748697baecf4835654;hb=65fb6fac9731831e7197d0841e4444e69eb7d7ce;hp=7bddd8e176f83cfe7458ae27c14bfc110dcfcb2a;hpb=b707e7178424958f7dc1ed87a0aabd813f671d88;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp index 7bddd8e17..355a0fdfd 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-201x CEA/DEN, EDF R&D - -// File: FeaturesPlugin_MultiTranslation.cpp -// Created: 30 Jan 2017 -// Author: Clarisse Genrault (CEA) +// 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 @@ -11,6 +25,7 @@ #include #include #include +#include #include #include @@ -87,21 +102,44 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() } //Getting axis. - std::shared_ptr anAxis; - std::shared_ptr anEdge; - std::shared_ptr anObjRef = - selection(FeaturesPlugin_MultiTranslation::AXIS_FIRST_DIR_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_FIRST_DIR_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(); + } + else + { + setError(aSelectionError); + return; + } + + if (!anEdge.get()) + { + setError(aSelectionError); + return; } + std::shared_ptr anAxis (new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); + // Getting step. double aStep = real(FeaturesPlugin_MultiTranslation::STEP_FIRST_DIR_ID())->value(); @@ -113,6 +151,7 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() std::string aFeatureError = "Multitranslation builder "; aFeatureError+=":: the number of copies for the first direction is null or negative."; setError(aFeatureError); + return; } // Moving each object. @@ -121,7 +160,7 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() 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) { @@ -207,33 +246,81 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection() } //Getting axis. - std::shared_ptr aFirstAxis; - std::shared_ptr anEdge; - std::shared_ptr anObjRef = - selection(FeaturesPlugin_MultiTranslation::AXIS_FIRST_DIR_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_FIRST_DIR_ID()); + GeomShapePtr aShape = anObjRef->value(); + if (!aShape.get()) { + if (anObjRef->context().get()) { + aShape = anObjRef->context()->shape(); + } + } + 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(); + } + else + { + setError(aSelectionError); + return; + } + + if (!anEdge.get()) + { + setError(aSelectionError); + return; + } + + std::shared_ptr aFirstAxis(new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); + + //Getting axis. + anObjRef = selection(AXIS_SECOND_DIR_ID()); + aShape = anObjRef->value(); + if (!aShape.get()) { + if (anObjRef->context().get()) { + aShape = anObjRef->context()->shape(); + } + } + if (!aShape.get()) { + setError(aSelectionError); + return; } - if(anEdge) { - aFirstAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), - anEdge->line()->direction())); + + if (aShape->isEdge()) + { + anEdge = aShape->edge(); + } + else if (aShape->isCompound()) + { + GeomAPI_ShapeIterator anIt(aShape); + anEdge = anIt.current()->edge(); } - std::shared_ptr aSecondAxis; - anObjRef = selection(FeaturesPlugin_MultiTranslation::AXIS_SECOND_DIR_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())); + else + { + setError(aSelectionError); + return; } - if(anEdge) { - aSecondAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), - anEdge->line()->direction())); + + if (!anEdge.get()) + { + setError(aSelectionError); + return; } + std::shared_ptr aSecondAxis(new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); + // Getting step. double aFirstStep = real(FeaturesPlugin_MultiTranslation::STEP_FIRST_DIR_ID())->value(); double aSecondStep = real(FeaturesPlugin_MultiTranslation::STEP_SECOND_DIR_ID())->value(); @@ -248,12 +335,14 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection() std::string aFeatureError = "Multitranslation builder "; aFeatureError+=":: the number of copies for the first direction is null or negative."; setError(aFeatureError); + return; } if (aSecondNbCopies <=0) { std::string aFeatureError = "Multitranslation builder "; aFeatureError+=":: the number of copies for the second direction is null or negative."; setError(aFeatureError); + return; } // Coord aFirstAxis @@ -274,7 +363,7 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection() 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) { @@ -351,32 +440,24 @@ void FeaturesPlugin_MultiTranslation::loadNamingDS( std::shared_ptr theResultBody, std::shared_ptr theBaseShape) { - int aTag = 1; - int anIndex = 1; - std::string aTranslatedName; - for (std::list >::const_iterator anIt = theListOfTranslationAlgo.begin(); anIt != theListOfTranslationAlgo.cend(); ++anIt) { - std::shared_ptr aSubShapes = (*anIt)->mapOfSubShapes(); - // naming of faces - aTranslatedName = "Translated_Face_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::FACE, - aTag++, aTranslatedName, *aSubShapes.get(), - false, true); + theResultBody->loadModifiedShapes(*anIt, + theBaseShape, + GeomAPI_Shape::FACE, + "Translated_Face"); // naming of edges - aTranslatedName = "Translated_Edge_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::EDGE, - aTag++, aTranslatedName, *aSubShapes.get(), - false, true); + theResultBody->loadModifiedShapes(*anIt, + theBaseShape, + GeomAPI_Shape::EDGE, + "Translated_Edge"); // naming of vertex - aTranslatedName = "Translated_Vertex_" + std::to_string((long long) anIndex); - theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::VERTEX, - aTag++, aTranslatedName, *aSubShapes.get(), - false, true); - - ++anIndex; + theResultBody->loadModifiedShapes(*anIt, + theBaseShape, + GeomAPI_Shape::VERTEX, + "Translated_Vertex"); } }