Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

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

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
index c84c007022746d820ed0ec06947376a4902cb232..3056c26826725267bb419994850fb66990db52ff 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
@@ -30,11 +30,11 @@ void FeaturesPlugin_Extrusion::initAttributes()
 {
   AttributeSelectionListPtr aSelection = 
     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
-    FeaturesPlugin_Extrusion::LIST_ID(), ModelAPI_AttributeSelectionList::type()));
+    FeaturesPlugin_Extrusion::LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
   // extrusion works with faces always
   aSelection->setSelectionType("FACE");
-  data()->addAttribute(FeaturesPlugin_Extrusion::SIZE_ID(), ModelAPI_AttributeDouble::type());
-  data()->addAttribute(FeaturesPlugin_Extrusion::REVERSE_ID(), ModelAPI_AttributeBoolean::type());
+  data()->addAttribute(FeaturesPlugin_Extrusion::SIZE_ID(), ModelAPI_AttributeDouble::typeId());
+  data()->addAttribute(FeaturesPlugin_Extrusion::REVERSE_ID(), ModelAPI_AttributeBoolean::typeId());
 }
 
 void FeaturesPlugin_Extrusion::execute()
@@ -42,14 +42,9 @@ void FeaturesPlugin_Extrusion::execute()
   AttributeSelectionListPtr aFaceRefs = selectionList(FeaturesPlugin_Extrusion::LIST_ID());
 
   // for each selected face generate a result
-  int anIndex = 0;
+  int anIndex = 0, aResultIndex = 0;
   for(; anIndex < aFaceRefs->size(); anIndex++) {
     std::shared_ptr<ModelAPI_AttributeSelection> aFaceRef = aFaceRefs->value(anIndex);
-    if (!aFaceRef.get())
-      continue;
-    std::shared_ptr<GeomAPI_Shape> aFace = aFaceRef->value();
-    if (!aFace.get())
-      continue;
     ResultPtr aContextRes = aFaceRef->context();
     std::shared_ptr<GeomAPI_Shape> aContext = aContextRes->shape();
     if (!aContext.get()) {
@@ -57,37 +52,62 @@ void FeaturesPlugin_Extrusion::execute()
       setError(aContextError);
       break;
     }
-
     double aSize = real(FeaturesPlugin_Extrusion::SIZE_ID())->value();
     if (boolean(FeaturesPlugin_Extrusion::REVERSE_ID())->value())
       aSize = -aSize;
 
-    ResultBodyPtr aResultBody = document()->createBody(data(), anIndex);
-    GeomAlgoAPI_Extrusion aFeature(aFace, aSize);
-    if(!aFeature.isDone()) {
-      static const std::string aFeatureError = "Extrusion algorithm failed";  
-      setError(aFeatureError);
-      break;
+    std::shared_ptr<GeomAPI_Shape> aValueFace = aFaceRef->value();
+    int aFacesNum = -1; // this mean that "aFace" is used
+    ResultConstructionPtr aConstruction =
+      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContextRes);
+    if (!aValueFace.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;
+      }
     }
 
-    // Check if shape is valid
-    if (aFeature.shape()->isNull()) {
-      static const std::string aShapeError = "Resulting shape is Null";     
-      setError(aShapeError);
-      break;
+    for(int aFaceIndex = 0; aFaceIndex < aFacesNum || aFacesNum == -1; aFaceIndex++) {
+      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
+      std::shared_ptr<GeomAPI_Shape> aFace;
+      if (aFacesNum == -1) {
+        aFace = aValueFace;
+      } else {
+        aFace = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
+      }
+      GeomAlgoAPI_Extrusion aFeature(aFace, aSize);
+      if(!aFeature.isDone()) {
+        static const std::string aFeatureError = "Extrusion algorithm failed";  
+        setError(aFeatureError);
+        break;
+      }
+
+      // Check if shape is valid
+      if (aFeature.shape()->isNull()) {
+        static const std::string aShapeError = "Resulting shape is Null";     
+        setError(aShapeError);
+        break;
+      }
+      if(!aFeature.isValid()) {
+        std::string aFeatureError = "Warning: resulting shape is not valid";  
+        setError(aFeatureError);
+        break;
+      }  
+      //LoadNamingDS
+      LoadNamingDS(aFeature, aResultBody, aFace, aContext);
+
+      setResult(aResultBody, aResultIndex);
+      aResultIndex++;
+
+      if (aFacesNum == -1)
+        break;
     }
-    if(!aFeature.isValid()) {
-      std::string aFeatureError = "Warning: resulting shape is not valid";  
-      setError(aFeatureError);
-      break;
-    }  
-    //LoadNamingDS
-    LoadNamingDS(aFeature, aResultBody, aFace, aContext);
-
-    setResult(aResultBody, anIndex);
   }
   // remove the rest results if there were produced in the previous pass
-  removeResults(anIndex);
+  removeResults(aResultIndex);
 }
 
 //============================================================================
@@ -142,4 +162,4 @@ void FeaturesPlugin_Extrusion::clearResult()
   std::shared_ptr<GeomAPI_Shape> anEmptyShape(new GeomAPI_Shape);
   aResultBody->store(anEmptyShape);
   setResult(aResultBody);
-}
\ No newline at end of file
+}