-// 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 <FeaturesPlugin_MultiRotation.h>
+#include <FeaturesPlugin_Tools.h>
#include <GeomAlgoAPI_CompoundBuilder.h>
+#include <GeomAlgoAPI_MakeShapeList.h>
#include <GeomAlgoAPI_ShapeTools.h>
+#include <GeomAlgoAPI_Tools.h>
#include <GeomAlgoAPI_Translation.h>
#include <GeomAPI_ShapeExplorer.h>
#include <GeomAPI_Ax1.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
+#include <GeomAPI_ShapeIterator.h>
#include <GeomAPI_Trsf.h>
#include <ModelAPI_AttributeDouble.h>
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
}
//=================================================================================================
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++) {
anObjectsSelList->value(anObjectsIndex);
std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
if(!anObject.get()) { // may be for not-activated parts
- eraseResults();
return;
}
anObjects.push_back(anObject);
}
//Getting axis.
- std::shared_ptr<GeomAPI_Ax1> anAxis;
- std::shared_ptr<GeomAPI_Edge> anEdge;
- std::shared_ptr<ModelAPI_AttributeSelection> anObjRef =
- selection(FeaturesPlugin_MultiRotation::AXIS_ANGULAR_ID());
- if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
- anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
- } else if (anObjRef && !anObjRef->value() && anObjRef->context() &&
- anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) {
- anEdge = std::shared_ptr<GeomAPI_Edge>(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<GeomAPI_Ax1>(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<GeomAPI_Ax1> anAxis(new GeomAPI_Ax1(anEdge->line()->location(),
+ anEdge->line()->direction()));
+
// Getting number of copies.
int nbCopies =
integer(FeaturesPlugin_MultiRotation::NB_COPIES_ANGULAR_ID())->value();
for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
anObjectsIt++, aContext++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
- bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
+ bool isPart = aContext->get() && (*aContext)->groupName() == ModelAPI_ResultPart::group();
// Setting result.
if (isPart) {
aResultIndex++;
}
} else {
+ std::string anError;
ListOfShape aListOfShape;
- std::list<std::shared_ptr<GeomAlgoAPI_Rotation> > aListOfRotationAlgo;
+ std::shared_ptr<GeomAlgoAPI_MakeShapeList>
+ aListOfRotationAlgo(new GeomAlgoAPI_MakeShapeList);
for (int i=0; i<nbCopies; i++) {
std::shared_ptr<GeomAlgoAPI_Rotation> aRotationnAlgo(
new GeomAlgoAPI_Rotation(aBaseShape, anAxis, i*anAngle));
- if (!aRotationnAlgo->check()) {
- setError(aRotationnAlgo->getError());
- break;
- }
-
- 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<GeomAPI_Shape> 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);
+ aResultIndex++;
}
- aResultIndex++;
}
// Remove the rest results if there were produced in the previous pass.
}
//=================================================================================================
+#ifdef FEATURE_MULTIROTATION_TWO_DIRECTIONS
void FeaturesPlugin_MultiRotation::performRotation2D()
{
// Getting objects.
anObjectsSelList->value(anObjectsIndex);
std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
if(!anObject.get()) { // may be for not-activated parts
- eraseResults();
return;
}
anObjects.push_back(anObject);
for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
anObjectsIt++, aContext++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
- bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
+ bool isPart = aContext->get() && (*aContext)->groupName() == ModelAPI_ResultPart::group();
std::shared_ptr<GeomAPI_Dir> aDir =
GeomAlgoAPI_ShapeTools::buildDirFromAxisAndShape(aBaseShape, anAxis);
loadNamingDS2(aListOfTranslationAlgo, aResultBody, aBaseShape);
loadNamingDS3(aListOfRotationAlgo, aResultBody, aBaseShape, nbRadial);
setResult(aResultBody, aResultIndex);
+ aResultIndex++;
}
- aResultIndex++;
}
// Remove the rest results if there were produced in the previous pass.
std::shared_ptr<ModelAPI_ResultBody> theResultBody,
std::shared_ptr<GeomAPI_Shape> theBaseShape)
{
- int aTag = 1;
- int anIndex = 1;
- std::string aRotatedName;
-
for (std::list<std::shared_ptr<GeomAlgoAPI_Translation> >::const_iterator anIt =
theListOfTranslationAlgo.begin(); anIt != theListOfTranslationAlgo.cend(); ++anIt) {
- std::cout << "LOAD" << std::endl;
- std::shared_ptr<GeomAPI_DataMapOfShapeShape> 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");
}
}
std::shared_ptr<ModelAPI_ResultBody> theResultBody,
std::shared_ptr<GeomAPI_Shape> theBaseShape, int nb)
{
- int aTag = 6*nb+1;
int anIndex = nb+1;
std::string aRotatedName;
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<std::shared_ptr<GeomAlgoAPI_Rotation> > theListOfRotationAlgo,
- std::shared_ptr<ModelAPI_ResultBody> theResultBody,
- std::shared_ptr<GeomAPI_Shape> theBaseShape)
-{
- int aTag = 1;
- int anIndex = 1;
- std::string aRotatedName;
-
- for (std::list<std::shared_ptr<GeomAlgoAPI_Rotation> >::const_iterator anIt =
- theListOfRotationAlgo.begin(); anIt != theListOfRotationAlgo.cend(); ++anIt) {
- std::shared_ptr<GeomAPI_DataMapOfShapeShape> 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