X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Extrusion.cpp;h=3056c26826725267bb419994850fb66990db52ff;hb=643eedadb4ba0c91fe67878be0bb94d1bcca922c;hp=eeafb1db61e0e7557ff59706166146f75c41b219;hpb=db3da60baa0e8cb3dec62db38063d3b9a951a4cd;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp index eeafb1db6..3056c2682 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: FeaturesPlugin_Extrusion.cpp // Created: 30 May 2014 // Author: Vitaly SMETANNIKOV @@ -10,8 +12,8 @@ #include #include #include +#include #include -#include #include using namespace std; @@ -19,10 +21,6 @@ using namespace std; #define _FIRST_TAG 2 #define _LAST_TAG 3 #define EDGE 6 -#ifdef _DEBUG -#include -#include -#endif FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion() { @@ -30,74 +28,93 @@ FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion() void FeaturesPlugin_Extrusion::initAttributes() { - data()->addAttribute(FeaturesPlugin_Extrusion::FACE_ID(), ModelAPI_AttributeSelection::type()); - data()->addAttribute(FeaturesPlugin_Extrusion::SIZE_ID(), ModelAPI_AttributeDouble::type()); - data()->addAttribute(FeaturesPlugin_Extrusion::REVERSE_ID(), ModelAPI_AttributeBoolean::type()); + AttributeSelectionListPtr aSelection = + std::dynamic_pointer_cast(data()->addAttribute( + FeaturesPlugin_Extrusion::LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); + // extrusion works with faces always + aSelection->setSelectionType("FACE"); + data()->addAttribute(FeaturesPlugin_Extrusion::SIZE_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(FeaturesPlugin_Extrusion::REVERSE_ID(), ModelAPI_AttributeBoolean::typeId()); } void FeaturesPlugin_Extrusion::execute() { - boost::shared_ptr aFaceRef = boost::dynamic_pointer_cast< - ModelAPI_AttributeSelection>(data()->attribute(FeaturesPlugin_Extrusion::FACE_ID())); - if (!aFaceRef) - return; - - boost::shared_ptr aFace = - boost::dynamic_pointer_cast(aFaceRef->value()); - if (!aFace) - return; - - boost::shared_ptr aContext; - ResultPtr aContextRes = aFaceRef->context(); - if (aContextRes) { - if (aContextRes->groupName() == ModelAPI_ResultBody::group()) - aContext = boost::dynamic_pointer_cast(aContextRes)->shape(); - else if (aContextRes->groupName() == ModelAPI_ResultConstruction::group()) - aContext = boost::dynamic_pointer_cast(aContextRes)->shape(); - } - if (!aContext) { - std::string aContextError = "The selection context is bad"; - Events_Error::send(aContextError, this); - return; - } - - double aSize = data()->real(FeaturesPlugin_Extrusion::SIZE_ID())->value(); - if (data()->boolean(FeaturesPlugin_Extrusion::REVERSE_ID())->value()) - aSize = -aSize; - - boost::shared_ptr aResultBody = document()->createBody(data()); - GeomAlgoAPI_Extrusion aFeature(aFace, aSize); - if(!aFeature.isDone()) { - std::string aFeatureError = "Extrusion algorithm failed"; - Events_Error::send(aFeatureError, this); - return; - } + AttributeSelectionListPtr aFaceRefs = selectionList(FeaturesPlugin_Extrusion::LIST_ID()); + + // 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; + } + double aSize = real(FeaturesPlugin_Extrusion::SIZE_ID())->value(); + if (boolean(FeaturesPlugin_Extrusion::REVERSE_ID())->value()) + aSize = -aSize; + + 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; + } + } - // Check if shape is valid - if (aFeature.shape()->isNull()) { - std::string aShapeError = "Resulting shape is Null"; - Events_Error::send(aShapeError, this); -#ifdef _DEBUG - std::cerr << aShapeError << std::endl; -#endif - return; + for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) { + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + std::shared_ptr aFace; + if (aFacesNum == -1) { + aFace = aValueFace; + } else { + aFace = std::dynamic_pointer_cast(aConstruction->face(aFaceIndex)); + } + GeomAlgoAPI_Extrusion aFeature(aFace, aSize); + if(!aFeature.isDone()) { + static const std::string aFeatureError = "Extrusion algorithm failed"; + setError(aFeatureError); + break; + } + + // Check if shape is valid + if (aFeature.shape()->isNull()) { + static const std::string aShapeError = "Resulting shape is Null"; + setError(aShapeError); + break; + } + if(!aFeature.isValid()) { + std::string aFeatureError = "Warning: resulting shape is not valid"; + setError(aFeatureError); + break; + } + //LoadNamingDS + LoadNamingDS(aFeature, aResultBody, aFace, aContext); + + setResult(aResultBody, aResultIndex); + aResultIndex++; + + if (aFacesNum == -1) + break; + } } - if(!aFeature.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; - Events_Error::send(aFeatureError, this); - return; - } - //LoadNamingDS - LoadNamingDS(aFeature, aResultBody, aFace, aContext); - - setResult(aResultBody); + // remove the rest results if there were produced in the previous pass + removeResults(aResultIndex); } //============================================================================ void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature, - boost::shared_ptr theResultBody, - boost::shared_ptr theBasis, - boost::shared_ptr theContext) + std::shared_ptr theResultBody, + std::shared_ptr theBasis, + std::shared_ptr theContext) { @@ -110,28 +127,39 @@ void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature, GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape(); theFeature.mapOfShapes(*aSubShapes); - //Insert lateral face : Face from Edge - theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theFeature.shape(), EDGE,_LATERAL_TAG, *aSubShapes); + //Insert lateral face : Face from Edge + std::string aLatName = "LateralFace"; + theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theBasis, EDGE,_LATERAL_TAG, aLatName, *aSubShapes); //Insert bottom face - boost::shared_ptr aBottomFace = theFeature.firstShape(); + std::string aBotName = "BottomFace"; + std::shared_ptr aBottomFace = theFeature.firstShape(); if (!aBottomFace->isNull()) { if (aSubShapes->isBound(aBottomFace)) { aBottomFace = aSubShapes->find(aBottomFace); - } - theResultBody->generated(aBottomFace, _FIRST_TAG); + } + theResultBody->generated(aBottomFace, aBotName, _FIRST_TAG); } //Insert top face - boost::shared_ptr aTopFace = theFeature.lastShape(); + std::string aTopName = "TopFace"; + std::shared_ptr aTopFace = theFeature.lastShape(); if (!aTopFace->isNull()) { if (aSubShapes->isBound(aTopFace)) { aTopFace = aSubShapes->find(aTopFace); } - theResultBody->generated(aTopFace, _LAST_TAG); + theResultBody->generated(aTopFace, aTopName, _LAST_TAG); } - } + +//============================================================================ +void FeaturesPlugin_Extrusion::clearResult() +{ + std::shared_ptr aResultBody = document()->createBody(data()); + std::shared_ptr anEmptyShape(new GeomAPI_Shape); + aResultBody->store(anEmptyShape); + setResult(aResultBody); +}