X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Scale.cpp;h=bdb4cdd52fde517cc999053ac555b78368b7d3f9;hb=e60b61962b051180dab78bb91977d58d59ca7614;hp=ee82f611d3b9fffcae52f1cdb978b49955db503e;hpb=bd1b8c8100e2b2cffd30ee0b4d73836b13d518ae;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp b/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp index ee82f611d..bdb4cdd52 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp @@ -1,12 +1,26 @@ -// Copyright (C) 2014-201x CEA/DEN, EDF R&D - -// File: FeaturesPlugin_Scale.cpp -// Created: 13 Jan 2017 -// Author: Clarisse Genrault (CEA) +// 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 +// 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 #include +#include #include #include @@ -14,6 +28,8 @@ #include #include +#include + //================================================================================================= FeaturesPlugin_Scale::FeaturesPlugin_Scale() { @@ -74,7 +90,6 @@ void FeaturesPlugin_Scale::performScaleByFactor() anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); if(!anObject.get()) { // may be for not-activated parts - eraseResults(); return; } anObjects.push_back(anObject); @@ -99,52 +114,39 @@ void FeaturesPlugin_Scale::performScaleByFactor() double aScaleFactor = real(FeaturesPlugin_Scale::SCALE_FACTOR_ID())->value(); // Moving each object. + std::string anError; 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->setSymmetry(anAxis); - ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); - ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); - aResultPart->setTrsf(*aContext, aTrsf); - setResult(aResultPart, aResultIndex); - } else { - GeomAlgoAPI_Scale aScaleAlgo(aBaseShape, aCenterPoint, aScaleFactor); - - if (!aScaleAlgo.check()) { - setError(aScaleAlgo.getError()); - return; - } - - aScaleAlgo.build(); - - // Checking that the algorithm worked properly. - if(!aScaleAlgo.isDone()) { - static const std::string aFeatureError = "Error: Symmetry algorithm failed."; - setError(aFeatureError); - break; - } - if(aScaleAlgo.shape()->isNull()) { - static const std::string aShapeError = "Error: Resulting shape is Null."; - setError(aShapeError); - break; - } - if(!aScaleAlgo.isValid()) { - std::string aFeatureError = "Error: Resulting shape is not valid."; - setError(aFeatureError); - break; - } - - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - loadNamingDS(aScaleAlgo, aResultBody, aBaseShape); - setResult(aResultBody, aResultIndex); + std::shared_ptr aScaleAlgo( + new GeomAlgoAPI_Scale(aBaseShape, aCenterPoint, aScaleFactor)); + + if (!aScaleAlgo->check()) { + setError(aScaleAlgo->getError()); + return; } + + aScaleAlgo->build(); + + // Checking that the algorithm worked properly. + if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aScaleAlgo, getKind(), anError)) { + setError(anError); + break; + } + + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + + ListOfShape aShapes; + aShapes.push_back(aBaseShape); + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + aShapes, + ListOfShape(), + aScaleAlgo, + aScaleAlgo->shape(), + "Scaled"); + setResult(aResultBody, aResultIndex); aResultIndex++; } @@ -168,7 +170,6 @@ void FeaturesPlugin_Scale::performScaleByDimensions() anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); if(!anObject.get()) { // may be for not-activated parts - eraseResults(); return; } anObjects.push_back(anObject); @@ -195,73 +196,45 @@ void FeaturesPlugin_Scale::performScaleByDimensions() double aScaleFactorZ = real(FeaturesPlugin_Scale::SCALE_FACTOR_Z_ID())->value(); // Moving each object. + std::string anError; 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->setSymmetry(anAxis); - ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); - ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); - aResultPart->setTrsf(*aContext, aTrsf); - setResult(aResultPart, aResultIndex); - } else { - GeomAlgoAPI_Scale aScaleAlgo(aBaseShape, aCenterPoint, - aScaleFactorX, aScaleFactorY, aScaleFactorZ); - - if (!aScaleAlgo.check()) { - setError(aScaleAlgo.getError()); - return; - } - - aScaleAlgo.build(); - - // Checking that the algorithm worked properly. - if(!aScaleAlgo.isDone()) { - static const std::string aFeatureError = "Error: Symmetry algorithm failed."; - setError(aFeatureError); - break; - } - if(aScaleAlgo.shape()->isNull()) { - static const std::string aShapeError = "Error: Resulting shape is Null."; - setError(aShapeError); - break; - } - if(!aScaleAlgo.isValid()) { - std::string aFeatureError = "Error: Resulting shape is not valid."; - setError(aFeatureError); - break; - } - - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - loadNamingDS(aScaleAlgo, aResultBody, aBaseShape); - setResult(aResultBody, aResultIndex); + std::shared_ptr aScaleAlgo(new GeomAlgoAPI_Scale(aBaseShape, + aCenterPoint, + aScaleFactorX, + aScaleFactorY, + aScaleFactorZ)); + + if (!aScaleAlgo->check()) { + setError(aScaleAlgo->getError()); + return; + } + + aScaleAlgo->build(); + + // Checking that the algorithm worked properly. + if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aScaleAlgo, getKind(), anError)) { + setError(anError); + break; } + + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + + ListOfShape aShapes; + aShapes.push_back(aBaseShape); + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, + aShapes, + ListOfShape(), + aScaleAlgo, + aScaleAlgo->shape(), + "Scaled"); + setResult(aResultBody, aResultIndex); aResultIndex++; } // Remove the rest results if there were produced in the previous pass. removeResults(aResultIndex); } - -//================================================================================================= -void FeaturesPlugin_Scale::loadNamingDS(GeomAlgoAPI_Scale& theScaleAlgo, - std::shared_ptr theResultBody, - std::shared_ptr theBaseShape) -{ - // Store and name the result. - theResultBody->storeModified(theBaseShape, theScaleAlgo.shape()); - - // Name the faces - std::shared_ptr aSubShapes = theScaleAlgo.mapOfSubShapes(); - int aReflectedTag = 1; - std::string aReflectedName = "Scaled"; - theResultBody->loadAndOrientModifiedShapes(&theScaleAlgo, - theBaseShape, GeomAPI_Shape::FACE, - aReflectedTag, aReflectedName, *aSubShapes.get()); -} \ No newline at end of file