-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// 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
//
// 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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <FeaturesPlugin_Translation.h>
#include <GeomAPI_Trsf.h>
#include <GeomAlgoAPI_PointBuilder.h>
+#include <GeomAlgoAPI_Tools.h>
#include <FeaturesPlugin_Tools.h>
double aDistance = real(FeaturesPlugin_Translation::DISTANCE_ID())->value();
// Moving each object.
+ std::string anError;
int aResultIndex = 0;
std::list<ResultPtr>::iterator aContext = aContextes.begin();
for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
aTranslationAlgo->build();
// Checking that the algorithm worked properly.
- if(!aTranslationAlgo->isDone()) {
- static const std::string aFeatureError = "Error: Translation 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()) {
- std::string aFeatureError = "Error: Resulting shape is not valid.";
- setError(aFeatureError);
+ if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aTranslationAlgo, getKind(), anError)) {
+ setError(anError);
break;
}
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
- aResultBody->storeModified(aBaseShape, aTranslationAlgo->shape());
+
+ ListOfShape aShapes;
+ aShapes.push_back(aBaseShape);
FeaturesPlugin_Tools::loadModifiedShapes(aResultBody,
- aBaseShape,
+ aShapes,
+ ListOfShape(),
aTranslationAlgo,
+ aTranslationAlgo->shape(),
"Translated");
setResult(aResultBody, aResultIndex);
}
double aDZ = real(FeaturesPlugin_Translation::DZ_ID())->value();
// Moving each object.
+ std::string anError;
int aResultIndex = 0;
std::list<ResultPtr>::iterator aContext = aContextes.begin();
for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
aTranslationAlgo->build();
// Checking that the algorithm worked properly.
- if(!aTranslationAlgo->isDone()) {
- static const std::string aFeatureError = "Error: Translation 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()) {
- std::string aFeatureError = "Error: Resulting shape is not valid.";
- setError(aFeatureError);
+ if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aTranslationAlgo, getKind(), anError)) {
+ setError(anError);
break;
}
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
- aResultBody->storeModified(aBaseShape, aTranslationAlgo->shape());
+
+ ListOfShape aShapes;
+ aShapes.push_back(aBaseShape);
FeaturesPlugin_Tools::loadModifiedShapes(aResultBody,
- aBaseShape,
+ aShapes,
+ ListOfShape(),
aTranslationAlgo,
+ aTranslationAlgo->shape(),
"Translated");
setResult(aResultBody, aResultIndex);
}
}
// Moving each object.
+ std::string anError;
int aResultIndex = 0;
std::list<ResultPtr>::iterator aContext = aContextes.begin();
for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
aTranslationAlgo->build();
// Checking that the algorithm worked properly.
- if(!aTranslationAlgo->isDone()) {
- static const std::string aFeatureError = "Error: Translation 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()) {
- std::string aFeatureError = "Error: Resulting shape is not valid.";
- setError(aFeatureError);
+ if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aTranslationAlgo, getKind(), anError)) {
+ setError(anError);
break;
}
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
- aResultBody->storeModified(aBaseShape, aTranslationAlgo->shape());
+
+ ListOfShape aShapes;
+ aShapes.push_back(aBaseShape);
FeaturesPlugin_Tools::loadModifiedShapes(aResultBody,
- aBaseShape,
+ aShapes,
+ ListOfShape(),
aTranslationAlgo,
+ aTranslationAlgo->shape(),
"Translated");
setResult(aResultBody, aResultIndex);
}