X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Extrusion.cpp;h=cebc0bb44cd024e123d796b13681fa978eba2570;hb=4b4154e06aba65daeab5178a0ac3998c8383318a;hp=b32f2e97a5e09841d36fb2602636c248b78121f4;hpb=9eb5801ea57b763b26db2c7bf897a50b34e2cc31;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
index b32f2e97a..cebc0bb44 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
@@ -11,17 +11,13 @@
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeBoolean.h>
-#include <Events_Error.h>
 #include <GeomAlgoAPI_Extrusion.h>
 
 using namespace std;
 #define _LATERAL_TAG 1
 #define _FIRST_TAG 2
 #define _LAST_TAG 3
-#ifdef _DEBUG
-#include <iostream>
-#include <ostream>
-#endif
+#define EDGE 6
 
 FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion()
 {
@@ -36,27 +32,27 @@ void FeaturesPlugin_Extrusion::initAttributes()
 
 void FeaturesPlugin_Extrusion::execute()
 {
-  boost::shared_ptr<ModelAPI_AttributeSelection> aFaceRef = boost::dynamic_pointer_cast<
+  std::shared_ptr<ModelAPI_AttributeSelection> aFaceRef = std::dynamic_pointer_cast<
     ModelAPI_AttributeSelection>(data()->attribute(FeaturesPlugin_Extrusion::FACE_ID()));
   if (!aFaceRef)
     return;
 
-  boost::shared_ptr<GeomAPI_Shape> aFace = 
-    boost::dynamic_pointer_cast<GeomAPI_Shape>(aFaceRef->value());
+  std::shared_ptr<GeomAPI_Shape> aFace = 
+    std::dynamic_pointer_cast<GeomAPI_Shape>(aFaceRef->value());
   if (!aFace)
     return;
 
-  boost::shared_ptr<GeomAPI_Shape> aContext;
+  std::shared_ptr<GeomAPI_Shape> aContext;
   ResultPtr aContextRes = aFaceRef->context();
   if (aContextRes) {
     if (aContextRes->groupName() == ModelAPI_ResultBody::group())
-      aContext = boost::dynamic_pointer_cast<ModelAPI_ResultBody>(aContextRes)->shape();
+      aContext = std::dynamic_pointer_cast<ModelAPI_ResultBody>(aContextRes)->shape();
     else if (aContextRes->groupName() == ModelAPI_ResultConstruction::group())
-      aContext = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContextRes)->shape();
+      aContext = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContextRes)->shape();
   }
   if (!aContext) {
-    std::string aContextError = "The selection context is bad";
-    Events_Error::send(aContextError, this);
+    static const std::string aContextError = "The selection context is bad";
+    setError(aContextError);
     return;
   }
 
@@ -64,27 +60,23 @@ void FeaturesPlugin_Extrusion::execute()
   if (data()->boolean(FeaturesPlugin_Extrusion::REVERSE_ID())->value())
     aSize = -aSize;
 
-  boost::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
-  //TCollection_AsciiString anError;
+  std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
   GeomAlgoAPI_Extrusion aFeature(aFace, aSize);
   if(!aFeature.isDone()) {
-    std::string aFeatureError = "Extrusion algorithm failed";  
-    Events_Error::send(aFeatureError, this);
+    static const std::string aFeatureError = "Extrusion algorithm failed";  
+    setError(aFeatureError);
     return;
   }
 
   // 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
+    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);
+    setError(aFeatureError);
     return;
   }  
   //LoadNamingDS
@@ -95,9 +87,9 @@ void FeaturesPlugin_Extrusion::execute()
 
 //============================================================================
 void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature, 
