Implementation of 'GetEntriesToCleanStudy' function to get categorized lists of objects.

[modules/geom.git] / src / GEOM_SWIG / geompy.py

diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
index 13df410632c98f07d198ffeff3cfc81531fd104a..3c632bf8af371362ec25d50ac0f3193add245822 100644 (file)
--- a/src/GEOM_SWIG/geompy.py
+++ b/src/GEOM_SWIG/geompy.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  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
@@ -7,7 +7,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
@@ -25,19 +25,59 @@
 #  File   : geompy.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
-#  $Header$
 #
 import salome
-import geompyDC
+from salome.geom import geomBuilder
 from salome import *
+import GEOM
+from salome.geom.geomBuilder import info, PackData, ReadTexture, EnumToLong
 
-geom = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
-geom.init_geom(salome.myStudy)
+# retrieve GEOM engine in try/except block
+# to avoid problems in some cases, e.g. when generating documentation
+try:
+    # get GEOM engine and initialize GEOM with current study
+    engineGeom = lcc.FindOrLoadComponent( "FactoryServer", "GEOM" )
+    geom = geomBuilder.New(salome.myStudy, engineGeom)
 
-# Export the methods of geompyDC
-for k in dir(geom):
-  if k[0] == '_':continue
-  globals()[k]=getattr(geom,k)
-del k
-from geompyDC import ShapeType, GEOM, kind, info, PackData, ReadTexture, EnumToLong
+    # export the methods of geomBuilder
+    for k in dir( geom ):
+       if k[0] == '_': continue
+       globals()[k] = getattr( geom, k )
+        pass
+    del k
+    ShapeType = geom.ShapeType
+    kind      = geom.kind
+    pass
+except:
+    print "exception in geompy.py"
+    geom = None
+    pass
 
+print """
+===============================================================================
+WARNING:
+Usage of geompy.py is deprecated after SALOME V7.2!
+geompy.py will be removed in a future version!
+TODO:
+The following changes in your scripts are required to avoid this message:
+
+replace
+-------
+
+import geompy
+geompy.init_geom(theStudy)
+
+with
+----
+
+from salome.geom import geomBuilder
+geompy = geomBuilder.New(salome.myStudy)
+
+See also GEOM User's Guide for more details
+
+WARNING:
+The geompy.py module works correctly only in first created study.
+It does not work in second, third, etc studies!
+
+===============================================================================
+"""