X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_RevolutionBoolean.cpp;h=479fd51e97612d29e3166b0dfd907ba2bb5cd597;hb=da6ada6975c41128a1890eade5127e700420390b;hp=d2ec7bd664ad679eb88279426951997be4081d59;hpb=7fb62fa4f588717eaffdcba56c032fba99def105;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
index d2ec7bd66..479fd51e9 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
@@ -1,108 +1,31 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        FeaturesPlugin_RevolutionBoolean.h
+// File:        FeaturesPlugin_RevolutionBoolean.cpp
 // Created:     11 June 2015
 // Author:      Dmitry Bobylev
 
-#include <FeaturesPlugin_RevolutionBoolean.h>
-
-#include <ModelAPI_AttributeDouble.h>
-#include <ModelAPI_AttributeSelection.h>
-#include <ModelAPI_AttributeString.h>
-#include <ModelAPI_Session.h>
-#include <ModelAPI_Validator.h>
-
-#include <GeomAlgoAPI_Revolution.h>
-#include <GeomAPI_Edge.h>
-#include <GeomAPI_Lin.h>
+#include "FeaturesPlugin_RevolutionBoolean.h"
 
 //=================================================================================================
-void FeaturesPlugin_RevolutionBoolean::initMakeSolidsAttributes()
+void FeaturesPlugin_RevolutionBoolean::initAttributes()
 {
-  data()->addAttribute(FeaturesPlugin_RevolutionBoolean::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
-
-  data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId());
-
-  data()->addAttribute(TO_ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
-  data()->addAttribute(FROM_ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
+  FeaturesPlugin_Revolution::initAttributes();
 
-  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());
-
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TO_OBJECT_ID());
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID());
+  initBooleanAttributes();
 }
 
 //=================================================================================================
-void FeaturesPlugin_RevolutionBoolean::makeSolids(const ListOfShape& theFaces,
-                                                  ListOfShape& theResults,
-                                                  std::list<std::shared_ptr<GeomAPI_Interface>>& theAlgos)
+bool FeaturesPlugin_RevolutionBoolean::makeGeneration(ListOfShape& theBaseShapes,
+                                                      ListOfMakeShape& theMakeShapes)
 {
-  //Getting axis.
-  std::shared_ptr<GeomAPI_Ax1> anAxis;
-  std::shared_ptr<GeomAPI_Edge> anEdge;
-  std::shared_ptr<ModelAPI_AttributeSelection> anObjRef = selection(FeaturesPlugin_RevolutionBoolean::AXIS_OBJECT_ID());
-  if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
-    anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
-  } else if(anObjRef->context() && anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) {
-    anEdge = std::make_shared<GeomAPI_Edge>(anObjRef->context()->shape());
-  }
-  if(anEdge) {
-    anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction()));
-  }
-
-  // Getting revolution angles.
-  double aToAngle = real(TO_ANGLE_ID())->value();
-  double aFromAngle = real(FROM_ANGLE_ID())->value();
-
-  if(string(CREATION_METHOD())->value() == "ByAngles") {
-    aToAngle = real(TO_ANGLE_ID())->value();
-    aFromAngle =  real(FROM_ANGLE_ID())->value();
-  } else {
-    aToAngle = real(TO_OFFSET_ID())->value();
-    aFromAngle =  real(FROM_OFFSET_ID())->value();
-  }
-
-  // Getting revolution bounding planes.
-  std::shared_ptr<GeomAPI_Shape> aToShape;
-  std::shared_ptr<GeomAPI_Shape> aFromShape;
-
-  if(string(CREATION_METHOD())->value() == "ByPlanesAndOffsets") {
-    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();
-      }
-    }
-  }
-
-  // Revol faces.
-  theResults.clear();
-  for(ListOfShape::const_iterator aFacesIt = theFaces.begin(); aFacesIt != theFaces.end(); aFacesIt++) {
-    std::shared_ptr<GeomAPI_Shape> aBaseShape = *aFacesIt;
-    std::shared_ptr<GeomAlgoAPI_Revolution> aRevolAlgo = std::make_shared<GeomAlgoAPI_Revolution>(aBaseShape, anAxis,
-                                                                                                  aToShape, aToAngle,
-                                                                                                  aFromShape, aFromAngle);
+  return makeRevolutions(theBaseShapes, theMakeShapes);
+}
 
-    // Checking that the algorithm worked properly.
-    if(!aRevolAlgo->isDone()  || !aRevolAlgo->shape().get() || aRevolAlgo->shape()->isNull() ||
-       !aRevolAlgo->isValid()) {
-      setError("Revolution algorithm failed");
-      theResults.clear();
-      return;
-    }
-    theResults.push_back(aRevolAlgo->shape());
-    theAlgos.push_back(aRevolAlgo);
-  }
-}
\ No newline at end of file
+//=================================================================================================
+void FeaturesPlugin_RevolutionBoolean::storeGenerationHistory(ResultBodyPtr theResultBody,
+                                                             const GeomShapePtr theBaseShape,
+                                                             const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                                             int& theTag)
+{
+  FeaturesPlugin_Revolution::storeGenerationHistory(theResultBody, theBaseShape, theMakeShape, theTag);
+}