X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Extrusion.cpp;h=225e3cf481e78ac7398aab43b1fa18bcad0c055c;hb=85b662214060cf733b44ac7822e3e4db49e2da4b;hp=295fb1c9de489e55cd14f0df7190b7c341e05625;hpb=d77708ba98445935aae7a0d93b5506e1f16018de;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
index 295fb1c9d..225e3cf48 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
@@ -1,58 +1,147 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:        FeaturesPlugin_Extrusion.cpp
 // Created:     30 May 2014
 // Author:      Vitaly SMETANNIKOV
 
 #include "FeaturesPlugin_Extrusion.h"
-#include <ModelAPI_Session.h>
-#include <ModelAPI_Document.h>
-#include <ModelAPI_Data.h>
-#include <ModelAPI_ResultConstruction.h>
-#include <ModelAPI_ResultBody.h>
+
 #include <ModelAPI_AttributeDouble.h>
-#include <ModelAPI_AttributeReference.h>
-#include <ModelAPI_AttributeBoolean.h>
+#include <ModelAPI_AttributeSelection.h>
+#include <ModelAPI_AttributeString.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
 
-#include <GeomAlgoAPI_Extrusion.h>
+#include <GeomAlgoAPI_Prism.h>
 
-using namespace std;
+#include <GeomAPI_Dir.h>
+#include <GeomAPI_Edge.h>
+#include <GeomAPI_Lin.h>
 
+//=================================================================================================
 FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion()
 {
 }
 
+//=================================================================================================
 void FeaturesPlugin_Extrusion::initAttributes()
 {
-  data()->addAttribute(FeaturesPlugin_Extrusion::FACE_ID(), ModelAPI_AttributeReference::type());
-  data()->addAttribute(FeaturesPlugin_Extrusion::SIZE_ID(), ModelAPI_AttributeDouble::type());
-  data()->addAttribute(FeaturesPlugin_Extrusion::REVERSE_ID(), ModelAPI_AttributeBoolean::type());
+  initCompositeSketchAttribtues(InitBaseObjectsList);
+
+  data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId());
+
+  data()->addAttribute(TO_SIZE_ID(), ModelAPI_AttributeDouble::typeId());
+  data()->addAttribute(FROM_SIZE_ID(), ModelAPI_AttributeDouble::typeId());
+
+  data()->addAttribute(TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(TO_OFFSET_ID(), ModelAPI_AttributeDouble::typeId());
+
+  data()->addAttribute(FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(FROM_OFFSET_ID(), ModelAPI_AttributeDouble::typeId());
+
+  data()->addAttribute(DIRECTION_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TO_OBJECT_ID());
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID());
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), DIRECTION_OBJECT_ID());
+
+  initCompositeSketchAttribtues(InitSketchLauncher);
 }
 
+//=================================================================================================
 void FeaturesPlugin_Extrusion::execute()
 {
-  boost::shared_ptr<ModelAPI_AttributeReference> aFaceRef = boost::dynamic_pointer_cast<
-      ModelAPI_AttributeReference>(data()->attribute(FeaturesPlugin_Extrusion::FACE_ID()));
-  if (!aFaceRef)
+  ListOfShape aBaseShapesList;
+  ListOfMakeShape aMakeShapesList;
+
+  // Make extrusions.
+  if(!makeExtrusions(aBaseShapesList, aMakeShapesList)) {
     return;
-  boost::shared_ptr<GeomAPI_Shape> aFace;
-  boost::shared_ptr<ModelAPI_ResultConstruction> aConstr = boost::dynamic_pointer_cast<
-      ModelAPI_ResultConstruction>(aFaceRef->value());
-  if (aConstr) {
-    aFace = aConstr->shape();
   }
-  if (!aFace) {
-    // Check for body
-    boost::shared_ptr<ModelAPI_ResultBody> aBody = boost::dynamic_pointer_cast<
-        ModelAPI_ResultBody>(aFaceRef->value());
-    if (aBody) 
-      aFace = aBody->shape();
+
+  // Store results.
+  int aResultIndex = 0;
+  ListOfShape::const_iterator aBaseIt = aBaseShapesList.cbegin();
+  ListOfMakeShape::const_iterator anAlgoIt = aMakeShapesList.cbegin();
+  for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend(); ++aBaseIt, ++anAlgoIt) {
+    storeResult(*aBaseIt, *anAlgoIt, aResultIndex++);
+  }
+
+  removeResults(aResultIndex);
+}
+
+//=================================================================================================
+bool FeaturesPlugin_Extrusion::makeExtrusions(ListOfShape& theBaseShapes,
+                                              ListOfMakeShape& theMakeShapes)
+{
+  theMakeShapes.clear();
+
+  // Getting base shapes.
+  getBaseShapes(theBaseShapes);
+
+  //Getting direction.
+  std::shared_ptr<GeomAPI_Dir> aDir;
+  std::shared_ptr<GeomAPI_Edge> anEdge;
+  AttributeSelectionPtr aSelection = selection(DIRECTION_OBJECT_ID());
+  if(aSelection.get() && aSelection->value().get() && aSelection->value()->isEdge()) {
+    anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aSelection->value()));
+  } else if(aSelection->context().get() &&
+            aSelection->context()->shape().get() &&
+            aSelection->context()->shape()->isEdge()) {
+    anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aSelection->context()->shape()));
+  }
+  if(anEdge.get()) {
+    if(anEdge->isLine()) {
+      aDir = anEdge->line()->direction();
+    }
+  }
+
+  // Getting sizes.
+  double aToSize = 0.0;
+  double aFromSize = 0.0;
+
+  if(string(CREATION_METHOD())->value() == "BySizes") {
+    aToSize = real(TO_SIZE_ID())->value();
+    aFromSize = real(FROM_SIZE_ID())->value();
+  } else {
+    aToSize = real(TO_OFFSET_ID())->value();
+    aFromSize = real(FROM_OFFSET_ID())->value();
+  }
+
+  // Getting bounding planes.
+  GeomShapePtr aToShape;
+  GeomShapePtr aFromShape;
+
+  if(string(CREATION_METHOD())->value() == "ByPlanesAndOffsets") {
+    aSelection = selection(TO_OBJECT_ID());
+    if(aSelection.get()) {
+      aToShape = std::dynamic_pointer_cast<GeomAPI_Shape>(aSelection->value());
+      if(!aToShape.get() && aSelection->context().get()) {
+        aToShape = aSelection->context()->shape();
+      }
+    }
+    aSelection = selection(FROM_OBJECT_ID());
+    if(aSelection.get()) {
+      aFromShape = std::dynamic_pointer_cast<GeomAPI_Shape>(aSelection->value());
+      if(!aFromShape.get() && aSelection->context().get()) {
+        aFromShape = aSelection->context()->shape();
+      }
+    }
+  }
+
+  // Generating result for each base shape.
+  for(ListOfShape::const_iterator anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
+    std::shared_ptr<GeomAPI_Shape> aBaseShape = *anIter;
+
+    std::shared_ptr<GeomAlgoAPI_Prism> aPrismAlgo(new GeomAlgoAPI_Prism(aBaseShape, aDir,
+                                                                        aToShape, aToSize,
+                                                                        aFromShape, aFromSize));
+    if(!isMakeShapeValid(aPrismAlgo)) {
+      return false;
+    }
+
+    theMakeShapes.push_back(aPrismAlgo);
   }
-  if (!aFace) 
-    return;
 
-  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);
+  return true;
 }