X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2FConstructionPlugin_Point.h;h=439805742a9959d329c71ed480c24d822bbc1051;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=4be62ccde80539d8e505d540bd8aea1d6b89765b;hpb=3f02f2a44e42c854cb2b64c9817436e5a27788ab;p=modules%2Fshaper.git

diff --git a/src/ConstructionPlugin/ConstructionPlugin_Point.h b/src/ConstructionPlugin/ConstructionPlugin_Point.h
index 4be62ccde..439805742 100644
--- a/src/ConstructionPlugin/ConstructionPlugin_Point.h
+++ b/src/ConstructionPlugin/ConstructionPlugin_Point.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef ConstructionPlugin_Point_H_
@@ -69,54 +68,30 @@ public:
   }
 
   /// Attribute name for creation method.
-  inline static const std::string& CREATION_METHOD_BY_PROJECTION_ON_EDGE()
+  inline static const std::string& CREATION_METHOD_BY_PROJECTION()
   {
-    static const std::string MY_CREATION_METHOD_ID("by_projection_on_edge");
+    static const std::string MY_CREATION_METHOD_ID("by_projection");
     return MY_CREATION_METHOD_ID;
   }
 
   /// Attribute name for creation method.
-  inline static const std::string& CREATION_METHOD_BY_PROJECTION_ON_FACE()
+  inline static const std::string& CREATION_METHOD_BY_INTERSECTION()
   {
-    static const std::string MY_CREATION_METHOD_ID("by_projection_on_face");
+    static const std::string MY_CREATION_METHOD_ID("by_intersection");
     return MY_CREATION_METHOD_ID;
   }
 
-  /*
   /// Attribute name for creation method.
-  inline static const std::string& CREATION_METHOD_BY_LINES_INTERSECTION()
+  inline static const std::string& CREATION_METHOD_BY_GEOMETRICAL_PROPERTY()
   {
-    static const std::string MY_CREATION_METHOD_ID("by_lines_intersection");
+    static const std::string MY_CREATION_METHOD_ID("by_geometrical_property");
     return MY_CREATION_METHOD_ID;
   }
-  */
 
-  /// Attribute name for creation method.
-  inline static const std::string& CREATION_METHOD_BY_LINE_AND_PLANE_INTERSECTION()
-  {
-    static const std::string MY_CREATION_METHOD_ID("by_line_and_plane_intersection");
-    return MY_CREATION_METHOD_ID;
-  }
-
-  /// Attribute name for X coordinate.
-  inline static const std::string& X()
+  inline static const std::string& POINT3D()
   {
-    static const std::string POINT_ATTR_X("x");
-    return POINT_ATTR_X;
-  }
-
-  /// Attribute name for Y coordinate.
-  inline static const std::string& Y()
-  {
-    static const std::string POINT_ATTR_Y("y");
-    return POINT_ATTR_Y;
-  }
-
-  /// Attribute name for Z coordinate.
-  inline static const std::string& Z()
-  {
-    static const std::string POINT_ATTR_Z("z");
-    return POINT_ATTR_Z;
+    static const std::string POINT_ATTR("point3d");
+    return POINT_ATTR;
   }
 
   /// Attribute name for selected edge.
@@ -168,24 +143,38 @@ public:
     return ATTR_ID;
   }
 
-  /// Attribute name for point to project on edge.
-  inline static const std::string& POINT_TO_PROJECT_ON_EDGE()
+  /// Attribute name for point to projection.
+  inline static const std::string& POINT_TO_PROJECT()
   {
-    static const std::string ATTR_ID("point_to_project_on_edge");
+    static const std::string ATTR_ID("point_to_project");
     return ATTR_ID;
   }
 
