X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_MultiTranslation.cpp;h=4ef723603299564637fa36297c252bfbd352059f;hb=95bf0a0de36129d80569e2b4634650b9cc38733e;hp=d92efbab6ff1037f07ace428479227b9bf12d2b4;hpb=805f2d295f215730fb68e10a0fc0dd910cff557f;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp index d92efbab6..4ef723603 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,12 +25,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include @@ -39,7 +55,7 @@ void FeaturesPlugin_MultiTranslation::initAttributes() ModelAPI_AttributeDouble::typeId()); data()->addAttribute(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID(), ModelAPI_AttributeInteger::typeId()); - + data()->addAttribute(FeaturesPlugin_MultiTranslation::USE_SECOND_DIR_ID(), ModelAPI_AttributeString::typeId()); data()->addAttribute(FeaturesPlugin_MultiTranslation::AXIS_SECOND_DIR_ID(), @@ -102,58 +118,79 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() // Getting step. double aStep = real(FeaturesPlugin_MultiTranslation::STEP_FIRST_DIR_ID())->value(); - + // Getting number of copies. - int nbCopies = + int nbCopies = integer(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID())->value(); - + + if (nbCopies <=0) { + std::string aFeatureError = "Multitranslation builder "; + aFeatureError+=":: the number of copies for the first direction is null or negative."; + setError(aFeatureError); + return; + } + // Moving 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; - - ListOfShape aListOfShape; - std::list > aListOfTranslationAlgo; - - for (int i=0; i aTranslationAlgo( - new GeomAlgoAPI_Translation(aBaseShape, anAxis, i*aStep)); - - if (!aTranslationAlgo->check()) { - setError(aTranslationAlgo->getError()); - break; - } - - aTranslationAlgo->build(); - - // Checking that the algorithm worked properly. - if (!aTranslationAlgo->isDone()) { - static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; - setError(aFeatureError); - break; - } - if (aTranslationAlgo->shape()->isNull()) { - static const std::string aShapeError = "Error : Resulting shape is null."; - setError(aShapeError); - break; + bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); + + // Setting result. + if (isPart) { + ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); + std::shared_ptr aTrsf(new GeomAPI_Trsf()); + for (int i=0; isetTranslation(anAxis, i*aStep); + ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); + aResultPart->setTrsf(*aContext, aTrsf); + setResult(aResultPart, aResultIndex); + aResultIndex++; } - if (!aTranslationAlgo->isValid()) { - static const std::string aFeatureError = "Error : Resulting shape in not valid."; - setError(aFeatureError); - break; + } else { + ListOfShape aListOfShape; + std::list > aListOfTranslationAlgo; + + for (int i=0; i aTranslationAlgo( + new GeomAlgoAPI_Translation(aBaseShape, anAxis, i*aStep)); + + if (!aTranslationAlgo->check()) { + setError(aTranslationAlgo->getError()); + break; + } + + aTranslationAlgo->build(); + + // Checking that the algorithm worked properly. + if (!aTranslationAlgo->isDone()) { + static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; + setError(aFeatureError); + break; + } + if (aTranslationAlgo->shape()->isNull()) { + static const std::string aShapeError = "Error : Resulting shape is null."; + setError(aShapeError); + break; + } + if (!aTranslationAlgo->isValid()) { + static const std::string aFeatureError = "Error : Resulting shape in not valid."; + setError(aFeatureError); + break; + } + aListOfShape.push_back(aTranslationAlgo->shape()); + aListOfTranslationAlgo.push_back(aTranslationAlgo); } - aListOfShape.push_back(aTranslationAlgo->shape()); - aListOfTranslationAlgo.push_back(aTranslationAlgo); + std::shared_ptr aCompound = + GeomAlgoAPI_CompoundBuilder::compound(aListOfShape); + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + aResultBody->storeModified(aBaseShape, aCompound); + loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape); + + setResult(aResultBody, aResultIndex); } - std::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aListOfShape); - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - aResultBody->storeModified(aBaseShape, aCompound); - loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape); - - setResult(aResultBody, aResultIndex); aResultIndex++; } @@ -163,7 +200,7 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() //================================================================================================= void FeaturesPlugin_MultiTranslation::performTwoDirection() -{ +{ // Getting objects. ListOfShape anObjects; std::list aContextes; @@ -215,75 +252,109 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection() // Getting step. double aFirstStep = real(FeaturesPlugin_MultiTranslation::STEP_FIRST_DIR_ID())->value(); double aSecondStep = real(FeaturesPlugin_MultiTranslation::STEP_SECOND_DIR_ID())->value(); - + // Getting number of copies. - int aFirstNbCopies = + int aFirstNbCopies = integer(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID())->value(); - int aSecondNbCopies = + int aSecondNbCopies = integer(FeaturesPlugin_MultiTranslation::NB_COPIES_SECOND_DIR_ID())->value(); - + + if (aFirstNbCopies <=0) { + 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 double x1 = aFirstAxis->dir()->x(); double y1 = aFirstAxis->dir()->y(); double z1 = aFirstAxis->dir()->z(); double norm1 = sqrt(x1*x1 + y1*y1 + z1*z1); - + // Coord aSecondAxis double x2 = aSecondAxis->dir()->x(); double y2 = aSecondAxis->dir()->y(); double z2 = aSecondAxis->dir()->z(); double norm2 = sqrt(x2*x2 + y2*y2 + z2*z2); - + // Moving 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; - - ListOfShape aListOfShape; - std::list > aListOfTranslationAlgo; - - for (int j=0; j aTranslationAlgo( - new GeomAlgoAPI_Translation(aBaseShape, dx, dy, dz)); - - if (!aTranslationAlgo->check()) { - setError(aTranslationAlgo->getError()); - break; - } - - aTranslationAlgo->build(); - - // Checking that the algorithm worked properly. - if (!aTranslationAlgo->isDone()) { - static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; - setError(aFeatureError); - break; - } - if (aTranslationAlgo->shape()->isNull()) { - static const std::string aShapeError = "Error : Resulting shape is null."; - setError(aShapeError); - break; + bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); + + // Setting result. + if (isPart) { + ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); + std::shared_ptr aTrsf(new GeomAPI_Trsf()); + for (int j=0; jsetTranslation(dx, dy, dz); + ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); + aResultPart->setTrsf(*aContext, aTrsf); + setResult(aResultPart, aResultIndex); + aResultIndex++; } - if (!aTranslationAlgo->isValid()) { - static const std::string aFeatureError = "Error : Resulting shape in not valid."; - setError(aFeatureError); - break; + } + } else { + ListOfShape aListOfShape; + std::list > aListOfTranslationAlgo; + + for (int j=0; j aTranslationAlgo( + new GeomAlgoAPI_Translation(aBaseShape, dx, dy, dz)); + + if (!aTranslationAlgo->check()) { + setError(aTranslationAlgo->getError()); + break; + } + + aTranslationAlgo->build(); + + // Checking that the algorithm worked properly. + if (!aTranslationAlgo->isDone()) { + static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; + setError(aFeatureError); + break; + } + if (aTranslationAlgo->shape()->isNull()) { + static const std::string aShapeError = "Error : Resulting shape is null."; + setError(aShapeError); + break; + } + if (!aTranslationAlgo->isValid()) { + static const std::string aFeatureError = "Error : Resulting shape in not valid."; + setError(aFeatureError); + break; + } + aListOfShape.push_back(aTranslationAlgo->shape()); + aListOfTranslationAlgo.push_back(aTranslationAlgo); } - aListOfShape.push_back(aTranslationAlgo->shape()); - aListOfTranslationAlgo.push_back(aTranslationAlgo); } + std::shared_ptr aCompound = + GeomAlgoAPI_CompoundBuilder::compound(aListOfShape); + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + aResultBody->storeModified(aBaseShape, aCompound); + loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape); + setResult(aResultBody, aResultIndex); } - std::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aListOfShape); - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - aResultBody->storeModified(aBaseShape, aCompound); - loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape); - setResult(aResultBody, aResultIndex); aResultIndex++; } @@ -300,7 +371,7 @@ void FeaturesPlugin_MultiTranslation::loadNamingDS( 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(); @@ -322,7 +393,7 @@ void FeaturesPlugin_MultiTranslation::loadNamingDS( theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::VERTEX, aTag++, aTranslatedName, *aSubShapes.get(), false, true); - + ++anIndex; } -} \ No newline at end of file +}