// Created: 12 May 2015
// Author: Dmitry Bobylev
-#include <FeaturesPlugin_Revolution.h>
+#include "FeaturesPlugin_Revolution.h"
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
+#include <sstream>
+
//=================================================================================================
FeaturesPlugin_Revolution::FeaturesPlugin_Revolution()
{
ListOfShape aFacesList;
AttributeSelectionListPtr aFacesSelectionList = selectionList(LIST_ID());
for(int anIndex = 0; anIndex < aFacesSelectionList->size(); anIndex++) {
- std::shared_ptr<ModelAPI_AttributeSelection> aFaceSel = aFacesSelectionList->value(anIndex);
- ResultPtr aContext = aFaceSel->context();
- std::shared_ptr<GeomAPI_Shape> aContextShape = aContext->shape();
- if(!aContextShape.get()) {
- static const std::string aContextError = "The selection context is bad";
- setError(aContextError);
- break;
- }
-
+ AttributeSelectionPtr aFaceSel = aFacesSelectionList->value(anIndex);
std::shared_ptr<GeomAPI_Shape> aFaceShape = aFaceSel->value();
- int aFacesNum = -1; // this mean that "aFace" is used
- ResultConstructionPtr aConstruction =
- std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
- if(!aFaceShape.get()) { // this may be the whole sketch result selected, check and get faces
- if (aConstruction.get()) {
- aFacesNum = aConstruction->facesNum();
- } else {
- static const std::string aFaceError = "Can not find basis for revolution";
+ if(aFaceShape.get() && !aFaceShape->isNull()) { // Getting face.
+ aFacesList.push_back(aFaceShape);
+ } else { // This may be the whole sketch result selected, check and get faces.
+ ResultPtr aContext = aFaceSel->context();
+ std::shared_ptr<GeomAPI_Shape> aContextShape = aContext->shape();
+ if(!aContextShape.get()) {
+ static const std::string aContextError = "Error: The selection context is bad.";
+ setError(aContextError);
+ return;
+ }
+ ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+ if(!aConstruction.get()) {
+ static const std::string aFaceError = "Error: Can not find basis for revolution.";
setError(aFaceError);
- break;
+ return;
}
- }
- for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) {
- std::shared_ptr<GeomAPI_Shape> aBaseShape;
- if (aFacesNum == -1) {
- aFacesList.push_back(aFaceShape);
- break;
- } else {
+ int aFacesNum = aConstruction->facesNum();
+ for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) {
aFaceShape = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
aFacesList.push_back(aFaceShape);
}
ListOfShape aFreeFaces;
std::shared_ptr<GeomAPI_Shape> aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aFacesList);
GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, aShells, aFreeFaces);
- if(aShells.empty()) {
- aShells = aFreeFaces;
- } else {
- aShells.merge(aFreeFaces);
- }
+ aShells.insert(aShells.end(), aFreeFaces.begin(), aFreeFaces.end());
// Generating result for each shell and face.
int aResultIndex = 0;
GeomAlgoAPI_Revolution aRevolAlgo(aBaseShape, anAxis, aToShape, aToAngle, aFromShape, aFromAngle);
if(!aRevolAlgo.isDone()) {
- static const std::string aPrismAlgoError = "Revolution algorithm failed";
+ static const std::string aPrismAlgoError = "Error: Revolution algorithm failed.";
setError(aPrismAlgoError);
aResultIndex = 0;
break;
// Check if shape is valid
if(!aRevolAlgo.shape().get() || aRevolAlgo.shape()->isNull()) {
- static const std::string aShapeError = "Resulting shape is Null";
+ static const std::string aShapeError = "Error: Resulting shape is Null.";
setError(aShapeError);
aResultIndex = 0;
break;
}
if(!aRevolAlgo.isValid()) {
- std::string aPrismAlgoError = "Warning: resulting shape is not valid";
+ std::string aPrismAlgoError = "Error: Resulting shape is not valid.";
setError(aPrismAlgoError);
aResultIndex = 0;
break;
//load result
theResultBody->storeGenerated(theBasis, theRevolAlgo.shape());
- std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theRevolAlgo.mapOfShapes();
+ std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theRevolAlgo.mapOfSubShapes();
//Insert lateral face : Face from Edge
const std::string aLatName = "LateralFace";
const int aLatTag = 1;
- theResultBody->loadAndOrientGeneratedShapes(theRevolAlgo.makeShape().get(), theBasis, GeomAPI_Shape::EDGE, aLatTag, aLatName, *aSubShapes);
+ theResultBody->loadAndOrientGeneratedShapes(&theRevolAlgo, theBasis, GeomAPI_Shape::EDGE, aLatTag, aLatName, *aSubShapes);
//Insert to faces
+ int aToFaceIndex = 1;
const std::string aToName = "ToFace";
- const int aToTag = 2;
+ int aToTag = 2;
const ListOfShape& aToFaces = theRevolAlgo.toFaces();
for(ListOfShape::const_iterator anIt = aToFaces.cbegin(); anIt != aToFaces.cend(); anIt++) {
std::shared_ptr<GeomAPI_Shape> aToFace = *anIt;
if(aSubShapes->isBound(aToFace)) {
aToFace = aSubShapes->find(aToFace);
}
- theResultBody->generated(aToFace, aToName, aToTag);
+ std::ostringstream aStr;
+ aStr << aToName << "_" << aToFaceIndex++;
+ theResultBody->generated(aToFace, aStr.str(), aToTag++);
}
//Insert from faces
+ int aFromFaceIndex = 1;
const std::string aFromName = "FromFace";
- const int aFromTag = 3;
+ int aFromTag = aToTag > 10000 ? aToTag : 10000;
const ListOfShape& aFromFaces = theRevolAlgo.fromFaces();
for(ListOfShape::const_iterator anIt = aFromFaces.cbegin(); anIt != aFromFaces.cend(); anIt++) {
std::shared_ptr<GeomAPI_Shape> aFromFace = *anIt;
if(aSubShapes->isBound(aFromFace)) {
aFromFace = aSubShapes->find(aFromFace);
}
- theResultBody->generated(aFromFace, aFromName, aFromTag);
+ std::ostringstream aStr;
+ aStr << aFromName << "_" << aFromFaceIndex++;
+ theResultBody->generated(aFromFace, aStr.str(), aFromTag++);
}
}