-  /// Attribute name for edge for point projection.
-  inline static const std::string& EDGE_FOR_POINT_PROJECTION()
+  /// Attribute name for projection type.
+  inline static const std::string& PROJECTION_TYPE()
   {
-    static const std::string ATTR_ID("edge_for_point_projection");
+    static const std::string ATTR_ID("projection_type");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for projection type on edge.
+  inline static const std::string& PROJECTION_TYPE_ON_EDGE()
+  {
+    static const std::string ATTR_ID("projection_type_on_edge");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for projection type on face.
+  inline static const std::string& PROJECTION_TYPE_ON_FACE()
+  {
+    static const std::string ATTR_ID("projection_type_on_face");
     return ATTR_ID;
   }
 
-  /// Attribute name for point to project on surface.
-  inline static const std::string& POINT_TO_PROJECT_ON_FACE()
+  /// Attribute name for edge for point projection.
+  inline static const std::string& EDGE_FOR_POINT_PROJECTION()
   {
-    static const std::string ATTR_ID("point_to_project_on_face");
+    static const std::string ATTR_ID("edge_for_point_projection");
     return ATTR_ID;
   }
 
@@ -196,21 +185,47 @@ public:
     return ATTR_ID;
   }
 
-  /*
-  /// Attribute name for selected first line.
-  inline static const std::string& FIRST_LINE()
+  /// Attribute name for intersection type.
+  inline static const std::string& INTERSECTION_TYPE()
+  {
+    static const std::string ATTR_ID("intersection_type");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for intersection type by lines.
+  inline static const std::string& INTERSECTION_TYPE_BY_LINES()
+  {
+    static const std::string MY_CREATION_METHOD_ID("intersection_type_by_lines");
+    return MY_CREATION_METHOD_ID;
+  }
+
+  /// Attribute name for intersection type by line and plane.
+  inline static const std::string& INTERSECTION_TYPE_BY_LINE_AND_PLANE()
+  {
+    static const std::string MY_CREATION_METHOD_ID("intersection_type_by_line_and_plane");
+    return MY_CREATION_METHOD_ID;
+  }
+
+  /// Attribute name for intersection type by planes.
+  inline static const std::string& INTERSECTION_TYPE_BY_PLANES()
+  {
+    static const std::string MY_CREATION_METHOD_ID("intersection_type_by_planes");
+    return MY_CREATION_METHOD_ID;
+  }
+
+  /// Attribute name for selected first intersection line.
+  inline static const std::string& INTERSECTION_LINE_1()
   {
-    static const std::string ATTR_ID("first_line");
+    static const std::string ATTR_ID("intersection_line_1");
     return ATTR_ID;
   }
 
-  /// Attribute name for selected second line.
-  inline static const std::string& SECOND_LINE()
+  /// Attribute name for selected second intersection line.
+  inline static const std::string& INTERSECTION_LINE_2()
   {
-    static const std::string ATTR_ID("second_line");
+    static const std::string ATTR_ID("intersection_line_2");
     return ATTR_ID;
   }
-  */
 
   /// Attribute name for selected intersection line.
   inline static const std::string& INTERSECTION_LINE()
@@ -247,15 +262,68 @@ public:
     return ATTR_ID;
   }
 
+  /// Attribute name for selected intersection plane.
+  inline static const std::string& INTERSECTION_PLANE_1()
+  {
+    static const std::string ATTR_ID("intersection_plane_1");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for selected intersection plane.
+  inline static const std::string& INTERSECTION_PLANE_2()
+  {
+    static const std::string ATTR_ID("intersection_plane_2");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for selected intersection plane.
+  inline static const std::string& INTERSECTION_PLANE_3()
+  {
+    static const std::string ATTR_ID("intersection_plane_3");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for property type.
+  inline static const std::string& GEOMETRICAL_PROPERTY_TYPE()
+  {
+    static const std::string ATTR_ID("geometrical_property_type");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for property type by center of gravity.
+  inline static const std::string& GEOMETRICAL_PROPERTY_TYPE_BY_CENTER_OF_GRAVITY()
+  {
+    static const std::string PROPERTY_TYPE("geometrical_property_type_by_center_of_gravity");
+    return PROPERTY_TYPE;
+  }
+
+  /// Attribute name for property type by center of circle.
+  inline static const std::string& GEOMETRICAL_PROPERTY_TYPE_BY_CENTER_OF_CIRCLE()
+  {
+    static const std::string PROPERTY_TYPE("geometrical_property_type_by_center_of_circle");
+    return PROPERTY_TYPE;
+  }
+
+  /// Attribute name for selected object for center of gravity.
+  inline static const std::string& OBJECT_FOR_CENTER_OF_GRAVITY()
+  {
+    static const std::string ATTR_ID("object_for_center_of_gravity");
+    return ATTR_ID;
+  }
+
+  /// Attribute name for selected object for center of cricle.
+  inline static const std::string& OBJECT_FOR_CENTER_OF_CIRCLE()
+  {
+    static const std::string ATTR_ID("object_for_center_of_circle");
+    return ATTR_ID;
+  }
+
   /// Creates a new part document if needed.
   CONSTRUCTIONPLUGIN_EXPORT virtual void execute();
 
   /// Request for initialization of data model of the feature: adding all attributes.
   CONSTRUCTIONPLUGIN_EXPORT virtual void initAttributes();
 
-  /// Construction result is allways recomuted on the fly.
-  CONSTRUCTIONPLUGIN_EXPORT virtual bool isPersistentResult() {return false;}
-
   /// Use plugin manager for features creation
   ConstructionPlugin_Point();
 
@@ -268,9 +336,11 @@ private:
   std::shared_ptr<GeomAPI_Vertex> createByDistanceOnEdge();
   std::shared_ptr<GeomAPI_Vertex> createByProjectionOnEdge();
   std::shared_ptr<GeomAPI_Vertex> createByProjectionOnFace();
-  /*std::shared_ptr<GeomAPI_Vertex> createByLinesIntersection();*/
+  std::shared_ptr<GeomAPI_Vertex> createByLinesIntersection();
   std::list<std::shared_ptr<GeomAPI_Vertex> > createByLineAndPlaneIntersection();
-
+  std::shared_ptr<GeomAPI_Vertex> createByPlanesIntersection();
+  std::shared_ptr<GeomAPI_Vertex> createByCenterOfGravity();
+  std::shared_ptr<GeomAPI_Vertex> createByCenterOfCircle();
 };
 
 #endif