Porting ParaVis presentations to ParaView-5.0.0 : set correct value of the Lock(Data...

[modules/paravis.git] / src / Macro / ShowSalomeObject.py

diff --git a/src/Macro/ShowSalomeObject.py b/src/Macro/ShowSalomeObject.py
index ba5433e7b32c4598df033f962ed3bf952a5052ee..42b0e04735b634b2b66c8d39056aeb3bb6f39e63 100644 (file)
--- a/src/Macro/ShowSalomeObject.py
+++ b/src/Macro/ShowSalomeObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2014-2015  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 ###
 # Macro to show SALOME object in ParaView viewer.
 # 
@@ -39,13 +40,13 @@ from pvsimple import *
 selection = session.getSelection()
 
 for entry in selection:
-    obj = salome.myStudy.FindObjectID(entry).GetObject()
+    sobj = salome.myStudy.FindObjectID(entry)
     try:
         import GEOM
-        go = obj._narrow(GEOM.GEOM_Object)
+        from salome.geom import geomBuilder
+        geompy = geomBuilder.New(salome.myStudy)
+        go = sobj.GetObject()._narrow(GEOM.GEOM_Object)
         if go:
-            from salome.geom import geomBuilder
-            geompy = geomBuilder.New(salome.myStudy)
             tmpf = tempfile.NamedTemporaryFile(suffix='.vtk')
             fname = tmpf.name
             tmpf.close()
@@ -62,10 +63,10 @@ for entry in selection:
         pass
     try: 
         import SMESH
-        mo = obj._narrow(SMESH.SMESH_Mesh)
+        from salome.smesh import smeshBuilder
+        mesh = smeshBuilder.New(salome.myStudy)
+        mo = sobj.GetObject()._narrow(SMESH.SMESH_Mesh)
         if mo:
-            from salome.smesh import smeshBuilder
-            mesh = smeshBuilder.New(salome.myStudy)
             tmpf = tempfile.NamedTemporaryFile(suffix='.med')
             fname = tmpf.name
             tmpf.close()
@@ -81,6 +82,3 @@ for entry in selection:
         # not mesh object
         pass
     pass
-
-    
-