X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_ExtrusionBoolean.cpp;h=4501a81911ea8e59d5b5e7cb1f4a5309bc43f9c5;hb=fb54db5e1466b16dfc029c4a7364a67a9a6a8c24;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..4501a8191
--- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp
@@ -1,69 +1,31 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        FeaturesPlugin_ExtrusionBoolean.h
+// File:        FeaturesPlugin_ExtrusionBoolean.cpp
 // Created:     11 June 2015
 // Author:      Dmitry Bobylev
 
-#include <FeaturesPlugin_ExtrusionBoolean.h>
-
-#include <ModelAPI_AttributeDouble.h>
-#include <ModelAPI_AttributeSelection.h>
-#include <ModelAPI_Session.h>
-#include <ModelAPI_Validator.h>
-
-#include <GeomAlgoAPI_Prism.h>
+#include "FeaturesPlugin_ExtrusionBoolean.h"
 
 //=================================================================================================
-void FeaturesPlugin_ExtrusionBoolean::initMakeSolidsAttributes()
+void FeaturesPlugin_ExtrusionBoolean::initAttributes()
 {
-  data()->addAttribute(FROM_OBJECT_ID(), ModelAPI_AttributeSelection::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());
+  FeaturesPlugin_Extrusion::initAttributes();
 
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID());
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TO_OBJECT_ID());
+  initBooleanAttributes();
 }
 
 //=================================================================================================
-ListOfShape FeaturesPlugin_ExtrusionBoolean::MakeSolids(const ListOfShape& theFaces)
+bool FeaturesPlugin_ExtrusionBoolean::makeGeneration(ListOfShape& theBaseShapes,
+                                                     ListOfMakeShape& theMakeShapes)
 {
-  // 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();
-    }
-  }
-  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();
-    }
-  }
-
-  // Getting extrusion sizes.
-  double aFromSize = real(FROM_SIZE_ID())->value();
-  double aToSize = real(TO_SIZE_ID())->value();
-
-  // Extrude faces.
-  ListOfShape anExtrusionList;
-  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);
-
-    // Checking that the algorithm worked properly.
-    if(!aPrismAlgo.isDone() || aPrismAlgo.shape()->isNull() || !aPrismAlgo.isValid()) {
-      setError("Extrusion algorithm failed");
-      return ListOfShape();
-    }
-    anExtrusionList.push_back(aPrismAlgo.shape());
-  }
+  return makeExtrusions(theBaseShapes, theMakeShapes);
+}
 
-  return anExtrusionList;
-}
\ No newline at end of file
+//=================================================================================================
+void FeaturesPlugin_ExtrusionBoolean::storeGenerationHistory(ResultBodyPtr theResultBody,
+                                                             const GeomShapePtr theBaseShape,
+                                                             const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                                             int& theTag)
+{
+  FeaturesPlugin_Extrusion::storeGenerationHistory(theResultBody, theBaseShape, theMakeShape, theTag);
+}