From: vsr <vsr@opencascade.com>
Date: Mon, 24 Feb 2014 10:03:09 +0000 (+0400)
Subject: Merge branch 'origin/abn/openfile_fix'
X-Git-Tag: V7_3_1rc1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e4350e9cdbb25c86c1b7caa25182a8c99381ead9;hp=3c433ff061bdb3a284aad4eb8f0c45c65b5966d5;p=modules%2Fparavis.git

Merge branch 'origin/abn/openfile_fix'
---

diff --git a/src/PV_SWIG/VTKWrapping/paravisSM.py b/src/PV_SWIG/VTKWrapping/paravisSM.py
index 8237dfc1..a878681d 100644
--- a/src/PV_SWIG/VTKWrapping/paravisSM.py
+++ b/src/PV_SWIG/VTKWrapping/paravisSM.py
@@ -1893,8 +1893,8 @@ def InitFromGUI():
     Method used to initialize the Python Shell from the ParaView GUI.
     """
     global fromGUI, ActiveConnection
-    if not fromGUI:
-       print "from paraview.simple import *"
+#     if not fromGUI:
+#        print "from paraview.simple import *"
     fromGUI = True
     # ToggleProgressPrinting() ### FIXME COLLABORATION
     enableMultiServer(vtkProcessModule.GetProcessModule().GetMultipleSessionsSupport())
diff --git a/src/PV_SWIG/VTKWrapping/pvsimple.py b/src/PV_SWIG/VTKWrapping/pvsimple.py
index 6a77e5f2..350b573a 100644
--- a/src/PV_SWIG/VTKWrapping/pvsimple.py
+++ b/src/PV_SWIG/VTKWrapping/pvsimple.py
@@ -186,7 +186,9 @@ def OpenDataFile(filename, **extraArgs):
         raise RuntimeError, msg
     prototype = servermanager.ProxyManager().GetPrototypeProxy(
       reader_factor.GetReaderGroup(), reader_factor.GetReaderName())
-    xml_name = paraview.make_name_valid(prototype.GetXMLLabel())
+    # [ABN]: bug fix for Christian VW (temporary - pvsimple should disappear soon) 
+    from paraview import make_name_valid  # make_name_valid is not in paravisSM
+    xml_name = make_name_valid(prototype.GetXMLLabel())
     reader_func = _create_func(xml_name, servermanager.sources)
     if prototype.GetProperty("FileNames"):
       reader = reader_func(FileNames=filename, **extraArgs)