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

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
index c8ac130c4..225e3cf48 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
@@ -4,26 +4,19 @@
 // Created:     30 May 2014
 // Author:      Vitaly SMETANNIKOV
 
-#include <FeaturesPlugin_Extrusion.h>
+#include "FeaturesPlugin_Extrusion.h"
 
-#include <ModelAPI_BodyBuilder.h>
-#include <ModelAPI_Session.h>
-#include <ModelAPI_Validator.h>
-#include <ModelAPI_Document.h>
-#include <ModelAPI_Data.h>
-#include <ModelAPI_ResultConstruction.h>
-#include <ModelAPI_ResultCompSolid.h>
-#include <ModelAPI_ResultBody.h>
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeSelection.h>
-#include <ModelAPI_AttributeSelectionList.h>
-#include <ModelAPI_AttributeBoolean.h>
 #include <ModelAPI_AttributeString.h>
-#include <ModelAPI_AttributeReference.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
 
-#include <GeomAlgoAPI_CompoundBuilder.h>
 #include <GeomAlgoAPI_Prism.h>
-#include <GeomAlgoAPI_ShapeTools.h>
+
+#include <GeomAPI_Dir.h>
+#include <GeomAPI_Edge.h>
+#include <GeomAPI_Lin.h>
 
 //=================================================================================================
 FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion()
@@ -33,11 +26,7 @@ FeaturesPlugin_Extrusion::FeaturesPlugin_Extrusion()
 //=================================================================================================
 void FeaturesPlugin_Extrusion::initAttributes()
 {
-  AttributeSelectionListPtr aSelection = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
-    LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
-  // extrusion works with faces always
-  aSelection->setSelectionType("FACE");
+  initCompositeSketchAttribtues(InitBaseObjectsList);
 
   data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId());
 
@@ -50,50 +39,60 @@ void FeaturesPlugin_Extrusion::initAttributes()
   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()
 {
-  // Getting faces.
-  ListOfShape aFacesList;
-  AttributeSelectionListPtr aFacesSelectionList = selectionList(LIST_ID());
-  for(int anIndex = 0; anIndex < aFacesSelectionList->size(); anIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> aFaceSel = aFacesSelectionList->value(anIndex);
-    ResultPtr aContext = aFaceSel->context();
-    std::shared_ptr<GeomAPI_Shape> aContextShape = aContext->shape();
-    if(!aContextShape.get()) {
-      static const std::string aContextError = "The selection context is bad";
-      setError(aContextError);
-      break;
-    }
+  ListOfShape aBaseShapesList;
+  ListOfMakeShape aMakeShapesList;
 
-    std::shared_ptr<GeomAPI_Shape> aFaceShape = aFaceSel->value();
-    int aFacesNum = -1; // this mean that "aFace" is used
-    ResultConstructionPtr aConstruction = 
-      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
-    if(!aFaceShape.get()) { // this may be the whole sketch result selected, check and get faces
-      if (aConstruction.get()) {
-        aFacesNum = aConstruction->facesNum();
-      } else {
-        static const std::string aFaceError = "Can not find basis for extrusion";
-        setError(aFaceError);
-        break;
-      }
-    }
-    for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) {
-      std::shared_ptr<GeomAPI_Shape> aBaseShape;
-      if (aFacesNum == -1) {
-        if (!aFaceShape->isNull()) {
-          aFacesList.push_back(aFaceShape);
-        }
-        break;
-      } else {
-        aFaceShape = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
-        aFacesList.push_back(aFaceShape);
-      }
+  // Make extrusions.
+  if(!makeExtrusions(aBaseShapesList, aMakeShapesList)) {
+    return;
+  }
+
+  // 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();
     }
   }
 
@@ -103,112 +102,46 @@ void FeaturesPlugin_Extrusion::execute()
 
   if(string(CREATION_METHOD())->value() == "BySizes") {
     aToSize = real(TO_SIZE_ID())->value();
-    aFromSize =  real(FROM_SIZE_ID())->value();
+    aFromSize = real(FROM_SIZE_ID())->value();
   } else {
     aToSize = real(TO_OFFSET_ID())->value();
-    aFromSize =  real(FROM_OFFSET_ID())->value();
+    aFromSize = real(FROM_OFFSET_ID())->value();
   }
 
   // Getting bounding planes.
-  std::shared_ptr<GeomAPI_Shape> aToShape;
-  std::shared_ptr<GeomAPI_Shape> aFromShape;
+  GeomShapePtr aToShape;
+  GeomShapePtr aFromShape;
 
   if(string(CREATION_METHOD())->value() == "ByPlanesAndOffsets") {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjRef = selection(TO_OBJECT_ID());
-    if(anObjRef.get() != NULL) {
-      aToShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anObjRef->value());
-      if(aToShape.get() == NULL && anObjRef->context().get() != NULL) {
-        aToShape =  anObjRef->context()->shape();
+    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();
       }
     }
