// PARAVIS : ParaView wrapper SALOME module
//
-// Copyright (C) 2010-2013 CEA/DEN, EDF R&D
+// Copyright (C) 2010-2014 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
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : PVGUI_Module.cxx
-// Author : Julia DOROVSKIKH
#include <Standard_math.hxx> // E.A. must be included before Python.h to fix compilation on windows
#ifdef HAVE_FINITE
#include <vtkPython.h> // Python first
#include "PVGUI_Module.h"
-#include "SALOMEconfig.h"
-#ifdef WITH_VISU
-#include CORBA_CLIENT_HEADER(VISU_Gen)
+#ifdef PARAVIS_WITH_FULL_CORBA
+# include "PARAVIS_Gen_i.hh"
#endif
-#include CORBA_SERVER_HEADER(SALOMEDS)
-
-
-#include "PARAVIS_Gen_i.hh"
-#include "PV_Tools.h"
+#include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
+#include CORBA_SERVER_HEADER(SALOMEDS)
#include "PVGUI_ViewModel.h"
#include "PVGUI_ViewManager.h"
#include "PVGUI_Tools.h"
#include "PVGUI_ParaViewSettingsPane.h"
#include "PVGUI_OutputWindowAdapter.h"
+#include "PVGUI_Behaviors.h"
+// SALOME Includes
#include <SUIT_DataBrowser.h>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_ExceptionHandler.h>
-// SALOME Includes
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "SALOMEDS_SObject.hxx"
-
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_NameDlg.h"
+#include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOMEDS_SObject.hxx>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_NameDlg.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIO.hxx>
#include <SALOMEDS_Tool.hxx>
-#include <PyInterp_Interp.h>
-#include <PyInterp_Dispatcher.h>
-#include <PyConsole_Console.h>
+#include <Utils_ORB_INIT.hxx>
+#include <Utils_SINGLETON.hxx>
#include <QtxActionMenuMgr.h>
#include <QtxActionToolMgr.h>
+#include <PARAVIS_version.h>
+
+// External includes
+#include <sstream>
+
#include <QAction>
#include <QApplication>
#include <QCursor>
#include <QDockWidget>
#include <QHelpEngine>
+// Paraview includes
+#include <vtkPVConfig.h> // for symbol PARAVIEW_VERSION
+#include <vtkProcessModule.h>
+#include <vtkPVSession.h>
+#include <vtkPVProgressHandler.h>
+#include <vtkOutputWindow.h>
+#include <vtkEventQtSlotConnect.h>
+#include <vtkNew.h>
+#include <vtkSMProxy.h>
+#include <vtkSmartPointer.h>
+#include <vtkSMSession.h>
+#include <vtkSMTrace.h>
+#include <vtkSMSessionProxyManager.h>
+#include <vtkSMParaViewPipelineController.h>
+
#include <pqApplicationCore.h>
#include <pqPVApplicationCore.h>
#include <pqActiveView.h>
#include <pqObjectBuilder.h>
#include <pqOptions.h>
-#include <pqRenderView.h>
+#include <pqSettings.h>
#include <pqServer.h>
#include <pqUndoStack.h>
-#include <pqVCRController.h>
#include <pqTabbedMultiViewWidget.h>
-#include <pqPipelineSource.h>
#include <pqActiveObjects.h>
-#include <vtkProcessModule.h>
-#include <vtkSMSession.h>
-#include <vtkPVSession.h>
-#include <vtkPVProgressHandler.h>
-#include <pqParaViewBehaviors.h>
#include <pqHelpReaction.h>
-#include <vtkOutputWindow.h>
#include <pqPluginManager.h>
-#include "pqInterfaceTracker.h"
-#include <pqSettings.h>
#include <pqPythonDialog.h>
#include <pqPythonManager.h>
-#include <pqPythonShell.h>
#include <pqLoadDataReaction.h>
-#include <vtkEventQtSlotConnect.h>
#include <pqPythonScriptEditor.h>
-#include <pqCollaborationBehavior.h>
#include <pqDataRepresentation.h>
-#include <pqPipelineRepresentation.h>
-#include <pqLookupTableManager.h>
#include <pqDisplayColorWidget.h>
#include <pqColorToolbar.h>
#include <pqScalarBarVisibilityReaction.h>
-#include <pqStandardPropertyWidgetInterface.h>
-#include <pqViewStreamingBehavior.h>
-
-#include <PARAVIS_version.h>
-
-#include <vtkPVConfig.h>
-
-
-#include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
-
-#include <pqAlwaysConnectedBehavior.h>
-#include <pqApplicationCore.h>
-#include <pqAutoLoadPluginXMLBehavior.h>
-#include <pqCommandLineOptionsBehavior.h>
-#include <pqCrashRecoveryBehavior.h>
-#include <pqDataTimeStepBehavior.h>
-#include <pqDefaultViewBehavior.h>
-#include <pqDeleteBehavior.h>
-#include <pqObjectPickingBehavior.h>
-#include <pqPersistentMainWindowStateBehavior.h>
-#include <pqPipelineContextMenuBehavior.h>
-#include <pqPluginActionGroupBehavior.h>
-#include <pqPluginDockWidgetsBehavior.h>
-#include <pqPluginManager.h>
-#include <pqPVNewSourceBehavior.h>
-#include <pqSpreadSheetVisibilityBehavior.h>
-#include <pqStandardViewModules.h>
-#include <pqUndoRedoBehavior.h>
-#include <pqViewFrameActionsBehavior.h>
-#include <pqServerManagerObserver.h>
-
-#include <vtkClientServerInterpreterInitializer.h>
-
+#include <pqServerResource.h>
+#include <pqServerConnectReaction.h>
+#include <pqServerDisconnectReaction.h>
//----------------------------------------------------------------------------
pqPVApplicationCore* PVGUI_Module::MyCoreApp = 0;
-//PVGUI_OutputWindowAdapter* PVGUI_Module::pqImplementation::OutputWindowAdapter = 0;
-//QPointer<pqHelpWindow> PVGUI_Module::pqImplementation::helpWindow = 0;
PVGUI_Module* ParavisModule = 0;
+PARAVIS_ORB::PARAVIS_Gen_var PVGUI_Module::myEngine;
+
/*!
\mainpage
SALOME module wrapping ParaView GUI.
*/
-
-/*
- Fix for the issue 21730: [CEA 596] Slice of polyhedron in PARAVIS returns no cell.
- Wrap vtkEDFCutter filter.
-*/
-
-extern "C" void vtkEDFCutterCS_Initialize(vtkClientServerInterpreter*);
-static void vtkEDFHelperInit();
-
-void vtkEDFHelperInit(vtkClientServerInterpreter* interp){
- vtkEDFCutterCS_Initialize(interp);
-}
-
-void vtkEDFHelperInit() {
- vtkClientServerInterpreterInitializer::GetInitializer()->
- RegisterCallback(&vtkEDFHelperInit);
-}
-
-
- _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);
-
- CORBA::ORB_var anORB = PARAVIS::PARAVIS_Gen_i::GetORB();
- 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");
-
-
- PARAVIS::PARAVIS_Gen_var aPARAVIS = PARAVIS::PARAVIS_Gen_i::GetParavisGenImpl()->_this();
-
- aStudyBuilder->DefineComponentInstance(aSComponent, aPARAVIS->GetIOR());
- if (aLocked) theStudyDocument->GetProperties()->SetLocked(true);
- aStudyBuilder->CommitCommand();
- }
- return aSComponent;
- }
-
/*!
Clean up function; used to stop ParaView progress events when
exception is caught by global exception handler.
*/
PVGUI_Module::PVGUI_Module()
: SalomeApp_Module( "PARAVIS" ),
- // Implementation( 0 ),
mySelectionControlsTb( -1 ),
mySourcesMenuId( -1 ),
myFiltersMenuId( -1 ),
myRecentMenuId(-1),
myOldMsgHandler(0),
myTraceWindow(0),
- myStateCounter(0)
+ myStateCounter(0),
+ myInitTimer(0),
+ myPushTraceTimer(0)
{
#ifdef HAS_PV_DOC
Q_INIT_RESOURCE( PVGUI );
#endif
ParavisModule = this;
- // Clear old macros
+ // Clear old copies of embedded macros files
QString aDestPath = QString( "%1/.config/%2/Macros" ).arg( QDir::homePath() ).arg( QApplication::applicationName() );
QStringList aFilter;
aFilter << "*.py";
QDir aDestDir(aDestPath);
QStringList aDestFiles = aDestDir.entryList(aFilter, QDir::Files);
- foreach (QString aStr, aDestFiles) {
- aDestDir.remove(aStr);
+ foreach (QString aMacrosPath, getEmbeddedMacrosList()) {
+ QString aMacrosName = QFileInfo(aMacrosPath).fileName();
+ if (aDestFiles.contains(aMacrosName)) {
+ aDestDir.remove(aMacrosName);
+ }
}
}
*/
PVGUI_Module::~PVGUI_Module()
{
+ if (myPushTraceTimer)
+ delete myPushTraceTimer;
+ if (myInitTimer)
+ delete myInitTimer;
+ // Disconnect from server
+ pqServer* server = pqActiveObjects::instance().activeServer();
+ if (server && server->isRemote())
+ {
+ MESSAGE("~PVGUI_Module(): Disconnecting from remote server ...");
+ pqServerDisconnectReaction::disconnectFromServer();
+ }
+}
+
+PARAVIS_ORB::PARAVIS_Gen_var PVGUI_Module::GetEngine()
+{
+ // initialize PARAVIS module engine (load, if necessary)
+ if ( CORBA::is_nil( myEngine ) ) {
+ Engines::EngineComponent_var comp =
+ SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "PARAVIS" );
+ myEngine = PARAVIS_ORB::PARAVIS_Gen::_narrow( comp );
+ }
+ return myEngine;
}
/*!
*/
void PVGUI_Module::initialize( CAM_Application* app )
{
- // [ABN]: patched in ParaView's sources.
- // PVGUI_MatplotlibMathTextUtilities::Disable();
-
SalomeApp_Module::initialize( app );
// Create ParaViS actions
pvInit();
// Create GUI elements (menus, toolbars, dock widgets)
- //if ( !Implementation ){
- SalomeApp_Application* anApp = getApp();
- SUIT_Desktop* aDesktop = anApp->desktop();
+ SalomeApp_Application* anApp = getApp();
+ SUIT_Desktop* aDesktop = anApp->desktop();
- // connect(aDesktop, SIGNAL()
+ // Remember current state of desktop toolbars
+ QList<QToolBar*> foreignToolbars = aDesktop->findChildren<QToolBar*>();
- // Remember current state of desktop toolbars
- QList<QToolBar*> foreignToolbars = aDesktop->findChildren<QToolBar*>();
+ setupDockWidgets();
- // Simulate ParaView client main window
- //Implementation = new pqImplementation( aDesktop );
+ pvCreateActions();
+ pvCreateToolBars();
+ pvCreateMenus();
- setupDockWidgets();
-
- pvCreateActions();
- pvCreateToolBars();
- pvCreateMenus();
-
- QList<QDockWidget*> activeDocks = aDesktop->findChildren<QDockWidget*>();
- QList<QMenu*> activeMenus = aDesktop->findChildren<QMenu*>();
-
- // new pqParaViewBehaviors(anApp->desktop(), this);
- // Has to be replaced in order to exclude using of pqQtMessageHandlerBehaviour
- // Start pqParaViewBehaviors
- // Register ParaView interfaces.
- //pqPluginManager* pgm = pqApplicationCore::instance()->getPluginManager();
- pqInterfaceTracker* pgm = pqApplicationCore::instance()->interfaceTracker();
-
- // * adds support for standard paraview views.
- pgm->addInterface(new pqStandardViewModules(pgm));
- //pgm->addInterface(new pqStandardSummaryPanelImplementation(pgm));
- pgm->addInterface(new pqStandardPropertyWidgetInterface(pgm));
-
- // Load plugins distributed with application.
- pqApplicationCore::instance()->loadDistributedPlugins();
-
- // Define application behaviors.
- //new pqQtMessageHandlerBehavior(this);
- new pqDataTimeStepBehavior(this);
- new pqViewFrameActionsBehavior(this);
- new pqSpreadSheetVisibilityBehavior(this);
- new pqPipelineContextMenuBehavior(this);
- new pqObjectPickingBehavior(this); // NEW in 4.1
- new pqDefaultViewBehavior(this);
- new pqAlwaysConnectedBehavior(this);
- new pqPVNewSourceBehavior(this);
- new pqDeleteBehavior(this);
- new pqUndoRedoBehavior(this);
- new pqCrashRecoveryBehavior(this);
- new pqAutoLoadPluginXMLBehavior(this);
- new pqPluginDockWidgetsBehavior(aDesktop);
- //new pqVerifyRequiredPluginBehavior(this);
- new pqPluginActionGroupBehavior(aDesktop);
- //new pqFixPathsInStateFilesBehavior(this);
- new pqCommandLineOptionsBehavior(this);
- new pqPersistentMainWindowStateBehavior(aDesktop);
- new pqObjectPickingBehavior(aDesktop);
- new pqCollaborationBehavior(this);
- //new pqMultiServerBehavior(this);
- new pqViewStreamingBehavior(this);
-
- // Setup quick-launch shortcuts.
- QShortcut *ctrlSpace = new QShortcut(Qt::CTRL + Qt::Key_Space, aDesktop);
- QObject::connect(ctrlSpace, SIGNAL(activated()),
- pqApplicationCore::instance(), SLOT(quickLaunch()));
-
- // Find Plugin Dock Widgets
- QList<QDockWidget*> currentDocks = aDesktop->findChildren<QDockWidget*>();
- QList<QDockWidget*>::iterator i;
- for (i = currentDocks.begin(); i != currentDocks.end(); ++i) {
- if(!activeDocks.contains(*i)) {
- myDockWidgets[*i] = false; // hidden by default
- (*i)->hide();
- }
+ QList<QDockWidget*> activeDocks = aDesktop->findChildren<QDockWidget*>();
+ QList<QMenu*> activeMenus = aDesktop->findChildren<QMenu*>();
+
+ PVGUI_Behaviors * behav = new PVGUI_Behaviors(this);
+ behav->instanciateAllBehaviors(aDesktop);
+
+ // Setup quick-launch shortcuts.
+ QShortcut *ctrlSpace = new QShortcut(Qt::CTRL + Qt::Key_Space, aDesktop);
+ QObject::connect(ctrlSpace, SIGNAL(activated()),
+ pqApplicationCore::instance(), SLOT(quickLaunch()));
+
+ // Find Plugin Dock Widgets
+ QList<QDockWidget*> currentDocks = aDesktop->findChildren<QDockWidget*>();
+ QList<QDockWidget*>::iterator i;
+ for (i = currentDocks.begin(); i != currentDocks.end(); ++i) {
+ if(!activeDocks.contains(*i)) {
+ myDockWidgets[*i] = false; // hidden by default
+ (*i)->hide();
}
+ }
// Find Plugin Menus
- QList<QMenu*> currentMenus = aDesktop->findChildren<QMenu*>();
- QList<QMenu*>::iterator im;
- for (im = currentMenus.begin(); im != currentMenus.end(); ++im) {
- if(!activeMenus.contains(*im)) {
- myMenus.append(*im);
- }
- }
+ // [ABN] TODO: fix this - triggers a SEGFAULT at deactivation() time.
+// QList<QMenu*> currentMenus = aDesktop->findChildren<QMenu*>();
+// QList<QMenu*>::iterator im;
+// for (im = currentMenus.begin(); im != currentMenus.end(); ++im) {
+// if(!activeMenus.contains(*im)) {
+// QString s = (*im)->title();
+// std::cout << " MENU "<< s.toStdString() << std::endl;
+// myMenus.append(*im);
+// }
+// }
- SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
- QString aPath = resMgr->stringValue("resources", "PARAVIS", QString());
- if (!aPath.isNull()) {
- MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewFilters.xml");
- MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewReaders.xml");
- MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewSources.xml");
- MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewWriters.xml");
- }
-
- // Force creation of engine
- PARAVIS::GetParavisGen(this);
- updateObjBrowser();
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ QString aPath = resMgr->stringValue("resources", "PARAVIS", QString());
+ if (!aPath.isNull()) {
+ MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewFilters.xml");
+ MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewReaders.xml");
+ MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewSources.xml");
+ MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewWriters.xml");
+ }
- // Find created toolbars
- QCoreApplication::processEvents();
+ // Force creation of the PARAVIS engine
+ GetEngine();
+ updateObjBrowser();
- QList<QToolBar*> allToolbars = aDesktop->findChildren<QToolBar*>();
- foreach(QToolBar* aBar, allToolbars) {
- if (!foreignToolbars.contains(aBar)) {
- myToolbars[aBar] = true;
- myToolbarBreaks[aBar] = false;
- aBar->setVisible(false);
- aBar->toggleViewAction()->setVisible(false);
- }
+ // Find created toolbars
+ QCoreApplication::processEvents();
+
+ QList<QToolBar*> allToolbars = aDesktop->findChildren<QToolBar*>();
+ foreach(QToolBar* aBar, allToolbars) {
+ if (!foreignToolbars.contains(aBar)) {
+ myToolbars[aBar] = true;
+ myToolbarBreaks[aBar] = false;
+ aBar->setVisible(false);
+ aBar->toggleViewAction()->setVisible(false);
}
- //}
+ }
updateMacros();
- // we need to start trace after connection is done
- connect(pqApplicationCore::instance()->getObjectBuilder(), SIGNAL(finishedAddingServer(pqServer*)),
- this, SLOT(onFinishedAddingServer(pqServer*)));
-
- connect(pqApplicationCore::instance()->getObjectBuilder(), SIGNAL(dataRepresentationCreated(pqDataRepresentation*)),
- this, SLOT(onDataRepresentationCreated(pqDataRepresentation*)));
-
-
SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
bool isStop = aResourceMgr->booleanValue( "PARAVIS", "stop_trace", false );
- // start a timer to schedule the trace start asap:
if(!isStop)
- startTimer( 0 );
+ {
+ // Start a timer to schedule asap:
+ // - the connection to the server
+ // - the trace start
+ myInitTimer = new QTimer(aDesktop);
+ QObject::connect(myInitTimer, SIGNAL(timeout()), this, SLOT(onInitTimer()) );
+ myInitTimer->setSingleShot(true);
+ myInitTimer->start(0);
+
+ // Another timer to regularly push the trace onto the engine:
+ myPushTraceTimer = new QTimer(aDesktop);
+ QObject::connect(myPushTraceTimer, SIGNAL(timeout()), this, SLOT(onPushTraceTimer()) );
+ myPushTraceTimer->setSingleShot(false);
+ myPushTraceTimer->start(500);
+ }
this->VTKConnect = vtkEventQtSlotConnect::New();
}
}
}
-
- connect(&pqActiveObjects::instance(),
- SIGNAL(representationChanged(pqRepresentation*)),
- this, SLOT(onRepresentationChanged(pqRepresentation*)));
+}
+
+bool PVGUI_Module::connectToExternalPVServer()
+{
+ pqServer* server = pqActiveObjects::instance().activeServer();
+ if (server && server->isRemote())
+ {
+ // Already connected to an external server, do nothing
+ MESSAGE("connectToExternalPVServer(): Already connected to an external PVServer, won't reconnect.");
+ return false;
+ }
+
+ std::stringstream msg;
+
+ // Try to connect to the external PVServer - gives priority to an externally specified URL:
+ QString serverUrlEnv = getenv("PARAVIS_PVSERVER_URL");
+ std::string serverUrl;
+ if (!serverUrlEnv.isEmpty())
+ serverUrl = serverUrlEnv.toStdString();
+ else
+ {
+ // Get the URL from the engine (possibly starting the pvserver)
+ CORBA::String_var url = GetEngine()->FindOrStartPVServer(0); // take the first free port
+ serverUrl = (char *)url;
+ }
+
+ msg << "connectToExternalPVServer(): Trying to connect to the external PVServer '" << serverUrl << "' ...";
+ MESSAGE(msg.str());
+
+ if (!pqServerConnectReaction::connectToServer(pqServerResource(serverUrl.c_str())))
+ {
+ std::stringstream msg2;
+ msg2 << "Error while connecting to the requested pvserver '" << serverUrl;
+ msg2 << "'. Might use default built-in connection instead!" << std::endl;
+ qWarning(msg2.str().c_str()); // will go to the ParaView console (see ParavisMessageOutput below)
+ SUIT_MessageBox::warning( getApp()->desktop(),
+ QString("Error connecting to PVServer"), QString(msg2.str().c_str()));
+ return false;
+ }
+ else
+ MESSAGE("connectToExternalPVServer(): Connected!");
+ return true;
}
void PVGUI_Module::onStartProgress()
QApplication::restoreOverrideCursor();
}
-void PVGUI_Module::onFinishedAddingServer(pqServer* /*server*/)
-{
- SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
- bool isStop = aResourceMgr->booleanValue( "PARAVIS", "stop_trace", false );
- if(!isStop)
- startTimer( 500 );
-}
-
-void PVGUI_Module::onDataRepresentationCreated(pqDataRepresentation* data) {
- if(!data)
- return;
-
- if(!data->getLookupTable())
- return;
-
- SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
- if(!aResourceMgr)
- return;
-
- bool visible = aResourceMgr->booleanValue( "PARAVIS", "show_color_legend", false );
- pqLookupTableManager* lut_mgr = pqApplicationCore::instance()->getLookupTableManager();
-
- if(lut_mgr) {
- lut_mgr->setScalarBarVisibility(data,visible);
- }
-
- connect(data, SIGNAL(dataUpdated()), this, SLOT(onDataRepresentationUpdated()));
-}
-
void PVGUI_Module::onDataRepresentationUpdated() {
SalomeApp_Study* activeStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
if(!activeStudy) return;
activeStudy->Modified();
}
-void PVGUI_Module::onVariableChanged(pqVariableType t, const QString) {
-
- pqDisplayColorWidget* colorWidget = qobject_cast<pqDisplayColorWidget*>(sender());
- if( !colorWidget )
- return;
-
- if( t == VARIABLE_TYPE_NONE )
- return;
-
- SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
-
- if(!aResourceMgr)
- return;
-
- bool visible = aResourceMgr->booleanValue( "PARAVIS", "show_color_legend", false );
-
- if(!visible)
- return;
-
- /*//VTN: getRepresentation is protected
- pqDataRepresentation* data = colorWidget->getRepresentation();
-
- if( !data->getLookupTable() )
- return;
-
- pqLookupTableManager* lut_mgr = pqApplicationCore::instance()->getLookupTableManager();
-
- if(lut_mgr) {
- lut_mgr->setScalarBarVisibility(data,visible);
- }
- */
- pqColorToolbar* colorTooBar = qobject_cast<pqColorToolbar*>(colorWidget->parent());
- if( !colorTooBar )
- return;
-
- pqScalarBarVisibilityReaction* scalarBarVisibility = colorTooBar->findChild<pqScalarBarVisibilityReaction *>();
- if(scalarBarVisibility) {
- scalarBarVisibility->setScalarBarVisibility(visible);
- }
-}
-
-void PVGUI_Module::execPythonCommand(const QString& cmd, bool inSalomeConsole)
-{
- if ( inSalomeConsole ) {
- if ( PyInterp_Dispatcher::Get()->IsBusy() ) return;
- SalomeApp_Application* app =
- dynamic_cast< SalomeApp_Application* >(SUIT_Session::session()->activeApplication());
- PyConsole_Console* pyConsole = app->pythonConsole();
- if (pyConsole)
- pyConsole->exec(cmd);
- }
- else
- {
- pqPythonManager* manager = qobject_cast<pqPythonManager*>
- ( pqApplicationCore::instance()->manager( "PYTHON_MANAGER" ) );
- if ( manager )
- {
- pqPythonDialog* pyDiag = manager->pythonShellDialog();
- if ( pyDiag )
- {
- pqPythonShell* shell = pyDiag->shell();
- if ( shell ) {
- shell->executeScript(cmd);
- }
- }
- }
- }
-}
-
/*!
- \brief Launches a tracing of current server
+ \brief Initialisation timer event - fired only once, after the GUI loop is ready.
+ See creation in initialize().
*/
-void PVGUI_Module::timerEvent(QTimerEvent* te )
+void PVGUI_Module::onInitTimer()
{
-#ifndef WNT
- if ( PyInterp_Dispatcher::Get()->IsBusy() )
- {
- // Reschedule for later
- MESSAGE("interpreter busy -> rescheduling trace start.");
- startTimer(500);
- }
- else
- {
- MESSAGE("about to start trace....");
- execPythonCommand("from paraview import smtrace;smtrace.start_trace()", false);
- MESSAGE("trace STARTED....");
- }
- killTimer( te->timerId() );
+#ifndef PARAVIS_WITH_FULL_CORBA
+ connectToExternalPVServer();
#endif
+ startTrace();
}
-void PVGUI_Module::updateMacros()
+/*!
+ \brief Get list of embedded macros files
+*/
+QStringList PVGUI_Module::getEmbeddedMacrosList()
{
- pqPythonManager* aPythonManager = pqPVApplicationCore::instance()->pythonManager();
- if(!aPythonManager) {
- return;
- }
-
QString aRootDir = getenv("PARAVIS_ROOT_DIR");
QString aSourcePath = aRootDir + "/bin/salome/Macro";
QDir aSourceDir(aSourcePath);
QStringList aSourceFiles = aSourceDir.entryList(aFilter, QDir::Files);
- foreach (QString aStr, aSourceFiles) {
- aPythonManager->addMacro(aSourcePath + "/" + aStr);
+ QStringList aFullPathSourceFiles;
+ foreach (QString aMacrosName, aSourceFiles) {
+ aFullPathSourceFiles << aSourceDir.absoluteFilePath(aMacrosName);
+ }
+ return aFullPathSourceFiles;
+}
+
+void PVGUI_Module::updateMacros()
+{
+ pqPythonManager* aPythonManager = pqPVApplicationCore::instance()->pythonManager();
+ if(!aPythonManager) {
+ return;
+ }
+
+ foreach (QString aStr, getEmbeddedMacrosList()) {
+ aPythonManager->addMacro(aStr);
}
}
MyCoreApp->getOptions()->GetTellVersion()) {
return false;
}
-
- /* VTN: Looks like trash. For porting see branded_paraview_initializer.cxx.in
- // Not sure why this is needed. Andy added this ages ago with comment saying
- // needed for Mac apps. Need to check that it's indeed still required.
- QDir dir(QApplication::applicationDirPath());
- dir.cdUp();
- dir.cd("Plugins");
- QApplication::addLibraryPath(dir.absolutePath());
- // Load required application plugins.
- QString plugin_string = "";
- QStringList plugin_list = plugin_string.split(';',QString::SkipEmptyParts);
- pqBrandPluginsLoader loader;
- if (loader.loadPlugins(plugin_list) == false) {
- printf("Failed to load required plugins for this application\n");
- return false;
- }
-
- // Load optional plugins.
- plugin_string = "";
- plugin_list = plugin_string.split(';',QString::SkipEmptyParts);
- loader.loadPlugins(plugin_list, true); //quietly skip not-found plugins.
- */
- // End of Initializer code
-
+ // Connect VTK log messages to SALOME messages (TODO: review this)
vtkOutputWindow::SetInstance(PVGUI_OutputWindowAdapter::New());
- new pqTabbedMultiViewWidget(); // it registers as "MULTIVIEW_WIDGET on creation
+ // Create render view:
+ new pqTabbedMultiViewWidget(); // it registers as "MULTIVIEW_WIDGET" on creation
for (int i = 0; i < argc; i++)
free(argv[i]);
QApplication::restoreOverrideCursor();
}
-/*!
- \brief Returns the ParaView multi-view manager.
-*/
-pqTabbedMultiViewWidget* PVGUI_Module::getMultiViewManager() const
-{
- return qobject_cast<pqTabbedMultiViewWidget*>(pqApplicationCore::instance()->manager("MULTIVIEW_WIDGET"));
-}
+///*!
+// \brief Returns the ParaView multi-view manager.
+//*/
+//pqTabbedMultiViewWidget* PVGUI_Module::getMultiViewManager() const
+//{
+// return qobject_cast<pqTabbedMultiViewWidget*>(pqApplicationCore::instance()->manager("MULTIVIEW_WIDGET"));
+//}
static void ParavisMessageOutput(QtMsgType type, const char *msg)
if ( myRecentMenuId != -1 ) menuMgr()->show(myRecentMenuId);
- ClientFindOrCreateParavisComponent(PARAVIS::GetCStudy(this));
+// ClientFindOrCreateParavisComponent(PARAVIS::GetCStudy(this));
return isDone;
}
*/
bool PVGUI_Module::deactivateModule( SUIT_Study* study )
{
+ MESSAGE("PARAVIS deactivation ...")
+
QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId );
if(aMenu) {
QList<QAction*> anActns = aMenu->actions();
setMenuShown( false );
setToolShown( false );
-
saveDockWidgetsState();
SUIT_ExceptionHandler::removeCleanUpRoutine( paravisCleanUp );
}
+/*!
+ \brief Deletes temporary files created during import operation from VISU
+*/
+void PVGUI_Module::deleteTemporaryFiles()
+{
+ foreach(QString aFile, myTemporaryFiles) {
+ if (QFile::exists(aFile)) {
+ QFile::remove(aFile);
+ }
+ }
+}
+
+
/*!
\brief Called when study is closed.
}
_PTR(SComponent) paravisComp =
- studyDS->FindComponent(PARAVIS::GetParavisGen(this)->ComponentDataType());
+ studyDS->FindComponent(GetEngine()->ComponentDataType());
if(!paravisComp) {
return;
}
*/
QString PVGUI_Module::engineIOR() const
{
- CORBA::String_var anIOR = PARAVIS::GetParavisGen(this)->GetIOR();
+ CORBA::String_var anIOR = GetEngine()->GetIOR();
return QString(anIOR.in());
}
pqLoadDataReaction::loadData(aFiles);
}
+/**!
+ * Start trace invoking the newly introduced C++ API (PV 4.2)
+ * (inspired from pqTraceReaction::start())
+ */
+void PVGUI_Module::startTrace()
+{
+ vtkSMSessionProxyManager* pxm = pqActiveObjects::instance().activeServer()->proxyManager();
+
+ vtkSmartPointer<vtkSMProxy> proxy;
+ proxy.TakeReference(pxm->NewProxy("pythontracing", "PythonTraceOptions"));
+ if (proxy)
+ {
+ vtkNew<vtkSMParaViewPipelineController> controller;
+ controller->InitializeProxy(proxy);
+ }
+ vtkSMTrace* trace = vtkSMTrace::StartTrace();
+ if (proxy)
+ {
+ // Set manually the properties entered via the dialog box poping-up when requiring
+ // a trace start in PV4.2 (trace options)
+ trace->SetPropertiesToTraceOnCreate(vtkSMTrace::RECORD_USER_MODIFIED_PROPERTIES);
+ trace->SetFullyTraceSupplementalProxies(false);
+ }
+}
+
+void PVGUI_Module::stopTrace()
+{
+ vtkSMTrace::StopTrace();
+}
+
void PVGUI_Module::executeScript(const char *script)
{
#ifndef WNT
static const QString MYReplaceImportStr("except: from pvsimple import *");
QString PVGUI_Module::getTraceString()
{
- QString traceString;
-#ifndef WNT
- {
- PyLockWrapper lck; // Acquire GIL
-
- const char * code = "from paraview import smtrace;"
- "__smtraceString = smtrace.get_trace_string()";
- PyRun_SimpleString(code);
- // Now get the value of __smtraceString
- PyObject* main_module = PyImport_AddModule((char*)"__main__");
- PyObject* global_dict = PyModule_GetDict(main_module);
- PyObject* string_object = PyDict_GetItemString(global_dict, "__smtraceString");
- char* string_ptr = string_object ? PyString_AsString(string_object) : 0;
- if (string_ptr) {
- traceString = string_ptr;
- }
- } // release GIL
+ vtkSMTrace *tracer = vtkSMTrace::GetActiveTracer();
+ if (!tracer) // trace is not started
+ return QString("");
+
+ QString traceString(tracer->GetCurrentTrace());
+ // Replace import "paraview.simple" by "pvsimple"
if ((!traceString.isNull()) && traceString.length() != 0) {
int aPos = traceString.indexOf(MYReplaceStr);
while (aPos != -1) {
traceString = traceString.replace(aImportPos, MYReplaceImportStr.length(), "except:\n import pvsimple\n from pvsimple import *");
}
}
-#endif
+
return traceString;
}
pqApplicationCore::instance()->loadState(theFileName, getActiveServer());
}
-/*!
- \brief Imports MED data from VISU module by data entry
-*/
-void PVGUI_Module::onImportFromVisu(QString theEntry)
-{
-#ifdef WITH_VISU
- SUIT_OverrideCursor aWaitCursor;
-
- // get active study
- SalomeApp_Study* activeStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
- if(!activeStudy) return;
-
- // get SALOMEDS client study
- _PTR(Study) aStudy = activeStudy->studyDS();
- if(!aStudy) return;
-
- // find VISU component in a study
- _PTR(SComponent) aVisuComp = aStudy->FindComponent( "VISU" );
- if(!aVisuComp) return;
-
- // get SObject client by entry
- _PTR(SObject) aSObj = aStudy->FindObjectID(qPrintable(theEntry));
- if (!aSObj) return;
-
- // get CORBA SObject
- SALOMEDS_SObject* aSObject = _CAST(SObject, aSObj);
- if ( !aSObject ) return;
-
- // load VISU engine
- SALOME_NamingService* aNamingService = SalomeApp_Application::namingService();
- SALOME_LifeCycleCORBA aLCC(aNamingService);
-
- Engines::EngineComponent_var aComponent = aLCC.FindOrLoad_Component("FactoryServer","VISU");
- VISU::VISU_Gen_var aVISU = VISU::VISU_Gen::_narrow(aComponent);
- if(CORBA::is_nil(aVISU)) return;
-
- _PTR(StudyBuilder) aStudyBuilder = aStudy->NewBuilder();
- aStudyBuilder->LoadWith( aVisuComp, SalomeApp_Application::orb()->object_to_string(aVISU) );
-
- // get VISU result object
- CORBA::Object_var aResultObject = aSObject->GetObject();
- if (CORBA::is_nil(aResultObject)) return;
- VISU::Result_var aResult = VISU::Result::_narrow( aResultObject );
- if (CORBA::is_nil(aResult)) return;
-
- // export VISU result to the MED file
- std::string aTmpDir = SALOMEDS_Tool::GetTmpDir();
- std::string aFileName = aSObject->GetName();
- std::string aFilePath = aTmpDir + aFileName;
-
- if (aResult->ExportMED(aFilePath.c_str())) {
- openFile(aFilePath.c_str());
- myTemporaryFiles.append(QString(aFilePath.c_str()));
- }
-#else
- MESSAGE("Visu module is not found.");
-#endif
-}
-
-/*!
- \brief Deletes temporary files created during import operation from VISU
-*/
-void PVGUI_Module::deleteTemporaryFiles()
-{
- foreach(QString aFile, myTemporaryFiles) {
- if (QFile::exists(aFile)) {
- QFile::remove(aFile);
- }
- }
-}
-
-
/*!
\brief Returns current active ParaView server
*/
aStrings<<tr("PREF_SAVE_TYPE_2");
setPreferenceProperty(aSaveType, "strings", aStrings);
setPreferenceProperty(aSaveType, "indexes", aIndices);
-
- //rnv: imp 21712: [CEA 581] Preference to display legend by default
- int aDispColoreLegend = addPreference( tr( "PREF_SHOW_COLOR_LEGEND" ), aParaVisSettingsTab,
- LightApp_Preferences::Bool, "PARAVIS", "show_color_legend");
}
/*!
return;
}
- QString paravisDataType(PARAVIS::GetParavisGen(this)->ComponentDataType());
+ QString paravisDataType(GetEngine()->ComponentDataType());
if(activeStudy && activeStudy->isComponent(entry) &&
activeStudy->componentDataType(entry) == paravisDataType) {
// ParaViS module object
*/
void PVGUI_Module::onRestartTrace()
{
- QString script = "from paraview import smtrace\n";
- script += "smtrace.stop_trace()\n";
- script += "smtrace.start_trace()\n";
- execPythonCommand(script, false);
+ stopTrace();
+ startTrace();
}
/*!
}
_PTR(SComponent) paravisComp =
- studyDS->FindComponent(PARAVIS::GetParavisGen(this)->ComponentDataType());
+ studyDS->FindComponent(GetEngine()->ComponentDataType());
if(!paravisComp) {
return;
}
// File name for state saving
QString tmpDir = QString::fromStdString(SALOMEDS_Tool::GetTmpDir());
- QString fileName = QString("%1_paravisstate:%2").arg(tmpDir,
- stateEntry);
+ QString fileName = QString("%1_paravisstate:%2").arg(tmpDir, stateEntry);
anAttr = studyBuilder->FindOrCreateAttribute(newSObj, "AttributeString");
_PTR(AttributeString) stringAttr(anAttr);
if (stateSObj->FindAttribute(anAttr, "AttributeName")) {
_PTR(AttributeName) nameAttr (anAttr);
QString newName =
- LightApp_NameDlg::getName(getApp()->desktop(), nameAttr->Value().c_str());
+ LightApp_NameDlg::getName(getApp()->desktop(), nameAttr->Value().c_str());
if (!newName.isEmpty()) {
- nameAttr->SetValue(newName.toLatin1().constData());
- aListIO.First()->setName(newName.toLatin1().constData());
+ nameAttr->SetValue(newName.toLatin1().constData());
+ aListIO.First()->setName(newName.toLatin1().constData());
}
}
}
}
+void PVGUI_Module::onPushTraceTimer()
+{
+// MESSAGE("onPushTraceTimer(): Pushing trace to engine...");
+ GetEngine()->PutPythonTraceStringToEngine(getTraceString().toStdString().c_str());
+}
+
/*!
\brief Discover help project files from the resources.
\return name of the help file.
QString stringValue(aStringAttr->Value().c_str());
if (QFile::exists(stringValue)) {
- fileName = stringValue;
+ fileName = stringValue;
}
}
}
}
}
-void PVGUI_Module::onRepresentationChanged(pqRepresentation*) {
-
-
- //rnv: to fix the issue "21712: [CEA 581] Preference to display legend by default"
- // find the pqDisplayColorWidget instances and connect the variableChanged SIGNAL on the
- // onVariableChanged slot of this class. This connection needs to change visibility
- // of the "Colored Legend" after change the "Color By" array.
- QList<pqDisplayColorWidget*> aWidget = getApp()->desktop()->findChildren<pqDisplayColorWidget*>();
-
- for (int i = 0; i < aWidget.size() ; i++ ) {
- if( aWidget[i] ) {
- connect( aWidget[i], SIGNAL ( variableChanged ( pqVariableType, const QString ) ),
- this, SLOT(onVariableChanged( pqVariableType, const QString) ), Qt::UniqueConnection );
- }
- }
-}
-
-
/*!
\fn CAM_Module* createModule();
\brief Export module instance (factory function).
bool flag = false;
PVGUI_EXPORT CAM_Module* createModule() {
- if(!flag) {
- vtkEDFHelperInit();
- flag = true;
- }
return new PVGUI_Module();
}