Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Extrusion.cpp

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
index 0e997edafe6fe27d0eda36920a0cdb026c80a0e9..b49f5885488d020c7618e28923def08d36433ae3 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
@@ -11,11 +11,20 @@
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeBoolean.h>
-
+#include <Events_Error.h>
 #include <GeomAlgoAPI_Extrusion.h>
-
+#include <TopoDS_Shape.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopTools_MapOfShape.hxx>
 using namespace std;
-
+#define _LATERAL_TAG 1
+#define _FIRST_TAG 2
+#define _LAST_TAG 3
+#ifdef _DEBUG
+#include <iostream>
+#include <ostream>
+#endif
 FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion()
 {
 }
@@ -33,16 +42,112 @@ void FeaturesPlugin_Extrusion::execute()
       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());
   if (!aFace)
     return;
 
+  boost::shared_ptr<GeomAPI_Shape> aContext = 
+    boost::dynamic_pointer_cast<GeomAPI_Shape>(aFaceRef->context());
+
   double aSize = data()->real(FeaturesPlugin_Extrusion::SIZE_ID())->value();
   if (data()->boolean(FeaturesPlugin_Extrusion::REVERSE_ID())->value())
     aSize = -aSize;
 
-  boost::shared_ptr<ModelAPI_ResultBody> aResult = document()->createBody(data());
-  aResult->store(GeomAlgoAPI_Extrusion::makeExtrusion(aFace, aSize));
-  setResult(aResult);
+  boost::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
+  //TCollection_AsciiString anError;
+  GeomAlgoAPI_Extrusion aFeature(aFace, aSize);
+  if(!aFeature.isDone()) {
+       std::string aFeatureError = "Extrusion algorithm failed";  
+    Events_Error::send(aFeatureError, this);
+       return;
+  }
+
+   // Check if shape is valid
+  if (!aFeature.shape()->impl<TopoDS_Shape>().IsNull()) {
+    std::string aShapeError = "Resulting shape is Null";     
+    Events_Error::send(aShapeError, this);
+ #ifdef _DEBUG
+    std::cerr << aShapeError << std::endl;
+ #endif
+    return;
+  }
+   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);
+}
+
+  //============================================================================
+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)
+{  
+
+       
+    //load result
+       if(theBasis->impl<TopoDS_Shape>().IsEqual(theContext->impl<TopoDS_Shape>()))
+         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());
+       }
+
+       //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();
+  if (!aBottomFace->impl<TopoDS_Shape>().IsNull()) {
+         if (aSubShapes.IsBound(aBottomFace->impl<TopoDS_Shape>())) {
+               aBottomFace->setImpl((void *)&aSubShapes(aBottomFace->impl<TopoDS_Shape>()));
+         }    
+  theResultBody->generated(aBottomFace, _FIRST_TAG);
+  }
+
+  
+
+ //Insert top face
+  boost::shared_ptr<GeomAPI_Shape> aTopFace = theFeature.lastShape();
+  if (!aTopFace->impl<TopoDS_Shape>().IsNull()) {
+       if (aSubShapes.IsBound(aTopFace->impl<TopoDS_Shape>())) {
+               aTopFace->setImpl((void *)&aSubShapes(aTopFace->impl<TopoDS_Shape>()));
+       }
+    theResultBody->generated(aTopFace, _FIRST_TAG);
+  }
+
 }