Merge branch 'master' into V9_3_BR

[modules/geom.git] / src / OBJECT / GEOM_Constants.h

diff --git a/src/OBJECT/GEOM_Constants.h b/src/OBJECT/GEOM_Constants.h
index aee0709b4ab2152cd8bdf147aebf0caf55a53567..e207686a0ae7bdd3cecd60d16fd6b2ca6a4c0914 100644 (file)
--- a/src/OBJECT/GEOM_Constants.h
+++ b/src/OBJECT/GEOM_Constants.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -39,6 +39,8 @@ namespace GEOM
     NbIsos,
     Color,
     EdgesDirection,
+    Vertices,
+    ShowName,
     Deflection,
     PointMarker,
     Material,
@@ -55,7 +57,9 @@ namespace GEOM
     IsosColor,
     OutlineColor,
     Texture,
-    LastProperty = Texture,
+    Dimensions,
+    ShapeAnnotations,
+    LastProperty = ShapeAnnotations,
   };
 
   GEOM_OBJECT_EXPORT double minDeflection();
@@ -64,6 +68,8 @@ namespace GEOM
   GEOM_OBJECT_EXPORT QString subSectionSeparator();
 
   GEOM_OBJECT_EXPORT QString propertyName( Property );
+
+  GEOM_OBJECT_EXPORT int sharedPropertiesId();
 }