X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Extrusion.h;h=98c9af7c9ddf90f655fba32f66b2e9b8daf61df1;hb=5a4405dc843479d921b53b83c181cbe9359414fe;hp=87f33180d46f1b46c11bcc91ef32654818610523;hpb=a4702753c7da76a6434c9458f11ffce426be6e75;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
index 87f33180d..98c9af7c9 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
@@ -7,19 +7,21 @@
 #ifndef FeaturesPlugin_Extrusion_H_
 #define FeaturesPlugin_Extrusion_H_
 
-#include "FeaturesPlugin.h"
+#include <FeaturesPlugin.h>
 #include <ModelAPI_Feature.h>
-#include <ModelAPI_ResultBody.h>
-#include <GeomAlgoAPI_Extrusion.h>
-#include <GeomAPI_Shape.h>
+#include <GeomAlgoAPI_Prism.h>
+
+class GeomAPI_Shape;
+class ModelAPI_ResultBody;
 
 /**\class FeaturesPlugin_Extrusion
  * \ingroup Plugins
  * \brief Feature for creation of extrusion from the planar face.
  *
  * Extrusion creates the lateral faces based on edges of the base face and
- * the top face equal to the base face. Direction of extrusion is taken from the face
- * plane, but can be corrected by the "reverse" flag.
+ * the top and bottom faces equal to the base face or this faces can be projection on the
+ * bounding planes if they were set. Direction of extrusion is taken from the face
+ * plane or if the bounding faces were set then it will be from the bottom to the top plane.
  */
 class FeaturesPlugin_Extrusion : public ModelAPI_Feature
 {
@@ -30,31 +32,68 @@ class FeaturesPlugin_Extrusion : public ModelAPI_Feature
     static const std::string MY_EXTRUSION_ID("Extrusion");
     return MY_EXTRUSION_ID;
   }
-  /// attribute name of referenced face
-  inline static const std::string& FACE_ID()
-  {
-    static const std::string MY_FACE_ID("extrusion_face");
-    return MY_FACE_ID;
-  }
   /// attribute name of references sketch entities list, it should contain a sketch result or
   /// a pair a sketch result to sketch face
   inline static const std::string& LIST_ID()
   {
-    static const std::string MY_GROUP_LIST_ID("group_list");
+    static const std::string MY_GROUP_LIST_ID("base");
     return MY_GROUP_LIST_ID;
   }
 
+  /// attribute name of an object to which the extrusion grows
+  inline static const std::string& AXIS_OBJECT_ID()
+  {
+    static const std::string MY_TO_OBJECT_ID("axis_object");
+    return MY_TO_OBJECT_ID;
+  }
+
+  /// attribute name for creation method
+  inline static const std::string& CREATION_METHOD()
+  {
+    static const std::string METHOD_ATTR("CreationMethod");
+    return METHOD_ATTR;
+  }
+
+  /// attribute name of extrusion size
+  inline static const std::string& TO_SIZE_ID()
+  {
+    static const std::string MY_TO_SIZE_ID("to_size");
+    return MY_TO_SIZE_ID;
+  }
+
   /// attribute name of extrusion size
-  inline static const std::string& SIZE_ID()
+  inline static const std::string& FROM_SIZE_ID()
+  {
+    static const std::string MY_FROM_SIZE_ID("from_size");
+    return MY_FROM_SIZE_ID;
+  }
+
+  /// attribute name of an object to which the extrusion grows
+  inline static const std::string& TO_OBJECT_ID()
+  {
+    static const std::string MY_TO_OBJECT_ID("to_object");
+    return MY_TO_OBJECT_ID;
+  }
+
+  /// attribute name of extrusion offset
+  inline static const std::string& TO_OFFSET_ID()
+  {
+    static const std::string MY_TO_OFFSET_ID("to_offset");
+    return MY_TO_OFFSET_ID;
+  }
+
+  /// attribute name of tool object
+  inline static const std::string& FROM_OBJECT_ID()
   {
-    static const std::string MY_SIZE_ID("extrusion_size");
-    return MY_SIZE_ID;
+    static const std::string MY_FROM_OBJECT_ID("from_object");
+    return MY_FROM_OBJECT_ID;
   }
-  /// attribute name of reverse direction
-  inline static const std::string& REVERSE_ID()
+
+  /// attribute name of extrusion offset
+  inline static const std::string& FROM_OFFSET_ID()
   {
-    static const std::string MY_REVERSE_ID("extrusion_reverse");
-    return MY_REVERSE_ID;
+    static const std::string MY_FROM_OFFSET_ID("from_offset");
+    return MY_FROM_OFFSET_ID;
   }
 
   /// Returns the kind of a feature
@@ -74,12 +113,9 @@ class FeaturesPlugin_Extrusion : public ModelAPI_Feature
   FeaturesPlugin_Extrusion();
 private:
   /// Load Naming data structure of the feature to the document
-  void LoadNamingDS(GeomAlgoAPI_Extrusion& theFeature, std::shared_ptr<ModelAPI_ResultBody> theResultBody,
-	                std::shared_ptr<GeomAPI_Shape> theBasis,
-	                std::shared_ptr<GeomAPI_Shape> theContext);
-
-  /// Set an empty shape to the result of extrusion
-  void clearResult();
+  void loadNamingDS(GeomAlgoAPI_Prism& thePrismAlgo,
+                    std::shared_ptr<ModelAPI_ResultBody> theResultBody,
+                    std::shared_ptr<GeomAPI_Shape> theBasis);
 };
 
 #endif