Merge branch 'V9_5_BR'

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

diff --git a/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py
index 8678a9de69b163865d683719e302c496281b042f..b56b6151705f4788a512cb701ccb4271f857ebe5 100644 (file)
--- a/src/GEOM_SWIG/GEOM_ObjectInfo.py
+++ b/src/GEOM_SWIG/GEOM_ObjectInfo.py
@@ -1,10 +1,10 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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
@@ -18,16 +18,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  GEOM GEOM_SWIG : binding of C++ implementation with Python
 #  File   : GEOM_ObjectInfo.py
 #  Author : Michael ZORIN
 #  Module : GEOM
-#  $Header: 
 #
 import salome
-import geompy
-
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New()
 
 # Create several objects
 obj1 = geompy.MakeVertex(0.,0.,0.)
@@ -46,13 +46,13 @@ obj4_entry = geompy.addToStudy(obj4, "Object4")
 obj5_entry = geompy.addToStudy(obj5, "Object5")
 
 # Get information about objects
-hasInfo = geom.hasObjectInfo()
-print "Check if GEOM module provides information about its objects: ", hasInfo
+hasInfo = geompy.hasObjectInfo()
+print("Check if GEOM module provides information about its objects: ", hasInfo)
 if hasInfo == True:
-    print "Information about first  object: ", geom.getObjectInfo(salome.myStudyId, obj1_entry) 
-    print "Information about second object: ", geom.getObjectInfo(salome.myStudyId, obj2_entry)
-    print "Information about third  object: ", geom.getObjectInfo(salome.myStudyId, obj3_entry)
-    print "Information about fourth object: ", geom.getObjectInfo(salome.myStudyId, obj4_entry)
-    print "Information about fifth  object: ", geom.getObjectInfo(salome.myStudyId, obj5_entry)
+    print("Information about first  object: ", geompy.getObjectInfo(obj1_entry))
+    print("Information about second object: ", geompy.getObjectInfo(obj2_entry))
+    print("Information about third  object: ", geompy.getObjectInfo(obj3_entry))
+    print("Information about fourth object: ", geompy.getObjectInfo(obj4_entry))
+    print("Information about fifth  object: ", geompy.getObjectInfo(obj5_entry))
 
-salome.sg.updateObjBrowser(1)
+salome.sg.updateObjBrowser()