X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Revolution.cpp;h=d4005402a11e03423a98419ebc4fbf0666f77df6;hb=32dfd57e82f818f4e3e36c276d78a30bbc2d9f7d;hp=63341f8c45057be7c4a8a320f165381428921b0c;hpb=cf7f9e68e9aa62462258720dab65b8ce8569ca6c;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp index 63341f8c4..d4005402a 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp @@ -4,28 +4,18 @@ // Created: 12 May 2015 // Author: Dmitry Bobylev -#include - -#include -#include -#include -#include -#include -#include -#include +#include "FeaturesPlugin_Revolution.h" #include -#include +#include +#include #include #include -#include -#include -#define FACE 4 -#define EDGE 6 -#define _LATERAL_TAG 1 -#define _FROM_TAG 2 -#define _TO_TAG 3 +#include + +#include +#include //================================================================================================= FeaturesPlugin_Revolution::FeaturesPlugin_Revolution() @@ -35,160 +25,129 @@ FeaturesPlugin_Revolution::FeaturesPlugin_Revolution() //================================================================================================= void FeaturesPlugin_Revolution::initAttributes() { - AttributeSelectionListPtr aSelection = - std::dynamic_pointer_cast(data()->addAttribute( - FeaturesPlugin_Revolution::LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - // revolution works with faces always - aSelection->setSelectionType("FACE"); + initCompositeSketchAttribtues(InitBaseObjectsList); - data()->addAttribute(FeaturesPlugin_Revolution::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(FeaturesPlugin_Revolution::FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(FeaturesPlugin_Revolution::FROM_ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId()); - data()->addAttribute(FeaturesPlugin_Revolution::TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(FeaturesPlugin_Revolution::TO_ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(TO_ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(FROM_ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FeaturesPlugin_Revolution::FROM_OBJECT_ID()); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FeaturesPlugin_Revolution::TO_OBJECT_ID()); + data()->addAttribute(TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(TO_OFFSET_ID(), ModelAPI_AttributeDouble::typeId()); + + data()->addAttribute(FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(FROM_OFFSET_ID(), ModelAPI_AttributeDouble::typeId()); + + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TO_OBJECT_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID()); + + initCompositeSketchAttribtues(InitSketchLauncher); } //================================================================================================= void FeaturesPlugin_Revolution::execute() { - AttributeSelectionListPtr aFaceRefs = selectionList(FeaturesPlugin_Revolution::LIST_ID()); + ListOfShape aBaseShapesList; + ListOfMakeShape aMakeShapesList; - //Getting axe. - std::shared_ptr anAxis; - std::shared_ptr anEdge; - std::shared_ptr anObjRef = selection(FeaturesPlugin_Revolution::AXIS_OBJECT_ID()); - if(anObjRef && anObjRef->value()->isEdge()) { - anEdge = std::shared_ptr(new GeomAPI_Edge(anObjRef->value())); + // Make revolutions. + if(!makeRevolutions(aBaseShapesList, aMakeShapesList)) { + return; } - if(anEdge) { - anAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction())); + + // Store results. + int aResultIndex = 0; + ListOfShape::const_iterator aBaseIt = aBaseShapesList.cbegin(); + ListOfMakeShape::const_iterator anAlgoIt = aMakeShapesList.cbegin(); + for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend(); + ++aBaseIt, ++anAlgoIt) { + storeResult(*aBaseIt, *anAlgoIt, aResultIndex++); } - // Getting bounding planes. - std::shared_ptr aFromShape(new GeomAPI_Shape()); - std::shared_ptr aToShape(new GeomAPI_Shape()); + removeResults(aResultIndex); +} - anObjRef = selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID()); - if(anObjRef) { - aFromShape = std::dynamic_pointer_cast(anObjRef->value()); - } - anObjRef = selection(FeaturesPlugin_Revolution::TO_OBJECT_ID()); - if(anObjRef) { - aToShape = std::dynamic_pointer_cast(anObjRef->value()); - } +//================================================================================================= +bool FeaturesPlugin_Revolution::makeRevolutions(ListOfShape& theBaseShapes, + ListOfMakeShape& theMakeShapes) +{ + theMakeShapes.clear(); - // Getting angles. - double aFromAngle = real(FeaturesPlugin_Revolution::FROM_ANGLE_ID())->value(); - double aToAngle = real(FeaturesPlugin_Revolution::TO_ANGLE_ID())->value(); - - // for each selected face generate a result - int anIndex = 0, aResultIndex = 0; - for(; anIndex < aFaceRefs->size(); anIndex++) { - std::shared_ptr aFaceRef = aFaceRefs->value(anIndex); - ResultPtr aContextRes = aFaceRef->context(); - std::shared_ptr aContext = aContextRes->shape(); - if (!aContext.get()) { - static const std::string aContextError = "The selection context is bad"; - setError(aContextError); - break; - } + // Getting base shapes. + getBaseShapes(theBaseShapes); - std::shared_ptr aValueFace = aFaceRef->value(); - int aFacesNum = -1; // this mean that "aFace" is used - ResultConstructionPtr aConstruction = - std::dynamic_pointer_cast(aContextRes); - if (!aValueFace.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 extrusion"; - setError(aFaceError); - break; - } + //Getting axis. + std::shared_ptr anAxis; + std::shared_ptr anEdge; + AttributeSelectionPtr aSelection = selection(AXIS_OBJECT_ID()); + if(aSelection.get() && aSelection->value().get() && aSelection->value()->isEdge()) { + anEdge = std::shared_ptr(new GeomAPI_Edge(aSelection->value())); + } else if(aSelection->context().get() && + aSelection->context()->shape().get() && + aSelection->context()->shape()->isEdge()) { + anEdge = std::shared_ptr(new GeomAPI_Edge(aSelection->context()->shape())); + } + if(anEdge.get()) { + if(anEdge->isLine()) { + anAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); } + } - for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) { - ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - std::shared_ptr aBaseShape; - if (aFacesNum == -1) { - aBaseShape = aValueFace; - } else { - aBaseShape = std::dynamic_pointer_cast(aConstruction->face(aFaceIndex)); - } + if(!anAxis.get()) { + return false; + } - GeomAlgoAPI_Revolution aFeature(aBaseShape, anAxis, aFromShape, aFromAngle, aToShape, aToAngle); - if(!aFeature.isDone()) { - static const std::string aFeatureError = "Revolution algorithm failed"; - setError(aFeatureError); - break; - } + // Getting angles. + double aToAngle = 0.0; + double aFromAngle = 0.0; + + if(string(CREATION_METHOD())->value() == CREATION_METHOD_BY_ANGLES()) { + aToAngle = real(TO_ANGLE_ID())->value(); + aFromAngle = real(FROM_ANGLE_ID())->value(); + } else { + aToAngle = real(TO_OFFSET_ID())->value(); + aFromAngle = real(FROM_OFFSET_ID())->value(); + } - // Check if shape is valid - if(aFeature.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; - setError(aShapeError); - break; + // Getting bounding planes. + GeomShapePtr aToShape; + GeomShapePtr aFromShape; + + if(string(CREATION_METHOD())->value() == CREATION_METHOD_BY_PLANES()) { + aSelection = selection(TO_OBJECT_ID()); + if(aSelection.get()) { + aToShape = std::dynamic_pointer_cast(aSelection->value()); + if(!aToShape.get() && aSelection->context().get()) { + aToShape = aSelection->context()->shape(); } - if(!aFeature.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; - setError(aFeatureError); - break; + } + aSelection = selection(FROM_OBJECT_ID()); + if(aSelection.get()) { + aFromShape = std::dynamic_pointer_cast(aSelection->value()); + if(!aFromShape.get() && aSelection->context().get()) { + aFromShape = aSelection->context()->shape(); } - //LoadNamingDS - LoadNamingDS(aFeature, aResultBody, aBaseShape, aContext); - - setResult(aResultBody, aResultIndex); - aResultIndex++; - - if (aFacesNum == -1) - break; } } - // remove the rest results if there were produced in the previous pass - removeResults(aResultIndex); -} -//================================================================================================= -void FeaturesPlugin_Revolution::LoadNamingDS(GeomAlgoAPI_Revolution& theFeature, - std::shared_ptr theResultBody, - std::shared_ptr theBasis, - std::shared_ptr theContext) -{ - //load result - if(theBasis->isEqual(theContext)) - theResultBody->store(theFeature.shape()); - else - theResultBody->storeGenerated(theContext, theFeature.shape()); - - GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape(); - theFeature.mapOfShapes(*aSubShapes); - - std::string aGeneratedName = "LateralFace"; - theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theBasis, EDGE,_LATERAL_TAG, aGeneratedName, *aSubShapes); - - //Insert from face - std::string aBotName = "FromFace"; - std::shared_ptr aBottomFace = theFeature.firstShape(); - if(!aBottomFace->isNull()) { - if(aSubShapes->isBound(aBottomFace)) { - aBottomFace = aSubShapes->find(aBottomFace); + // Generating result for each base shape. + for(ListOfShape::const_iterator + anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) { + GeomShapePtr aBaseShape = *anIter; + + std::shared_ptr aRevolAlgo(new GeomAlgoAPI_Revolution( + aBaseShape, anAxis, + aToShape, aToAngle, + aFromShape, aFromAngle)); + if(!isMakeShapeValid(aRevolAlgo)) { + return false; } - theResultBody->generated(aBottomFace, aBotName, _FROM_TAG); - } - //Insert to face - std::string aTopName = "ToFace"; - std::shared_ptr aTopFace = theFeature.lastShape(); - if (!aTopFace->isNull()) { - if (aSubShapes->isBound(aTopFace)) { - aTopFace = aSubShapes->find(aTopFace); - } - theResultBody->generated(aTopFace, aTopName, _TO_TAG); + theMakeShapes.push_back(aRevolAlgo); } + return true; }