PVViewer.h
PVViewer_LogWindowAdapter.h
PVViewer_EngineWrapper.h
+ PVViewer_Core.h
)
# header files / to install
SET(PVViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
PVViewer_Behaviors.cxx
PVViewer_GUIElements.cxx
PVViewer_EngineWrapper.cxx
+ PVViewer_Core.cxx
)
# sources / to compile
--- /dev/null
+// Copyright (C) 2010-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
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// Author : Adrien Bruneton (CEA)
+//
+
+#include "PVViewer_Core.h"
+#include "PVViewer_LogWindowAdapter.h"
+#include "PVViewer_GUIElements.h"
+#include "PVViewer_Behaviors.h"
+#include "PVViewer_EngineWrapper.h"
+#include "PVViewer_Core.h"
+
+#include <QApplication>
+#include <QStringList>
+#include <QDir>
+#include <QMainWindow>
+
+#include <string>
+
+#include <pqOptions.h>
+#include <pqSettings.h>
+#include <pqPVApplicationCore.h>
+#include <pqTabbedMultiViewWidget.h>
+#include <pqParaViewMenuBuilders.h>
+#include <pqActiveObjects.h>
+#include <pqPipelineBrowserWidget.h>
+#include <pqServerDisconnectReaction.h>
+
+
+//---------- Static init -----------------
+pqPVApplicationCore* PVViewer_Core::MyCoreApp = 0;
+bool PVViewer_Core::ConfigLoaded = false;
+PVViewer_Behaviors * PVViewer_Core::ParaviewBehaviors = NULL;
+
+pqPVApplicationCore * PVViewer_Core::GetPVApplication()
+{
+ return MyCoreApp;
+}
+
+/*!
+ \brief Static method, performs initialization of ParaView session.
+ \param fullSetup whether to instanciate all behaviors or just the minimal ones.
+ \return \c true if ParaView has been initialized successfully, otherwise false
+*/
+bool PVViewer_Core::ParaviewInitApp(QMainWindow * aDesktop, LogWindow * logWindow)
+{
+ if ( ! MyCoreApp) {
+ // Obtain command-line arguments
+ int argc = 0;
+ char** argv = 0;
+ QString aOptions = getenv("PARAVIEW_OPTIONS");
+ QStringList aOptList = aOptions.split(":", QString::SkipEmptyParts);
+ argv = new char*[aOptList.size() + 1];
+ QStringList args = QApplication::arguments();
+ argv[0] = (args.size() > 0)? strdup(args[0].toLatin1().constData()) : strdup("paravis");
+ argc++;
+
+ foreach (QString aStr, aOptList) {
+ argv[argc] = strdup( aStr.toLatin1().constData() );
+ argc++;
+ }
+ MyCoreApp = new pqPVApplicationCore (argc, argv);
+ if (MyCoreApp->getOptions()->GetHelpSelected() ||
+ MyCoreApp->getOptions()->GetUnknownArgument() ||
+ MyCoreApp->getOptions()->GetErrorMessage() ||
+ MyCoreApp->getOptions()->GetTellVersion()) {
+ return false;
+ }
+
+ // Direct VTK log messages to our SALOME window - TODO: review this
+ PVViewer_LogWindowAdapter * w = PVViewer_LogWindowAdapter::New();
+ w->setLogWindow(logWindow);
+ vtkOutputWindow::SetInstance(w);
+
+ new pqTabbedMultiViewWidget(); // registers a "MULTIVIEW_WIDGET" on creation
+
+ for (int i = 0; i < argc; i++)
+ free(argv[i]);
+ delete[] argv;
+ }
+ // Initialize GUI elements if needed:
+ PVViewer_GUIElements::GetInstance(aDesktop);
+ return true;
+}
+
+void PVViewer_Core::ParaviewInitBehaviors(bool fullSetup, QMainWindow* aDesktop)
+{
+ if (!ParaviewBehaviors)
+ ParaviewBehaviors = new PVViewer_Behaviors(aDesktop);
+
+ if(fullSetup)
+ ParaviewBehaviors->instanciateAllBehaviors(aDesktop);
+ else
+ ParaviewBehaviors->instanciateMinimalBehaviors(aDesktop);
+}
+
+void PVViewer_Core::ParaviewLoadConfigurations(const QString & configPath, bool force)
+{
+ if (!ConfigLoaded || force)
+ {
+ if (!configPath.isNull()) {
+ MyCoreApp->loadConfiguration(configPath + QDir::separator() + "ParaViewFilters.xml");
+ MyCoreApp->loadConfiguration(configPath + QDir::separator() + "ParaViewSources.xml");
+ }
+ ConfigLoaded = true;
+ }
+}
+
+void PVViewer_Core::ParaviewCleanup()
+{
+ // Disconnect from server
+ pqServer* server = pqActiveObjects::instance().activeServer();
+ if (server && server->isRemote())
+ {
+ pqServerDisconnectReaction::disconnectFromServer();
+ }
+
+ pqApplicationCore::instance()->settings()->sync();
+
+ pqPVApplicationCore * app = GetPVApplication();
+ // Schedule destruction of PVApplication singleton:
+ if (app)
+ app->deleteLater();
+}
+
--- /dev/null
+// Copyright (C) 2010-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
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// Author : Adrien Bruneton (CEA)
+
+#ifndef SRC_PVVIEWER_PVVIEWER_CORE_H_
+#define SRC_PVVIEWER_PVVIEWER_CORE_H_
+
+#include "PVViewer.h"
+
+#include <QString>
+
+class PVViewer_EngineWrapper;
+class PVViewer_Behaviors;
+class LogWindow;
+class QMainWindow;
+class pqPVApplicationCore;
+
+/**
+ Pure static class gathering most of the interactions with ParaView's API and ParaView's
+ start sequence.
+ */
+class PVVIEWER_EXPORT PVViewer_Core
+{
+public:
+ static pqPVApplicationCore * GetPVApplication();
+
+
+ //! Initialize ParaView if not yet done (once per session)
+ static bool ParaviewInitApp(QMainWindow* aDesktop, LogWindow * w);
+ static void ParaviewInitBehaviors(bool fullSetup=false, QMainWindow* aDesktop=0);
+ static void ParaviewLoadConfigurations(const QString & configPath, bool force=false);
+ static void ParaviewCleanup();
+
+private:
+ PVViewer_Core();
+ virtual ~PVViewer_Core();
+
+ static pqPVApplicationCore* MyCoreApp;
+ static bool ConfigLoaded;
+ static PVViewer_Behaviors * ParaviewBehaviors;
+};
+
+#endif /* SRC_PVVIEWER_PVVIEWER_CORE_H_ */
dataAction = dataToolbar->toggleViewAction();
}
-void PVViewer_GUIElements::onEmulateApply()
-{
- if (propertiesPanel)
- propertiesPanel->apply();
-}
-
QList<QToolBar*> PVViewer_GUIElements::getToolbars()
{
QList<QToolBar*> l;
void setToolBarEnabled(bool enabled);
QList<QToolBar*> getToolbars();
-public slots:
- void onEmulateApply(); // better use the slot from PVViewer_ViewManager if you want to trigger "Apply"
-
private:
PVViewer_GUIElements(QMainWindow* desk);
virtual ~PVViewer_GUIElements() {}
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// Author: Adrien Bruneton (CEA)
+
#include "PVViewer_ViewManager.h"
-#include "PVViewer_ViewModel.h"
#include "PVViewer_ViewWindow.h"
-#include "PVViewer_LogWindowAdapter.h"
+#include "PVViewer_ViewModel.h"
#include "PVViewer_GUIElements.h"
-#include "PVViewer_Behaviors.h"
+#include "PVViewer_Core.h"
#include "PVViewer_EngineWrapper.h"
#include <utilities.h>
-#include <SUIT_MessageBox.h>
+
+#include <LogWindow.h>
#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
#include <SUIT_Study.h>
+#include <SUIT_Session.h>
+#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
-#include <LogWindow.h>
-
-#include <QApplication>
-#include <QStringList>
-#include <QDir>
-
-#include <string>
-#include <pqOptions.h>
#include <pqServer.h>
-#include <pqSettings.h>
-#include <pqServerDisconnectReaction.h>
-#include <pqPVApplicationCore.h>
-#include <pqTabbedMultiViewWidget.h>
-#include <pqActiveObjects.h>
#include <pqServerConnectReaction.h>
-
-#include <pqParaViewMenuBuilders.h>
-#include <pqPipelineBrowserWidget.h>
-
-//---------- Static init -----------------
-pqPVApplicationCore* PVViewer_ViewManager::MyCoreApp = 0;
-bool PVViewer_ViewManager::ConfigLoaded = false;
-PVViewer_Behaviors * PVViewer_ViewManager::ParaviewBehaviors = NULL;
+#include <pqActiveObjects.h>
/*!
Constructor
{
MESSAGE("PVViewer - view manager created ...")
setTitle( tr( "PARAVIEW_VIEW_TITLE" ) );
+
// Initialize minimal paraview stuff (if not already done)
- ParaviewInitApp(desk, logWindow);
+ PVViewer_Core::ParaviewInitApp(desk, logWindow);
connect( desk, SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
}
-pqPVApplicationCore * PVViewer_ViewManager::GetPVApplication()
-{
- return MyCoreApp;
-}
-/*!
- \brief Static method, performs initialization of ParaView session.
- \param fullSetup whether to instanciate all behaviors or just the minimal ones.
- \return \c true if ParaView has been initialized successfully, otherwise false
-*/
-bool PVViewer_ViewManager::ParaviewInitApp(SUIT_Desktop * aDesktop, LogWindow * logWindow)
-{
- if ( ! MyCoreApp) {
- // Obtain command-line arguments
- int argc = 0;
- char** argv = 0;
- QString aOptions = getenv("PARAVIEW_OPTIONS");
- QStringList aOptList = aOptions.split(":", QString::SkipEmptyParts);
- argv = new char*[aOptList.size() + 1];
- QStringList args = QApplication::arguments();
- argv[0] = (args.size() > 0)? strdup(args[0].toLatin1().constData()) : strdup("paravis");
- argc++;
-
- foreach (QString aStr, aOptList) {
- argv[argc] = strdup( aStr.toLatin1().constData() );
- argc++;
- }
- MyCoreApp = new pqPVApplicationCore (argc, argv);
- if (MyCoreApp->getOptions()->GetHelpSelected() ||
- MyCoreApp->getOptions()->GetUnknownArgument() ||
- MyCoreApp->getOptions()->GetErrorMessage() ||
- MyCoreApp->getOptions()->GetTellVersion()) {
- return false;
- }
-
- // Direct VTK log messages to our SALOME window - TODO: review this
- PVViewer_LogWindowAdapter * w = PVViewer_LogWindowAdapter::New();
- w->setLogWindow(logWindow);
- vtkOutputWindow::SetInstance(w);
-
- new pqTabbedMultiViewWidget(); // registers a "MULTIVIEW_WIDGET" on creation
-
- for (int i = 0; i < argc; i++)
- free(argv[i]);
- delete[] argv;
- }
- // Initialize GUI elements if needed:
- PVViewer_GUIElements::GetInstance(aDesktop);
- return true;
-}
-
-void PVViewer_ViewManager::ParaviewInitBehaviors(bool fullSetup, SUIT_Desktop* aDesktop)
-{
- if (!ParaviewBehaviors)
- ParaviewBehaviors = new PVViewer_Behaviors(aDesktop);
-
- if(fullSetup)
- ParaviewBehaviors->instanciateAllBehaviors(aDesktop);
- else
- ParaviewBehaviors->instanciateMinimalBehaviors(aDesktop);
-}
-
-void PVViewer_ViewManager::ParaviewLoadConfigurations(bool force)
-{
- if (!ConfigLoaded || force)
- {
- SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
- QString aPath = resMgr->stringValue("resources", "PVViewer", QString());
- if (!aPath.isNull()) {
- MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewFilters.xml");
- MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewSources.xml");
- }
- ConfigLoaded = true;
- }
-}
-
-void PVViewer_ViewManager::ParaviewCleanup()
+PVViewer_EngineWrapper * PVViewer_ViewManager::GetEngine()
{
- // Disconnect from server
- pqServer* server = pqActiveObjects::instance().activeServer();
- if (server && server->isRemote())
- {
- MESSAGE("~PVViewer_Module(): Disconnecting from remote server ...");
- pqServerDisconnectReaction::disconnectFromServer();
- }
-
- pqApplicationCore::instance()->settings()->sync();
-
- pqPVApplicationCore * app = GetPVApplication();
- // Schedule destruction of PVApplication singleton:
- if (app)
- app->deleteLater();
+ return PVViewer_EngineWrapper::GetInstance();
}
-PVViewer_EngineWrapper * PVViewer_ViewManager::GetEngine()
+QString PVViewer_ViewManager::GetPVConfigPath()
{
- return PVViewer_EngineWrapper::GetInstance();
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ return resMgr->stringValue("resources", "PVViewer", QString());
}
-bool PVViewer_ViewManager::ConnectToExternalPVServer(SUIT_Desktop* aDesktop)
+bool PVViewer_ViewManager::ConnectToExternalPVServer(QMainWindow* aDesktop)
{
SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
bool noConnect = aResourceMgr->booleanValue( "PARAVIS", "no_ext_pv_server", false );
return true;
}
-void PVViewer_ViewManager::onEmulateApply()
-{
- PVViewer_GUIElements * guiElements = PVViewer_GUIElements::GetInstance(desktop);
- guiElements->onEmulateApply();
-}
/*!Enable toolbars if view \a view is ParaView viewer and disable otherwise.
*/
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// Author: Adrien Bruneton (CEA)
+
#ifndef PVViewer_VIEWMANAGER_H
#define PVViewer_VIEWMANAGER_H
#include <SUIT_ViewManager.h>
-class PVViewer_EngineWrapper;
class SUIT_Desktop;
class SUIT_Study;
class SUIT_ViewWindow;
-class pqTabbedMultiViewWidget;
-class pqPVApplicationCore;
-class PVViewer_Behaviors;
-class pqPropertiesPanel;
-class pqPipelineBrowserWidget;
class LogWindow;
+class PVViewer_EngineWrapper;
+class QMainWindow;
class PVVIEWER_EXPORT PVViewer_ViewManager : public SUIT_ViewManager
{
PVViewer_ViewManager( SUIT_Study*, SUIT_Desktop*, LogWindow *);
~PVViewer_ViewManager() {}
- static pqPVApplicationCore * GetPVApplication();
+ //! Get the CORBA engine wrapper.
static PVViewer_EngineWrapper * GetEngine();
- //! Initialize ParaView if not yet done (once per session)
- static bool ParaviewInitApp(SUIT_Desktop* aDesktop, LogWindow * w);
- static void ParaviewInitBehaviors(bool fullSetup=false, SUIT_Desktop* aDesktop=0);
- static void ParaviewLoadConfigurations(bool force=false);
- static void ParaviewCleanup();
+ //! Get PVViewer configuration path as stored by SALOME's resource manager:
+ static QString GetPVConfigPath();
//! Connect to the external PVServer, using the PARAVIS engine to launch it if it is not
//! already up.
- static bool ConnectToExternalPVServer(SUIT_Desktop* aDesktop);
-
-public slots:
- void onEmulateApply();
+ static bool ConnectToExternalPVServer(QMainWindow* aDesktop);
protected slots:
void onWindowActivated(SUIT_ViewWindow*);
private:
- static pqPVApplicationCore* MyCoreApp;
- static bool ConfigLoaded;
- static PVViewer_Behaviors * ParaviewBehaviors;
-
SUIT_Desktop * desktop;
};
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// Author: Adrien Bruneton (CEA)
#include "PVViewer_ViewModel.h"
#include "PVViewer_ViewWindow.h"
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// Author: Adrien Bruneton (CEA)
+
#if !defined(_PVViewer_VIEWMODEL_H)
#define _PVViewer_VIEWMODEL_H
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// File : PVViewer_ViewWindow.cxx
-// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+// Author : Adrien Bruneton (CEA)
#include "PVViewer_ViewWindow.h"
-#include "PVViewer_ViewManager.h"
+#include "PVViewer_Core.h"
#include "PVViewer_ViewModel.h"
#include "PVViewer_GUIElements.h"
+#include "PVViewer_ViewManager.h"
#include <SUIT_ViewManager.h>
#include <SUIT_ResourceMgr.h>
setCentralWidget( myPVMgr );
// Finish ParaView set up: behaviors, connection and configurations.
- PVViewer_ViewManager::ParaviewInitBehaviors(true, theDesktop);
+ const QString configPath(PVViewer_ViewManager::GetPVConfigPath());
+ PVViewer_Core::ParaviewInitBehaviors(true, theDesktop);
PVViewer_ViewManager::ConnectToExternalPVServer(theDesktop);
- PVViewer_ViewManager::ParaviewLoadConfigurations();
+ PVViewer_Core::ParaviewLoadConfigurations(configPath);
// Hide toolbars
PVViewer_GUIElements * pvge = PVViewer_GUIElements::GetInstance(myDesktop);
return myPVMgr;
}
-void PVViewer_ViewWindow::onEmulateApply()
-{
- emit this->applyRequest();
-}
+//void PVViewer_ViewWindow::onEmulateApply()
+//{
+// emit this->applyRequest();
+//}
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// File : Plot2d_ViewWindow.h
-// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+// Author : Adrien Bruneton (CEA)
+
#ifndef PVViewer_VIEWWINDOW_H
#define PVViewer_VIEWWINDOW_H
pqTabbedMultiViewWidget* getMultiViewManager() const;
-signals:
- void applyRequest();
-
-public slots:
- void onEmulateApply();
-
private:
SUIT_Desktop* myDesktop;
PVViewer_Viewer* myModel;
