X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_ExtrusionBoolean.cpp;h=bc514dcd603c3cceaa458291ccbded42c4722e36;hb=5c7800057bef826f4dfcd151a05b18ca5c69a08a;hp=af44526a7365eabfbec01ec6380130b2301dfc31;hpb=171be43909f55eb16ae1de8b67ab68660ce28f1f;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp
old mode 100644
new mode 100755
index af44526a7..bc514dcd6
--- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        FeaturesPlugin_ExtrusionBoolean.h
+// File:        FeaturesPlugin_ExtrusionBoolean.cpp
 // Created:     11 June 2015
 // Author:      Dmitry Bobylev
 
@@ -8,6 +8,7 @@
 
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeSelection.h>
+#include <ModelAPI_AttributeString.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
 
@@ -16,54 +17,73 @@
 //=================================================================================================
 void FeaturesPlugin_ExtrusionBoolean::initMakeSolidsAttributes()
 {
-  data()->addAttribute(FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+  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_SIZE_ID(), ModelAPI_AttributeDouble::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());
 
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID());
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TO_OBJECT_ID());
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID());
 }
 
 //=================================================================================================
-ListOfShape FeaturesPlugin_ExtrusionBoolean::MakeSolids(const ListOfShape& theFaces)
+void FeaturesPlugin_ExtrusionBoolean::makeSolids(const ListOfShape& theFaces,
+                                                 ListOfShape& theResults,
+                                                 ListOfMakeShape& theAlgos)
 {
+  // Getting extrusion 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 extrusion bounding planes.
-  std::shared_ptr<GeomAPI_Shape> aFromShape;
   std::shared_ptr<GeomAPI_Shape> aToShape;
-  std::shared_ptr<ModelAPI_AttributeSelection> 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();
+  std::shared_ptr<GeomAPI_Shape> 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();
+      }
     }
-  }
-  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();
+    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();
+      }
     }
   }
 
-  // Getting extrusion sizes.
-  double aFromSize = real(FROM_SIZE_ID())->value();
-  double aToSize = real(TO_SIZE_ID())->value();
-
   // Extrude faces.
-  ListOfShape anExtrusionList;
+  theResults.clear();
   for(ListOfShape::const_iterator aFacesIt = theFaces.begin(); aFacesIt != theFaces.end(); aFacesIt++) {
     std::shared_ptr<GeomAPI_Shape> aBaseShape = *aFacesIt;
-    GeomAlgoAPI_Prism aPrismAlgo(aBaseShape, aFromShape, aFromSize, aToShape, aToSize);
+    std::shared_ptr<GeomAlgoAPI_Prism> aPrismAlgo = std::shared_ptr<GeomAlgoAPI_Prism>(new GeomAlgoAPI_Prism(aBaseShape, aToShape, aToSize, aFromShape, aFromSize));
 
     // Checking that the algorithm worked properly.
-    if(!aPrismAlgo.isDone() || aPrismAlgo.shape()->isNull() || !aPrismAlgo.isValid()) {
-      setError("Extrusion algorithm failed");
-      return ListOfShape();
+    if(!aPrismAlgo->isDone() || !aPrismAlgo->shape().get() || aPrismAlgo->shape()->isNull() ||
+       !aPrismAlgo->isValid()) {
+      setError("Error: Extrusion algorithm failed.");
+      theResults.clear();
+      return;
     }
-    anExtrusionList.push_back(aPrismAlgo.shape());
+    theResults.push_back(aPrismAlgo->shape());
+    theAlgos.push_back(aPrismAlgo);
   }
-
-  return anExtrusionList;
-}
\ No newline at end of file
+}