-  boost::shared_ptr<ModelAPI_ResultBody> theResultBody, 
-  boost::shared_ptr<GeomAPI_Shape> theBasis,
-  boost::shared_ptr<GeomAPI_Shape> theContext)
+  std::shared_ptr<ModelAPI_ResultBody> theResultBody, 
+  std::shared_ptr<GeomAPI_Shape> theBasis,
+  std::shared_ptr<GeomAPI_Shape> theContext)
 {  
 
 
@@ -105,44 +97,19 @@ void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature,
   if(theBasis->isEqual(theContext))
     theResultBody->store(theFeature.shape());
   else
-    theResultBody->storeGenerated(theContext, theFeature.shape());
-  /*
-  TopTools_DataMapOfShapeShape aSubShapes;
-  for (TopExp_Explorer Exp(theFeature.shape()->impl<TopoDS_Shape>(),TopAbs_FACE); Exp.More(); Exp.Next()) {
-    aSubShapes.Bind(Exp.Current(),Exp.Current());
-  }
+    theResultBody->storeGenerated(theContext, theFeature.shape()); 
+
+  GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape();
+  theFeature.mapOfShapes(*aSubShapes);
+
+    //Insert lateral face : Face from Edge
+  theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theBasis, EDGE,_LATERAL_TAG, *aSubShapes);
 
-  //Insert lateral face : Face from Edge
-  //GeomAlgoAPI_DFLoader::loadAndOrientGeneratedShapes(*myBuilder, myBasis, TopAbs_EDGE, aLateralFaceBuilder, aSubShapes);
-
-
-  TopTools_MapOfShape aView;
-  TopExp_Explorer aShapeExplorer (theFeature.shape()->impl<TopoDS_Shape>(), TopAbs_EDGE);
-  for (; aShapeExplorer.More(); aShapeExplorer.Next ()) {
-    const TopoDS_Shape& aRoot = aShapeExplorer.Current ();
-    if (!aView.Add(aRoot)) continue;
-    boost::shared_ptr<GeomAPI_Shape> aRootG(new GeomAPI_Shape());
-    aRootG->setImpl((void *)&aRoot);
-    const ListOfShape& aShapes = theFeature.generated(aRootG);
-    std::list<boost::shared_ptr<GeomAPI_Shape> >::const_iterator anIt = aShapes.begin(), aLast = aShapes.end();	  
-    for (; anIt != aLast; anIt++) {
-      TopoDS_Shape aNewShape = (*anIt)->impl<TopoDS_Shape>(); 
-      if (aSubShapes.IsBound(aNewShape)) {
-        aNewShape.Orientation((aSubShapes(aNewShape)).Orientation());
-      }
-
-      if (!aRoot.IsSame (aNewShape)) {
-        boost::shared_ptr<GeomAPI_Shape> aNew(new GeomAPI_Shape());
-        aNew->setImpl((void *)&aNewShape);
-        theResultBody->generated(aRootG, aNew,_LATERAL_TAG); 
-      }
-    }
-  }
   //Insert bottom face
-  const boost::shared_ptr<GeomAPI_Shape>& aBottomFace = theFeature.firstShape();
+  std::shared_ptr<GeomAPI_Shape> aBottomFace = theFeature.firstShape();  
   if (!aBottomFace->isNull()) {
-    if (aSubShapes.IsBound(aBottomFace->impl<TopoDS_Shape>())) {
-      aBottomFace->setImpl((void *)&aSubShapes(aBottomFace->impl<TopoDS_Shape>()));
+	if (aSubShapes->isBound(aBottomFace)) {	 
+		aBottomFace = aSubShapes->find(aBottomFace);		
     }    
     theResultBody->generated(aBottomFace, _FIRST_TAG);
   }
@@ -150,13 +117,13 @@ void FeaturesPlugin_Extrusion::LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature,
 
 
   //Insert top face
-  boost::shared_ptr<GeomAPI_Shape> aTopFace = theFeature.lastShape();
+  std::shared_ptr<GeomAPI_Shape> aTopFace = theFeature.lastShape();
   if (!aTopFace->isNull()) {
-    if (aSubShapes.IsBound(aTopFace->impl<TopoDS_Shape>())) {
-      aTopFace->setImpl((void *)&aSubShapes(aTopFace->impl<TopoDS_Shape>()));
+    if (aSubShapes->isBound(aTopFace)) {	 
+      aTopFace = aSubShapes->find(aTopFace);	
     }
-    theResultBody->generated(aTopFace, _FIRST_TAG);
+    theResultBody->generated(aTopFace, _LAST_TAG);
   }
-  */
 
+  
 }