-    anObjRef = selection(FROM_OBJECT_ID());
-    if(anObjRef.get() != NULL) {
-      aFromShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anObjRef->value());
-      if(aFromShape.get() == NULL && anObjRef->context().get() != NULL) {
-        aFromShape = anObjRef->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();
       }
     }
   }
 
-  // Searching faces with common edges.
-  ListOfShape aShells;
-  ListOfShape aFreeFaces;
-  std::shared_ptr<GeomAPI_Shape> aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aFacesList);
-  GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, aShells, aFreeFaces);
-  aShells.insert(aShells.end(), aFreeFaces.begin(), aFreeFaces.end());
-
-  // Generating result for each shell and face.
-  int aResultIndex = 0;
-  for(ListOfShape::const_iterator anIter = aShells.cbegin(); anIter != aShells.cend(); anIter++) {
+  // Generating result for each base shape.
+  for(ListOfShape::const_iterator anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
     std::shared_ptr<GeomAPI_Shape> aBaseShape = *anIter;
 
-    GeomAlgoAPI_Prism aPrismAlgo(aBaseShape, aToShape, aToSize, aFromShape, aFromSize);
-    if(!aPrismAlgo.isDone()) {
-      static const std::string aPrismAlgoError = "Extrusion algorithm failed";
-      setError(aPrismAlgoError);
-      aResultIndex = 0;
-      break;
+    std::shared_ptr<GeomAlgoAPI_Prism> aPrismAlgo(new GeomAlgoAPI_Prism(aBaseShape, aDir,
+                                                                        aToShape, aToSize,
+                                                                        aFromShape, aFromSize));
+    if(!isMakeShapeValid(aPrismAlgo)) {
+      return false;
     }
 
-    // Check if shape is valid
-    if(!aPrismAlgo.shape().get() || aPrismAlgo.shape()->isNull()) {
-      static const std::string aShapeError = "Resulting shape is Null";
-      setError(aShapeError);
-      aResultIndex = 0;
-      break;
-    }
-    if(!aPrismAlgo.isValid()) {
-      std::string aPrismAlgoError = "Warning: resulting shape is not valid";
-      setError(aPrismAlgoError);
-      aResultIndex = 0;
-      break;
-    }
-
-    ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-    loadNamingDS(aPrismAlgo, aResultBody, aBaseShape);
-    setResult(aResultBody, aResultIndex);
-    aResultIndex++;
-  }
-
-  removeResults(aResultIndex);
-}
-
-//=================================================================================================
-void FeaturesPlugin_Extrusion::loadNamingDS(GeomAlgoAPI_Prism& thePrismAlgo,
-                                            std::shared_ptr<ModelAPI_ResultBody> theResultBody,
-                                            std::shared_ptr<GeomAPI_Shape> theBasis)
-{
-  //load result
-  theResultBody->storeGenerated(theBasis, thePrismAlgo.shape());
-
-  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = thePrismAlgo.mapOfShapes();
-
-  //Insert lateral face : Face from Edge
-  const std::string aLatName = "LateralFace";
-  const int aLatTag = 1;
-  theResultBody->loadAndOrientGeneratedShapes(thePrismAlgo.makeShape().get(), theBasis, GeomAPI_Shape::EDGE, aLatTag, aLatName, *aSubShapes);
-
-  //Insert to faces
-  const std::string aToName = "ToFace";
-  int aToTag = 2;
-  const ListOfShape& aToFaces = thePrismAlgo.toFaces();
-  for(ListOfShape::const_iterator anIt = aToFaces.cbegin(); anIt != aToFaces.cend(); anIt++) {
-    std::shared_ptr<GeomAPI_Shape> aToFace = *anIt;
-    if(aSubShapes->isBound(aToFace)) {
-      aToFace = aSubShapes->find(aToFace);
-    }
-    theResultBody->generated(aToFace, aToName, aToTag++);
+    theMakeShapes.push_back(aPrismAlgo);
   }
 
-  //Insert from faces
-  const std::string aFromName = "FromFace";
-  int aFromTag = aToTag > 10000 ? aToTag : 10000;
-  const ListOfShape& aFromFaces = thePrismAlgo.fromFaces();
-  for(ListOfShape::const_iterator anIt = aFromFaces.cbegin(); anIt != aFromFaces.cend(); anIt++) {
-    std::shared_ptr<GeomAPI_Shape> aFromFace = *anIt;
-    if(aSubShapes->isBound(aFromFace)) {
-      aFromFace = aSubShapes->find(aFromFace);
-    }
-    theResultBody->generated(aFromFace, aFromName, aFromTag++);
-  }
+  return true;
 }