-// 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
// 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
#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
#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_EXPORTXAO 54
+
+#define GEOM_ISOLINE 55
+
//GEOM_Function types
#define COPY_WITH_REF 1
#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
#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
//#define REVERSE_ORIENTATION 10
#define EDGE_WIRE 11
#define EDGE_CURVE_LENGTH 12
+#define SHAPES_ON_SHAPE 13
+#define SHAPE_ISOLINE 14
+
#define ARCHIMEDE_TYPE 1
#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 BASIC_FILLING 1
#define GROUP_FUNCTION 1
-#define SHAPES_ON_SHAPE 1
-
// Curve constructor type
#define POINT_CONSTRUCTOR 0
#define COORD_CONSTRUCTOR 1
#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
+// import/export XAO
+#define IMPORTEXPORT_EXPORTXAO 1
+#define IMPORTEXPORT_IMPORTXAO 2
+
// 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 @@*/
