fix some warnings at doc generation

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

diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
index f715dc8a469302d2c5fc85c894fbf202e7aa2c7b..0f0033d3c22004e701872011d1dfea22a0e9bbf5 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-2013  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
@@ -25,28 +25,55 @@
 #  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
 
 # retrieve GEOM engine in try/except block
 # to avoid problems in some cases, e.g. when generating documentation
 try:
-    # get GEOM engine
-    geom = lcc.FindOrLoadComponent( "FactoryServer", "GEOM" )
-    # initialize GEOM with current study
-    geom.init_geom( salome.myStudy )
+    # 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
+    # export the methods of geomBuilder
     for k in dir( geom ):
        if k[0] == '_': continue
        globals()[k] = getattr( geom, k )
         pass
     del k
-    from geompyDC import ShapeType, GEOM, kind, info, PackData, ReadTexture, EnumToLong
+    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
+
+===============================================================================
+"""