Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py
index 97efc776efc267db9f10bed4a468482f806111c2..8dfef59caf47208c7a4149aeaa97ec4edc028d63 100755 (executable)
--- a/src/GEOM_SWIG/GEOM_cyl2complementary.py
+++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py
@@ -1,3 +1,22 @@
+#  Copyright (C) 2005  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 #==============================================================================
 #  Info.
 #  Bug (from script, bug)   : cyl2complementary_modified.py, PAL6700
@@ -12,11 +31,12 @@
 import salome
 import geompy
 geomgui = salome.ImportComponentGUI("GEOM") 
-
+import salome_ComponentGUI
 def addToStudy(shape, name):
     i = geompy.addToStudy(shape, name)
     salome.sg.updateObjBrowser(0)
-    geomgui.createAndDisplayGO(i)
+    if not isinstance(geomgui, type(salome_ComponentGUI)):
+        geomgui.createAndDisplayGO(i)
     return i
 
 # Piece