X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_Types.hxx;h=272db63b857586f1796a9041f2879d905fd16d72;hb=ed87a1f7c81ec39992aff1f463d73dc81e5791e0;hp=b00671937b6d60b83dc092e4d51177d9d801cc05;hpb=af323ccd1d47fe27b941822a729014c33859acfe;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx
old mode 100755
new mode 100644
index b00671937..272db63b8
--- a/src/GEOMImpl/GEOMImpl_Types.hxx
+++ b/src/GEOMImpl/GEOMImpl_Types.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,6 +20,10 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+#ifndef GEOMImpl_Types_HXX
+#define GEOMImpl_Types_HXX
+
+#include <TopAbs_ShapeEnum.hxx>
 
 // GEOM_Object types
 
@@ -50,8 +54,6 @@
 #define GEOM_CIRC_ARC 19
 
 #define GEOM_FILLET    20
-#define GEOM_FILLET_2D 45
-#define GEOM_FILLET_1D 46
 #define GEOM_CHAMFER   21
 
 #define GEOM_EDGE  22
@@ -105,13 +107,23 @@
 
 #define GEOM_THICKENING 49
 
+#define GEOM_FILLET_2D 50
+#define GEOM_FILLET_1D 51
+
+#define GEOM_FIELD      52  // == GEOM_FIELD_OBJTYPE constant
+#define GEOM_FIELD_STEP 53  // == GEOM_FIELD_STEP_OBJTYPE constant
+
+#define GEOM_ISOLINE   55
+
+#define GEOM_POLYLINE2D 56
+
 //GEOM_Function types
 
 #define COPY_WITH_REF    1
 #define COPY_WITHOUT_REF 2
 
-#define EXPORT_SHAPE 1
 #define IMPORT_SHAPE 1
+#define EXPORT_SHAPE 2
 
 #define POINT_XYZ                1
 #define POINT_XYZ_REF            2
@@ -170,7 +182,8 @@
 #define OFFSET_THICKENING 3
 #define OFFSET_THICKENING_COPY 4
 
-#define PROJECTION_COPY 1
+#define PROJECTION_COPY    1
+#define PROJECTION_ON_WIRE 2
 
 #define SCALE_SHAPE      1
 #define SCALE_SHAPE_COPY 2
@@ -196,8 +209,10 @@
 #define DISK_THREE_PNT    2
 #define DISK_R            3
 
-#define CYLINDER_R_H         1
-#define CYLINDER_PNT_VEC_R_H 2
+#define CYLINDER_R_H            1
+#define CYLINDER_PNT_VEC_R_H    2
+#define CYLINDER_R_H_A          3
+#define CYLINDER_PNT_VEC_R_H_A  4
 
 #define CONE_R1_R2_H         1
 #define CONE_PNT_VEC_R1_R2_H 2
@@ -241,7 +256,9 @@
 #define PARTITION_HALF      2
 #define PARTITION_NO_SELF_INTERSECTIONS 3
 
-#define POLYLINE_POINTS 1
+#define POLYLINE_POINTS       1
+#define POLYLINE2D_PLN_COORDS 2
+#define POLYLINE2D_PLN_OBJECT 3
 
 #define SPLINE_BEZIER            1
 #define SPLINE_INTERPOLATION     2
@@ -279,7 +296,7 @@
 #define WIRE_EDGES          1
 #define FACE_WIRE           2
 #define SHELL_FACES         3
-#define SOLID_SHELL         4
+//#define SOLID_SHELL         4
 #define SOLID_SHELLS        5
 #define COMPOUND_SHAPES     6
 #define SUBSHAPE_SORTED     7
@@ -288,6 +305,13 @@
 //#define REVERSE_ORIENTATION 10
 #define EDGE_WIRE           11
 #define EDGE_CURVE_LENGTH   12
+#define SHAPES_ON_SHAPE     13
+#define SHAPE_ISOLINE       14
+#define FACE_FROM_SURFACE   15
+#define EDGE_UV             16
+#define FACE_UV             17
+#define SURFACE_FROM_FACE   18
+#define SOLID_FACES         19
 
 #define ARCHIMEDE_TYPE 1
 
@@ -301,9 +325,13 @@
 #define DIVIDE_EDGE        7
 #define CHANGE_ORIENTATION 8
 #define LIMIT_TOLERANCE    9
-#define FUSE_COLLINEAR_EDGES 10
+#define FUSE_COLLINEAR_EDGES  10
+#define SEWING_NON_MANIFOLD   11
+#define REMOVE_INTERNAL_FACES 12
+#define DIVIDE_EDGE_BY_POINT  13
 
 #define BASIC_FILLING 1
+#define FILLING_ON_CONSTRAINTS 2
 
 #define GLUE_FACES         1
 #define GLUE_FACES_BY_LIST 2
@@ -319,13 +347,12 @@
 // Measures
 #define CDG_MEASURE 1
 #define BND_BOX_MEASURE 2
+#define BND_BOX_MEASURE_PRECISE 3
 #define VECTOR_FACE_NORMALE 4
 #define VERTEX_BY_INDEX 5
 
 #define GROUP_FUNCTION 1
 
-#define SHAPES_ON_SHAPE 1
-
 // Curve constructor type
 #define POINT_CONSTRUCTOR 0
 #define COORD_CONSTRUCTOR 1
@@ -341,23 +368,22 @@
 #define BLOCK_COMPOUND_GLUE       8
 #define BLOCK_REMOVE_EXTRA        9
 #define BLOCK_COMPOUND_IMPROVE    10
+#define BLOCK_UNION_FACES         11
 
 // Marker
 #define MARKER_CS      1
 #define MARKER_SHAPE   2
 #define MARKER_PNT2VEC 3
 
-// Advanced functions (base = 200)
-#define ADVANCED_BASE 200  // NO OPERATION (advanced operations base)
-#define GEOM_TSHAPE 201
-#define GEOM_DIVIDEDDISK 202
-#define GEOM_DIVIDEDCYLINDER 203
-/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/
-// Advanced functions sub-operations codes
-#define TSHAPE_BASIC 1
-#define TSHAPE_CHAMFER 2
-#define TSHAPE_FILLET 3
-#define DIVIDEDDISK_R_RATIO 1
-#define DIVIDEDDISK_R_VECTOR_PNT 2
-#define DIVIDEDCYLINDER_R_H 1
-/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/
+// Advanced functions
+#define USER_TYPE 200     // Base type for GEOM advanced shapes
+#define USER_TYPE_EX 1000 // Base type for GEOM plugins
+
+
+// Plugins specified constants
+#define PLUGIN_NAME "Plugin Name"
+
+// Flat type for TopAbs
+enum { TopAbs_FLAT = TopAbs_SHAPE+1 };
+
+#endif // GEOMImpl_Types_HXX