X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Extrusion.cpp;h=1decb449c2ebb77ed1bdd4a67ffa1312a507d4b1;hb=48a4bd38c2b9d1b6b51ebca992a5eab30e85d99b;hp=3056c26826725267bb419994850fb66990db52ff;hpb=643eedadb4ba0c91fe67878be0bb94d1bcca922c;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp index 3056c2682..1decb449c 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp @@ -6,6 +6,7 @@ #include "FeaturesPlugin_Extrusion.h" #include +#include #include #include #include @@ -14,7 +15,13 @@ #include #include #include +#include +#include +#include +#include #include +#include +#include using namespace std; #define _LATERAL_TAG 1 @@ -33,14 +40,40 @@ void FeaturesPlugin_Extrusion::initAttributes() 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()); + + data()->addAttribute(FeaturesPlugin_Extrusion::TO_SIZE_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(FeaturesPlugin_Extrusion::FROM_SIZE_ID(), ModelAPI_AttributeDouble::typeId()); + + //data()->addAttribute(FeaturesPlugin_Extrusion::AXIS_OBJECT_ID(), ModelAPI_AttributeReference::typeId()); + + data()->addAttribute(FeaturesPlugin_Extrusion::FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(FeaturesPlugin_Extrusion::TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); + + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FeaturesPlugin_Extrusion::FROM_OBJECT_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FeaturesPlugin_Extrusion::TO_OBJECT_ID()); } void FeaturesPlugin_Extrusion::execute() { AttributeSelectionListPtr aFaceRefs = selectionList(FeaturesPlugin_Extrusion::LIST_ID()); + std::shared_ptr aFromShape; + std::shared_ptr aToShape; + + // Getting bounding planes. + std::shared_ptr anObjRef = selection(FeaturesPlugin_Extrusion::FROM_OBJECT_ID()); + if (anObjRef) { + aFromShape = std::dynamic_pointer_cast(anObjRef->value()); + } + anObjRef = selection(FeaturesPlugin_Extrusion::TO_OBJECT_ID()); + if (anObjRef) { + aToShape = std::dynamic_pointer_cast(anObjRef->value()); + } + + // Getting sizes. + double aFromSize = real(FeaturesPlugin_Extrusion::FROM_SIZE_ID())->value(); + double aToSize = real(FeaturesPlugin_Extrusion::TO_SIZE_ID())->value(); + // for each selected face generate a result int anIndex = 0, aResultIndex = 0; for(; anIndex < aFaceRefs->size(); anIndex++) { @@ -52,9 +85,6 @@ void FeaturesPlugin_Extrusion::execute() 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 @@ -72,32 +102,63 @@ void FeaturesPlugin_Extrusion::execute() for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) { ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); - std::shared_ptr aFace; + std::shared_ptr aBaseShape; if (aFacesNum == -1) { - aFace = aValueFace; + aBaseShape = aValueFace; } else { - aFace = std::dynamic_pointer_cast(aConstruction->face(aFaceIndex)); + aBaseShape = std::dynamic_pointer_cast(aConstruction->face(aFaceIndex)); } - GeomAlgoAPI_Extrusion aFeature(aFace, aSize); + + // If bounding faces was not set creating them. + std::shared_ptr aBaseFace(new GeomAPI_Face(aBaseShape)); + std::shared_ptr aBasePln = aBaseFace->getPlane(); + std::shared_ptr aBaseDir = aBasePln->direction(); + std::shared_ptr aBaseLoc = aBasePln->location(); + std::shared_ptr aBasePlane = GeomAlgoAPI_FaceBuilder::planarFace(aBaseLoc, aBaseDir); + + std::shared_ptr aBoundingFromShape = aFromShape ? aFromShape : aBasePlane; + std::shared_ptr aBoundingToShape = aToShape ? aToShape : aBasePlane; + + // Moving bounding faces according to "from" and "to" sizes. + std::shared_ptr aFromFace(new GeomAPI_Face(aBoundingFromShape)); + std::shared_ptr aFromPln = aFromFace->getPlane(); + std::shared_ptr aFromLoc = aFromPln->location(); + std::shared_ptr aFromDir = aFromPln->direction(); + + std::shared_ptr aToFace(new GeomAPI_Face(aBoundingToShape)); + std::shared_ptr aToPln = aToFace->getPlane(); + std::shared_ptr aToLoc = aToPln->location(); + std::shared_ptr aToDir = aToPln->direction(); + + bool aSign = aFromLoc->xyz()->dot(aBaseDir->xyz()) > aToLoc->xyz()->dot(aBaseDir->xyz()); + + std::shared_ptr aFromPnt(new GeomAPI_Pnt(aFromLoc->xyz()->added(aBaseDir->xyz()->multiplied(aSign ? aFromSize : -aFromSize)))); + aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir); + + std::shared_ptr aToPnt(new GeomAPI_Pnt(aToLoc->xyz()->added(aBaseDir->xyz()->multiplied(aSign ? -aToSize : aToSize)))); + aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir); + + //GeomAlgoAPI_Extrusion aFeature(aFace, aFromSize); + GeomAlgoAPI_Prism aFeature(aBaseShape, aBoundingFromShape, aBoundingToShape); if(!aFeature.isDone()) { - static const std::string aFeatureError = "Extrusion algorithm failed"; + 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"; + 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"; + std::string aFeatureError = "Warning: resulting shape is not valid"; setError(aFeatureError); break; - } + } //LoadNamingDS - LoadNamingDS(aFeature, aResultBody, aFace, aContext); + LoadNamingDS(aFeature, aResultBody, aBaseShape, aContext); setResult(aResultBody, aResultIndex); aResultIndex++; @@ -111,18 +172,16 @@ void FeaturesPlugin_Extrusion::execute() } //============================================================================ -void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature, - std::shared_ptr theResultBody, - std::shared_ptr theBasis, - std::shared_ptr theContext) -{ - - +void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Prism& 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()); + theResultBody->storeGenerated(theBasis, theFeature.shape()); GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape(); theFeature.mapOfShapes(*aSubShapes); @@ -133,33 +192,21 @@ void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature, //Insert bottom face std::string aBotName = "BottomFace"; - std::shared_ptr aBottomFace = theFeature.firstShape(); - if (!aBottomFace->isNull()) { - if (aSubShapes->isBound(aBottomFace)) { - aBottomFace = aSubShapes->find(aBottomFace); - } + std::shared_ptr aBottomFace = theFeature.firstShape(); + if(!aBottomFace->isNull()) { + if(aSubShapes->isBound(aBottomFace)) { + aBottomFace = aSubShapes->find(aBottomFace); + } theResultBody->generated(aBottomFace, aBotName, _FIRST_TAG); } - - //Insert top face std::string aTopName = "TopFace"; std::shared_ptr aTopFace = theFeature.lastShape(); if (!aTopFace->isNull()) { - if (aSubShapes->isBound(aTopFace)) { - aTopFace = aSubShapes->find(aTopFace); + if (aSubShapes->isBound(aTopFace)) { + aTopFace = aSubShapes->find(aTopFace); } 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); }