From 09c34352cd5ad238ba0f7c1296357d7889c4c47d Mon Sep 17 00:00:00 2001 From: abn Date: Thu, 16 Oct 2014 13:31:21 +0200 Subject: [PATCH] Preparing move of the engine code into GUI (and restoring trace) --- CMakeLists.txt | 2 +- idl/CMakeLists.txt | 6 +- .../{PARAVIS_Gen.idl => PVSERVER_Gen.idl} | 8 +- resources/PARAVISCatalog.xml.in | 6 +- src/ENGINE/CMakeLists.txt | 6 +- .../no_wrap/{PARAVIS.py.in => PVSERVER.py.in} | 40 +++---- .../{PARAVIS_utils.py => PVSERVER_utils.py} | 20 ++-- src/PVGUI/CMakeLists.txt | 2 +- src/PVGUI/PVGUI_Module.cxx | 104 ++++++++++-------- src/PVGUI/PVGUI_Module.h | 9 +- src/PV_SWIG/CMakeLists.txt | 2 +- .../no_wrap/{paravis.py => pvserver.py} | 4 +- src/PV_SWIG/no_wrap/pvsimple.py | 2 +- 13 files changed, 111 insertions(+), 100 deletions(-) rename idl/no_wrap/{PARAVIS_Gen.idl => PVSERVER_Gen.idl} (94%) rename src/ENGINE/no_wrap/{PARAVIS.py.in => PVSERVER.py.in} (88%) rename src/ENGINE/no_wrap/{PARAVIS_utils.py => PVSERVER_utils.py} (93%) rename src/PV_SWIG/no_wrap/{paravis.py => pvserver.py} (93%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52680155..2744f38d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,7 @@ INCLUDE(CMakePackageConfigHelpers) # List of targets in this project we want to make visible to the rest of the world. # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" IF(NOT SALOME_LIGHT_ONLY) - SET(_${PROJECT_NAME}_exposed_targets SalomeIDLPARAVIS PARAVIS) + SET(_${PROJECT_NAME}_exposed_targets SalomeIDLPVServer PARAVIS) # Add all targets to the build-tree export set EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 7300916e..3b40cefb 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -45,7 +45,7 @@ IF(NOT SALOME_PARAVIS_MINIMAL_CORBA) ) ELSE() SET(SalomeIDLPARAVIS_IDLSOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/no_wrap/PARAVIS_Gen.idl + ${CMAKE_CURRENT_SOURCE_DIR}/no_wrap/PVSERVER_Gen.idl ) SET(_idl_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/no_wrap @@ -59,5 +59,5 @@ SET(_idl_link_flags ${KERNEL_SalomeIDLKernel} ) -OMNIORB_ADD_MODULE(SalomeIDLPARAVIS "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") -INSTALL(TARGETS SalomeIDLPARAVIS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) +OMNIORB_ADD_MODULE(SalomeIDLPVServer "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLPVServer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/no_wrap/PARAVIS_Gen.idl b/idl/no_wrap/PVSERVER_Gen.idl similarity index 94% rename from idl/no_wrap/PARAVIS_Gen.idl rename to idl/no_wrap/PVSERVER_Gen.idl index e3e5ffb1..d8550aa5 100644 --- a/idl/no_wrap/PARAVIS_Gen.idl +++ b/idl/no_wrap/PVSERVER_Gen.idl @@ -19,8 +19,8 @@ // Author : Adrien Bruneton (CEA) -#ifndef __PARAVIS_GEN__ -#define __PARAVIS_GEN__ +#ifndef __PVSERVER_GEN__ +#define __PVSERVER_GEN__ #include "SALOME_Exception.idl" #include "SALOME_Component.idl" @@ -30,13 +30,13 @@ /*! The main package of interfaces of the module %PARAVIS. */ -module PARAVIS_ORB { +module PVSERVER_ORB { /*! * \brief The main interface class for PARAVIS server. * Instantiation of this class has to be done before access to any other PARAVIS interfaces */ - interface PARAVIS_Gen : Engines::EngineComponent, SALOMEDS::Driver + interface PVSERVER_Gen : Engines::EngineComponent, SALOMEDS::Driver { /*! diff --git a/resources/PARAVISCatalog.xml.in b/resources/PARAVISCatalog.xml.in index 0652474d..58e28313 100644 --- a/resources/PARAVISCatalog.xml.in +++ b/resources/PARAVISCatalog.xml.in @@ -26,18 +26,18 @@ - PARAVIS + PVSERVER ParaView PARAVIS vsv @SALOMEPARAVIS_VERSION@ - ParaView module + PVServer control service 1 1 pqAppIcon22.png - PARAVIS_Gen + PVSERVER_Gen unknown diff --git a/src/ENGINE/CMakeLists.txt b/src/ENGINE/CMakeLists.txt index d851edfb..47dba95a 100644 --- a/src/ENGINE/CMakeLists.txt +++ b/src/ENGINE/CMakeLists.txt @@ -36,10 +36,10 @@ IF(NOT SALOME_PARAVIS_MINIMAL_CORBA) INSTALL(FILES PARAVIS_Engine_i.hh DESTINATION ${SALOME_INSTALL_HEADERS}) ELSE() - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/no_wrap/PARAVIS.py.in ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS.py @ONLY) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/no_wrap/PVSERVER.py.in ${CMAKE_CURRENT_BINARY_DIR}/PVSERVER.py @ONLY) SET(_bin_SCRIPTS - ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS.py - no_wrap/PARAVIS_utils.py + ${CMAKE_CURRENT_BINARY_DIR}/PVSERVER.py + no_wrap/PVSERVER_utils.py ) # --- rules --- diff --git a/src/ENGINE/no_wrap/PARAVIS.py.in b/src/ENGINE/no_wrap/PVSERVER.py.in similarity index 88% rename from src/ENGINE/no_wrap/PARAVIS.py.in rename to src/ENGINE/no_wrap/PVSERVER.py.in index 5a7692c7..085c2d3a 100644 --- a/src/ENGINE/no_wrap/PARAVIS.py.in +++ b/src/ENGINE/no_wrap/PVSERVER.py.in @@ -22,12 +22,12 @@ # Author : Adrien Bruneton (CEA) # -import PARAVIS_ORB__POA +import PVSERVER_ORB__POA import SALOME_ComponentPy import SALOME_DriverPy import SALOMEDS import SALOME -import PARAVIS_utils +import PVSERVER_utils import subprocess as subp import socket from time import sleep @@ -38,7 +38,7 @@ def MESSAGE(m): pass #os.system("echo \"%s\" >> /tmp/paravis_log.txt" % m) -class PARAVIS_Impl: +class PVSERVER_Impl: """ The core implementation (non CORBA, or Study related). See the IDL for the documentation. """ @@ -69,11 +69,11 @@ class PARAVIS_Impl: currPort += 1 pass raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.INTERNAL_ERROR, - "[PARAVIS] maximum number of tries to retrieve a free port for the PVServer", - "PARAVIS.py", 0)) + "[PVSERVER] maximum number of tries to retrieve a free port for the PVServer", + "PVSERVER.py", 0)) def FindOrStartPVServer( self, port ): - MESSAGE("[PARAVIS] FindOrStartPVServer ...") + MESSAGE("[PVSERVER] FindOrStartPVServer ...") host = "localhost" alive = True if self.pvserverPop is None: @@ -100,23 +100,23 @@ class PARAVIS_Impl: if self.pvserverPop.returncode is None: success = True self.pvserverPort = port - MESSAGE("[PARAVIS] pvserver successfully launched on port %d" % port) + MESSAGE("[PVSERVER] pvserver successfully launched on port %d" % port) else: raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.INTERNAL_ERROR, - "[PARAVIS] Unable to start PVServer on port %d!" % port, - "PARAVIS.py", 0)) + "[PVSERVER] Unable to start PVServer on port %d!" % port, + "PVSERVER.py", 0)) return "cs://%s:%d" % (host, self.pvserverPort) def StopPVServer( self ): - MESSAGE("[PARAVIS] Trying to stop PVServer (sending KILL) ...") + MESSAGE("[PVSERVER] Trying to stop PVServer (sending KILL) ...") if not self.pvserverPop is None: self.pvserverPop.poll() if self.pvserverPop.returncode is None: # Terminate if still running: self.pvserverPop.terminate() - MESSAGE("[PARAVIS] KILL signal sent.") + MESSAGE("[PVSERVER] KILL signal sent.") return True - MESSAGE("[PARAVIS] Nothing to kill.") + MESSAGE("[PVSERVER] Nothing to kill.") return False def PutPythonTraceStringToEngine( self, t ): @@ -131,13 +131,13 @@ class PARAVIS_Impl: def GetGUIConnected( self ): return self.isGUIConnected -class PARAVIS(PARAVIS_ORB__POA.PARAVIS_Gen, +class PVSERVER(PVSERVER_ORB__POA.PVSERVER_Gen, SALOME_ComponentPy.SALOME_ComponentPy_i, SALOME_DriverPy.SALOME_DriverPy_i, - PARAVIS_Impl): + PVSERVER_Impl): """ - Construct an instance of PARAVIS module engine. - The class PARAVIS implements CORBA interface PARAVIS_Gen (see PARAVIS_Gen.idl). + Construct an instance of PVSERVER module engine. + The class PVSERVER implements CORBA interface PVSERVER_Gen (see PVSERVER_Gen.idl). It is inherited from the classes SALOME_ComponentPy_i (implementation of Engines::EngineComponent CORBA interface - SALOME component) and SALOME_DriverPy_i (implementation of SALOMEDS::Driver CORBA interface - SALOME module's engine). @@ -147,7 +147,7 @@ class PARAVIS(PARAVIS_ORB__POA.PARAVIS_Gen, SALOME_ComponentPy.SALOME_ComponentPy_i.__init__(self, orb, poa, contID, containerName, instanceName, interfaceName, 0) SALOME_DriverPy.SALOME_DriverPy_i.__init__(self, interfaceName) - PARAVIS_Impl.__init__(self) + PVSERVER_Impl.__init__(self) # self._naming_service = SALOME_ComponentPy.SALOME_NamingServicePy_i( self._orb ) # @@ -165,10 +165,10 @@ class PARAVIS(PARAVIS_ORB__POA.PARAVIS_Gen, """ def getVersion( self ): import salome_version - return salome_version.getVersion("PARAVIS", True) + return salome_version.getVersion("PVSERVER", True) def GetIOR(self): - return PARAVIS_utils.getEngineIOR() + return PVSERVER_utils.getEngineIOR() """ Create object. @@ -182,7 +182,7 @@ class PARAVIS(PARAVIS_ORB__POA.PARAVIS_Gen, attr = builder.FindOrCreateAttribute( object, "AttributeName" ) attr.SetValue( name ) attr = builder.FindOrCreateAttribute( object, "AttributeLocalID" ) - attr.SetValue( PARAVIS_utils.objectID() ) + attr.SetValue( PVSERVER_utils.objectID() ) pass """ diff --git a/src/ENGINE/no_wrap/PARAVIS_utils.py b/src/ENGINE/no_wrap/PVSERVER_utils.py similarity index 93% rename from src/ENGINE/no_wrap/PARAVIS_utils.py rename to src/ENGINE/no_wrap/PVSERVER_utils.py index 5a6d122e..aa6f8c0d 100644 --- a/src/ENGINE/no_wrap/PARAVIS_utils.py +++ b/src/ENGINE/no_wrap/PVSERVER_utils.py @@ -18,7 +18,7 @@ # # --- -# File : PARAVIS_utils.py +# File : PVSERVER_utils.py # Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) # --- # @@ -44,18 +44,18 @@ from SALOME_NamingServicePy import SALOME_NamingServicePy_i from LifeCycleCORBA import LifeCycleCORBA import SALOMEDS import SALOMEDS_Attributes_idl -import PARAVIS_ORB +import PVSERVER_ORB import os ### -# Get PARAVIS module's ID +# Get PVSERVER module's ID ### def moduleID(): MODULE_ID = 1000 return MODULE_ID ### -# Get PARAVIS object's ID +# Get PVSERVER object's ID ### def objectID(): OBJECT_ID = 1010 @@ -69,16 +69,16 @@ def unknownID(): return FOREIGN_ID ### -# Get PARAVIS module's name +# Get PVSERVER module's name ### def moduleName(): - return "PARAVIS" + return "PVSERVER" ### # Get module's pixmap name ### def modulePixmap(): - return "PARAVIS_small.png" + return "PVSERVER_small.png" ### # Get verbose level @@ -141,7 +141,7 @@ def getStudyManager(): return __study_manager__ ### -# Get PARAVIS engine +# Get PVSERVER engine ### __engine__ = None def getEngine(): @@ -152,7 +152,7 @@ def getEngine(): return __engine__ ### -# Get PARAVIS engine IOR +# Get PVSERVER engine IOR ### def getEngineIOR(): IOR = "" @@ -162,7 +162,7 @@ def getEngineIOR(): return IOR ### -# Find or create PARAVIS component object in a study +# Find or create PVSERVER component object in a study ### def findOrCreateComponent( study ): father = study.FindComponent( moduleName() ) diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt index 4f387fee..21921142 100644 --- a/src/PVGUI/CMakeLists.txt +++ b/src/PVGUI/CMakeLists.txt @@ -57,7 +57,7 @@ SET(_link_LIBRARIES ${MED_SalomeIDLMED} ${_PARAVIEW_APP_COMPO_LIB} ${GUI_PVViewer} - SalomeIDLPARAVIS + SalomeIDLPVServer ) # --- headers --- diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index ccf2167f..c8c1f421 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -29,9 +29,9 @@ #include // Python first #include "PVGUI_Module.h" -#ifdef PARAVIS_WITH_FULL_CORBA -# include "PARAVIS_Gen_i.hh" -#endif +//#ifdef PARAVIS_WITH_FULL_CORBA +//# include "PARAVIS_Gen_i.hh" +//#endif #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) #include CORBA_SERVER_HEADER(SALOMEDS) @@ -141,10 +141,11 @@ //---------------------------------------------------------------------------- PVGUI_Module* ParavisModule = 0; -PARAVIS_ORB::PARAVIS_Gen_var PVGUI_Module::MyEngine; +PVSERVER_ORB::PVSERVER_Gen_var PVGUI_Module::MyEngine; /*! \mainpage + TODO TODO update this:

Building and installing PARAVIS

As any other SALOME module, PARAVIS requires PARAVIS_ROOT_DIR environment variable to be set to PARAVIS @@ -210,45 +211,45 @@ PARAVIS_ORB::PARAVIS_Gen_var PVGUI_Module::MyEngine; SALOME module wrapping ParaView GUI. */ -//_PTR(SComponent) -//ClientFindOrCreateParavisComponent(_PTR(Study) theStudyDocument) -//{ -// _PTR(SComponent) aSComponent = theStudyDocument->FindComponent("PARAVIS"); -// if (!aSComponent) { -// _PTR(StudyBuilder) aStudyBuilder = theStudyDocument->NewBuilder(); -// aStudyBuilder->NewCommand(); -// int aLocked = theStudyDocument->GetProperties()->IsLocked(); -// if (aLocked) theStudyDocument->GetProperties()->SetLocked(false); -// aSComponent = aStudyBuilder->NewComponent("PARAVIS"); -// _PTR(GenericAttribute) anAttr = -// aStudyBuilder->FindOrCreateAttribute(aSComponent, "AttributeName"); -// _PTR(AttributeName) aName (anAttr); -// -// ORB_INIT& init = *SINGLETON_::Instance(); -// CORBA::ORB_var anORB = init( qApp->argc(), qApp->argv() ); -// -// SALOME_NamingService *NamingService = new SALOME_NamingService( anORB ); -// CORBA::Object_var objVarN = NamingService->Resolve("/Kernel/ModulCatalog"); -// SALOME_ModuleCatalog::ModuleCatalog_var Catalogue = -// SALOME_ModuleCatalog::ModuleCatalog::_narrow(objVarN); -// SALOME_ModuleCatalog::Acomponent_var Comp = Catalogue->GetComponent( "PARAVIS" ); -// if (!Comp->_is_nil()) { -// aName->SetValue(Comp->componentusername()); -// } -// -// anAttr = aStudyBuilder->FindOrCreateAttribute(aSComponent, "AttributePixMap"); -// _PTR(AttributePixMap) aPixmap (anAttr); -// aPixmap->SetPixMap( "pqAppIcon16.png" ); -// -// // Create Attribute parameters for future using -// anAttr = aStudyBuilder->FindOrCreateAttribute(aSComponent, "AttributeParameter"); -// -// aStudyBuilder->DefineComponentInstance(aSComponent, PVGUI_Module::GetCPPEngine()->GetIOR()); -// if (aLocked) theStudyDocument->GetProperties()->SetLocked(true); -// aStudyBuilder->CommitCommand(); -// } -// return aSComponent; -//} +_PTR(SComponent) +ClientFindOrCreateParavisComponent(_PTR(Study) theStudyDocument) +{ + _PTR(SComponent) aSComponent = theStudyDocument->FindComponent("PVSERVER"); + if (!aSComponent) { + _PTR(StudyBuilder) aStudyBuilder = theStudyDocument->NewBuilder(); + aStudyBuilder->NewCommand(); + int aLocked = theStudyDocument->GetProperties()->IsLocked(); + if (aLocked) theStudyDocument->GetProperties()->SetLocked(false); + aSComponent = aStudyBuilder->NewComponent("PVSERVER"); + _PTR(GenericAttribute) anAttr = + aStudyBuilder->FindOrCreateAttribute(aSComponent, "AttributeName"); + _PTR(AttributeName) aName (anAttr); + + ORB_INIT& init = *SINGLETON_::Instance(); + CORBA::ORB_var anORB = init( qApp->argc(), qApp->argv() ); + + SALOME_NamingService *NamingService = new SALOME_NamingService( anORB ); + CORBA::Object_var objVarN = NamingService->Resolve("/Kernel/ModulCatalog"); + SALOME_ModuleCatalog::ModuleCatalog_var Catalogue = + SALOME_ModuleCatalog::ModuleCatalog::_narrow(objVarN); + SALOME_ModuleCatalog::Acomponent_var Comp = Catalogue->GetComponent( "PVSERVER" ); + if (!Comp->_is_nil()) { + aName->SetValue(Comp->componentusername()); + } + + anAttr = aStudyBuilder->FindOrCreateAttribute(aSComponent, "AttributePixMap"); + _PTR(AttributePixMap) aPixmap (anAttr); + aPixmap->SetPixMap( "pqAppIcon16.png" ); + + // Create Attribute parameters for future using + anAttr = aStudyBuilder->FindOrCreateAttribute(aSComponent, "AttributeParameter"); + + aStudyBuilder->DefineComponentInstance(aSComponent, PVGUI_Module::GetCPPEngine()->GetIOR()); + if (aLocked) theStudyDocument->GetProperties()->SetLocked(true); + aStudyBuilder->CommitCommand(); + } + return aSComponent; +} /*! Clean up function; used to stop ParaView progress events when @@ -316,6 +317,16 @@ PVViewer_EngineWrapper * PVGUI_Module::GetEngine() return PVViewer_EngineWrapper::GetInstance(); } +PVSERVER_ORB::PVSERVER_Gen_var PVGUI_Module::GetCPPEngine() +{ + // initialize PARAVIS module engine (load, if necessary) + if ( CORBA::is_nil( MyEngine ) ) { + Engines::EngineComponent_var comp = + SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "PVSERVER" ); + MyEngine = PVSERVER_ORB::PVSERVER_Gen::_narrow( comp ); + } + return MyEngine; +} /*! \brief Create data model. @@ -663,7 +674,7 @@ bool PVGUI_Module::activateModule( SUIT_Study* study ) if ( myRecentMenuId != -1 ) menuMgr()->show(myRecentMenuId); - //ClientFindOrCreateParavisComponent(PARAVIS::GetCStudy(this)); + ClientFindOrCreateParavisComponent(PARAVIS::GetCStudy(this)); return isDone; } @@ -810,9 +821,8 @@ void PVGUI_Module::onModelOpened() */ QString PVGUI_Module::engineIOR() const { -// CORBA::String_var anIOR = GetCPPEngine()->GetIOR(); -// return QString(anIOR.in()); - return QString(""); + CORBA::String_var anIOR = GetCPPEngine()->GetIOR(); + return QString(anIOR.in()); } /*! diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h index b5e93b96..b1a5fabe 100644 --- a/src/PVGUI/PVGUI_Module.h +++ b/src/PVGUI/PVGUI_Module.h @@ -27,9 +27,8 @@ #define PVGUI_Module_H #include -#include "SALOMEconfig.h" -#include CORBA_SERVER_HEADER(SALOMEDS) -#include CORBA_SERVER_HEADER(PARAVIS_Gen) +#include +#include CORBA_SERVER_HEADER(PVSERVER_Gen) #include #include @@ -166,6 +165,7 @@ public: virtual void contextMenuPopup(const QString& theClient, QMenu* theMenu, QString& theTitle); inline static PVViewer_EngineWrapper * GetEngine(); + inline static PVSERVER_ORB::PVSERVER_Gen_var GetCPPEngine(); // to be removed once light! inline static pqPVApplicationCore * GetPVApplication(); virtual CAM_DataModel* createDataModel(); @@ -299,7 +299,8 @@ private: PVViewer_GUIElements * myGuiElements; - static PARAVIS_ORB::PARAVIS_Gen_var MyEngine; + static PVSERVER_ORB::PVSERVER_Gen_var MyEngine; + }; #endif // PVGUI_Module_H diff --git a/src/PV_SWIG/CMakeLists.txt b/src/PV_SWIG/CMakeLists.txt index da9f7cb5..4ff3e185 100644 --- a/src/PV_SWIG/CMakeLists.txt +++ b/src/PV_SWIG/CMakeLists.txt @@ -29,7 +29,7 @@ ELSE(SALOME_LIGHT_ONLY) # Use another set of Python files redirecting the API directly # to the original ParaView modules. LIST(APPEND _PYFILES_TO_INSTALL - no_wrap/paravis.py + no_wrap/pvserver.py no_wrap/pvsimple.py no_wrap/presentations.py no_wrap/paravisSM.py diff --git a/src/PV_SWIG/no_wrap/paravis.py b/src/PV_SWIG/no_wrap/pvserver.py similarity index 93% rename from src/PV_SWIG/no_wrap/paravis.py rename to src/PV_SWIG/no_wrap/pvserver.py index 0562e666..01577752 100644 --- a/src/PV_SWIG/no_wrap/paravis.py +++ b/src/PV_SWIG/no_wrap/pvserver.py @@ -20,7 +20,7 @@ # Module : PARAVIS # -import PARAVIS_utils +import PVSERVER_utils ## Initialize PARAVIS interface -myParavisEngine = PARAVIS_utils.getEngine() +myParavisEngine = PVSERVER_utils.getEngine() diff --git a/src/PV_SWIG/no_wrap/pvsimple.py b/src/PV_SWIG/no_wrap/pvsimple.py index 470c8353..51bb1032 100644 --- a/src/PV_SWIG/no_wrap/pvsimple.py +++ b/src/PV_SWIG/no_wrap/pvsimple.py @@ -68,7 +68,7 @@ def ShowParaviewView(): ShowParaviewView() import paraview -import paravis +import pvserver from paraview import simple def SalomeConnectToPVServer(): -- 2.39.2