From 727d1c36098d4511a0b331b2c5b5b3ddc62b5571 Mon Sep 17 00:00:00 2001 From: abn Date: Fri, 17 Oct 2014 09:52:33 +0200 Subject: [PATCH] Renamed myParavisEngine into myPVServerService --- src/PV_SWIG/no_wrap/pvserver.py | 4 ++-- src/PV_SWIG/no_wrap/pvsimple.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PV_SWIG/no_wrap/pvserver.py b/src/PV_SWIG/no_wrap/pvserver.py index d81bc713..cf65feb5 100644 --- a/src/PV_SWIG/no_wrap/pvserver.py +++ b/src/PV_SWIG/no_wrap/pvserver.py @@ -23,5 +23,5 @@ import PVSERVER_utils ## Initialize PARAVIS interface -myParavisEngine = PVSERVER_utils.getEngine() -myParavis = myParavisEngine +myPVServerService = PVSERVER_utils.getEngine() + diff --git a/src/PV_SWIG/no_wrap/pvsimple.py b/src/PV_SWIG/no_wrap/pvsimple.py index f6a2c0c6..a0cc620e 100644 --- a/src/PV_SWIG/no_wrap/pvsimple.py +++ b/src/PV_SWIG/no_wrap/pvsimple.py @@ -78,11 +78,11 @@ def SalomeConnectToPVServer(): __my_log("Connecting to PVServer ...") server_url = "" try: - isGUIConnected = paravis.myParavisEngine.GetGUIConnected() + isGUIConnected = paravis.myPVServerService.GetGUIConnected() if isGUIConnected and __getFromGUI(): __my_log("Importing pvsimple from GUI and already connected. Won't reconnect.") return - server_url = paravis.myParavisEngine.FindOrStartPVServer(0) + server_url = paravis.myPVServerService.FindOrStartPVServer(0) # Extract host and port from URL: a = server_url.split(':') b = a[1].split('//') @@ -90,7 +90,7 @@ def SalomeConnectToPVServer(): simple.Connect(host, port) __my_log("Connected to %s!" % server_url) if __getFromGUI(): - paravis.myParavisEngine.SetGUIConnected(True) + paravis.myPVServerService.SetGUIConnected(True) except Exception as e: __my_log("*******************************************") __my_log("** Could not connect to a running PVServer!") -- 2.39.2