X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Extrusion.cpp;h=265ba65761ebb4871d0d9eea4dfe68ca8a2b9cd4;hb=b52164791e6cc6cdc2c009c7ef6667d9f476d3aa;hp=b49f5885488d020c7618e28923def08d36433ae3;hpb=d9db5498b576854aae37ddf8c0bb6fceb264712e;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp index b49f58854..265ba6576 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 @@ -11,20 +13,14 @@ #include #include #include -#include #include -#include -#include -#include -#include + using namespace std; #define _LATERAL_TAG 1 #define _FIRST_TAG 2 #define _LAST_TAG 3 -#ifdef _DEBUG -#include -#include -#endif +#define EDGE 6 + FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion() { } @@ -38,45 +34,52 @@ void FeaturesPlugin_Extrusion::initAttributes() void FeaturesPlugin_Extrusion::execute() { - boost::shared_ptr aFaceRef = boost::dynamic_pointer_cast< - ModelAPI_AttributeSelection>(data()->attribute(FeaturesPlugin_Extrusion::FACE_ID())); + std::shared_ptr aFaceRef = std::dynamic_pointer_cast< + ModelAPI_AttributeSelection>(data()->attribute(FeaturesPlugin_Extrusion::FACE_ID())); if (!aFaceRef) return; - boost::shared_ptr aFace = - boost::dynamic_pointer_cast(aFaceRef->value()); + std::shared_ptr aFace = + std::dynamic_pointer_cast(aFaceRef->value()); if (!aFace) return; - boost::shared_ptr aContext = - boost::dynamic_pointer_cast(aFaceRef->context()); + std::shared_ptr aContext; + ResultPtr aContextRes = aFaceRef->context(); + if (aContextRes) { + if (aContextRes->groupName() == ModelAPI_ResultBody::group()) + aContext = std::dynamic_pointer_cast(aContextRes)->shape(); + else if (aContextRes->groupName() == ModelAPI_ResultConstruction::group()) + aContext = std::dynamic_pointer_cast(aContextRes)->shape(); + } + if (!aContext) { + static const std::string aContextError = "The selection context is bad"; + setError(aContextError); + 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()); - //TCollection_AsciiString anError; + std::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; + static const std::string aFeatureError = "Extrusion algorithm failed"; + setError(aFeatureError); + return; } - // Check if shape is valid - if (!aFeature.shape()->impl().IsNull()) { - std::string aShapeError = "Resulting shape is Null"; - Events_Error::send(aShapeError, this); - #ifdef _DEBUG - std::cerr << aShapeError << std::endl; - #endif + // Check if shape is valid + if (aFeature.shape()->isNull()) { + static const std::string aShapeError = "Resulting shape is Null"; + setError(aShapeError); return; } - if(!aFeature.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; - Events_Error::send(aFeatureError, this); - return; + if(!aFeature.isValid()) { + std::string aFeatureError = "Warning: resulting shape is not valid"; + setError(aFeatureError); + return; } //LoadNamingDS LoadNamingDS(aFeature, aResultBody, aFace, aContext); @@ -84,70 +87,47 @@ void FeaturesPlugin_Extrusion::execute() setResult(aResultBody); } - //============================================================================ +//============================================================================ 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) { - - //load result - if(theBasis->impl().IsEqual(theContext->impl())) - theResultBody->store(theFeature.shape()); - else - theResultBody->storeGenerated(theContext, theFeature.shape()); - - TopTools_DataMapOfShapeShape aSubShapes; - for (TopExp_Explorer Exp(theFeature.shape()->impl(),TopAbs_FACE); Exp.More(); Exp.Next()) { - aSubShapes.Bind(Exp.Current(),Exp.Current()); - } - - //Insert lateral face : Face from Edge - //GeomAlgoAPI_DFLoader::loadAndOrientGeneratedShapes(*myBuilder, myBasis, TopAbs_EDGE, aLateralFaceBuilder, aSubShapes); - - - TopTools_MapOfShape aView; - TopExp_Explorer aShapeExplorer (theFeature.shape()->impl(), TopAbs_EDGE); - for (; aShapeExplorer.More(); aShapeExplorer.Next ()) { - const TopoDS_Shape& aRoot = aShapeExplorer.Current (); - if (!aView.Add(aRoot)) continue; - boost::shared_ptr aRootG(new GeomAPI_Shape()); - aRootG->setImpl((void *)&aRoot); - const ListOfShape& aShapes = theFeature.generated(aRootG); - std::list >::const_iterator anIt = aShapes.begin(), aLast = aShapes.end(); - for (; anIt != aLast; anIt++) { - TopoDS_Shape aNewShape = (*anIt)->impl(); - if (aSubShapes.IsBound(aNewShape)) { - aNewShape.Orientation((aSubShapes(aNewShape)).Orientation()); - } - - if (!aRoot.IsSame (aNewShape)) { - boost::shared_ptr aNew(new GeomAPI_Shape()); - aNew->setImpl((void *)&aNewShape); - theResultBody->generated(aRootG, aNew,_LATERAL_TAG); - } - } - } + + //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); + + //Insert lateral face : Face from Edge + std::string aLatName = "LateralFace"; + theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theBasis, EDGE,_LATERAL_TAG, aLatName, *aSubShapes); //Insert bottom face - const boost::shared_ptr& aBottomFace = theFeature.firstShape(); - if (!aBottomFace->impl().IsNull()) { - if (aSubShapes.IsBound(aBottomFace->impl())) { - aBottomFace->setImpl((void *)&aSubShapes(aBottomFace->impl())); - } - theResultBody->generated(aBottomFace, _FIRST_TAG); + std::string aBotName = "BottomFace"; + 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 - boost::shared_ptr aTopFace = theFeature.lastShape(); - if (!aTopFace->impl().IsNull()) { - if (aSubShapes.IsBound(aTopFace->impl())) { - aTopFace->setImpl((void *)&aSubShapes(aTopFace->impl())); - } - theResultBody->generated(aTopFace, _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); + } + theResultBody->generated(aTopFace, aTopName, _LAST_TAG); + } + }