From 91746ab5545e0d924f7b0a5d6f0850e91f35daf6 Mon Sep 17 00:00:00 2001 From: abn Date: Wed, 17 Sep 2014 09:31:12 +0200 Subject: [PATCH] Renamed the viewer part into PVViewer_* --- src/PVGUI/PVGUI_Module.cxx | 28 +++++++-------- src/PVGUI/view/CMakeLists.txt | 20 +++++------ ...I_Behaviors.cxx => PVViewer_Behaviors.cxx} | 10 +++--- ...PVGUI_Behaviors.h => PVViewer_Behaviors.h} | 6 ++-- ...pter.cxx => PVViewer_LogWindowAdapter.cxx} | 24 ++++++------- ...wAdapter.h => PVViewer_LogWindowAdapter.h} | 22 ++++++------ ...ewManager.cxx => PVViewer_ViewManager.cxx} | 36 +++++++++---------- ...I_ViewManager.h => PVViewer_ViewManager.h} | 10 +++--- ...I_ViewModel.cxx => PVViewer_ViewModel.cxx} | 12 +++---- ...PVGUI_ViewModel.h => PVViewer_ViewModel.h} | 12 +++---- ...ViewWindow.cxx => PVViewer_ViewWindow.cxx} | 18 +++++----- ...GUI_ViewWindow.h => PVViewer_ViewWindow.h} | 14 ++++---- 12 files changed, 106 insertions(+), 106 deletions(-) rename src/PVGUI/view/{PVGUI_Behaviors.cxx => PVViewer_Behaviors.cxx} (93%) rename src/PVGUI/view/{PVGUI_Behaviors.h => PVViewer_Behaviors.h} (92%) rename src/PVGUI/view/{PVGUI_LogWindowAdapter.cxx => PVViewer_LogWindowAdapter.cxx} (77%) rename src/PVGUI/view/{PVGUI_LogWindowAdapter.h => PVViewer_LogWindowAdapter.h} (76%) rename src/PVGUI/view/{PVGUI_ViewManager.cxx => PVViewer_ViewManager.cxx} (86%) rename src/PVGUI/view/{PVGUI_ViewManager.h => PVViewer_ViewManager.h} (89%) rename src/PVGUI/view/{PVGUI_ViewModel.cxx => PVViewer_ViewModel.cxx} (79%) rename src/PVGUI/view/{PVGUI_ViewModel.h => PVViewer_ViewModel.h} (84%) rename src/PVGUI/view/{PVGUI_ViewWindow.cxx => PVViewer_ViewWindow.cxx} (82%) rename src/PVGUI/view/{PVGUI_ViewWindow.h => PVViewer_ViewWindow.h} (84%) diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index fb126fec..97679fdf 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -34,9 +34,9 @@ #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) #include CORBA_SERVER_HEADER(SALOMEDS) -#include "PVGUI_ViewManager.h" -#include "PVGUI_ViewWindow.h" -#include "PVGUI_ViewModel.h" +#include "PVViewer_ViewManager.h" +#include "PVViewer_ViewWindow.h" +#include "PVViewer_ViewModel.h" #include "PVGUI_Tools.h" #include "PVGUI_ParaViewSettingsPane.h" @@ -298,12 +298,12 @@ PVGUI_Module::~PVGUI_Module() PARAVIS_ORB::PARAVIS_Gen_var PVGUI_Module::GetEngine() { - return PVGUI_ViewManager::GetEngine(); + return PVViewer_ViewManager::GetEngine(); } pqPVApplicationCore * PVGUI_Module::GetPVApplication() { - return PVGUI_ViewManager::GetPVApplication(); + return PVViewer_ViewManager::GetPVApplication(); } /*! @@ -333,7 +333,7 @@ void PVGUI_Module::initialize( CAM_Application* app ) // Initialize ParaView client and associated behaviors // and connect to externally launched pvserver - PVGUI_ViewManager::ParaviewInitApp(aDesktop); + PVViewer_ViewManager::ParaviewInitApp(aDesktop); // Remember current state of desktop toolbars QList foreignToolbars = aDesktop->findChildren(); @@ -341,8 +341,8 @@ void PVGUI_Module::initialize( CAM_Application* app ) setupDockWidgets(); // Behaviors and connection must be instanciated *after* widgets are in place: - PVGUI_ViewManager::ParaviewInitBehaviors(true, aDesktop); - PVGUI_ViewManager::ConnectToExternalPVServer(aDesktop); + PVViewer_ViewManager::ParaviewInitBehaviors(true, aDesktop); + PVViewer_ViewManager::ConnectToExternalPVServer(aDesktop); pvCreateActions(); pvCreateToolBars(); @@ -522,18 +522,18 @@ void PVGUI_Module::windows( QMap& m ) const void PVGUI_Module::showView( bool toShow ) { SalomeApp_Application* anApp = getApp(); - PVGUI_ViewManager* viewMgr = - dynamic_cast( anApp->getViewManager( PVGUI_Viewer::Type(), false ) ); + PVViewer_ViewManager* viewMgr = + dynamic_cast( anApp->getViewManager( PVViewer_Viewer::Type(), false ) ); if ( !viewMgr ) { - viewMgr = new PVGUI_ViewManager( anApp->activeStudy(), anApp->desktop() ); + viewMgr = new PVViewer_ViewManager( anApp->activeStudy(), anApp->desktop() ); anApp->addViewManager( viewMgr ); connect( viewMgr, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), anApp, SLOT( onCloseView( SUIT_ViewManager* ) ) ); } - PVGUI_ViewWindow* pvWnd = dynamic_cast( viewMgr->getActiveView() ); + PVViewer_ViewWindow* pvWnd = dynamic_cast( viewMgr->getActiveView() ); if ( !pvWnd ) { - pvWnd = dynamic_cast( viewMgr->createViewWindow() ); + pvWnd = dynamic_cast( viewMgr->createViewWindow() ); } pvWnd->setShown( toShow ); @@ -715,7 +715,7 @@ bool PVGUI_Module::deactivateModule( SUIT_Study* study ) */ void PVGUI_Module::onApplicationClosed( SUIT_Application* theApp ) { - PVGUI_ViewManager::ParaviewCleanup(); + PVViewer_ViewManager::ParaviewCleanup(); int aAppsNb = SUIT_Session::session()->applications().size(); if (aAppsNb == 1) { diff --git a/src/PVGUI/view/CMakeLists.txt b/src/PVGUI/view/CMakeLists.txt index 231579c5..6ba33bf4 100644 --- a/src/PVGUI/view/CMakeLists.txt +++ b/src/PVGUI/view/CMakeLists.txt @@ -44,15 +44,15 @@ SET(_link_LIBRARIES # header files / to be processed by moc SET(_moc_HEADERS - PVGUI_ViewManager.h - PVGUI_ViewModel.h - PVGUI_ViewWindow.h - PVGUI_Behaviors.h + PVViewer_ViewManager.h + PVViewer_ViewModel.h + PVViewer_ViewWindow.h + PVViewer_Behaviors.h ) # header files / no moc processing SET(_other_HEADERS - PVGUI_LogWindowAdapter.h + PVViewer_LogWindowAdapter.h ) # header files / to install SET(PVViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) @@ -64,11 +64,11 @@ QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) # sources / static SET(_other_SOURCES - PVGUI_ViewManager.cxx - PVGUI_ViewModel.cxx - PVGUI_ViewWindow.cxx - PVGUI_LogWindowAdapter.cxx - PVGUI_Behaviors.cxx + PVViewer_ViewManager.cxx + PVViewer_ViewModel.cxx + PVViewer_ViewWindow.cxx + PVViewer_LogWindowAdapter.cxx + PVViewer_Behaviors.cxx ) # sources / to compile diff --git a/src/PVGUI/view/PVGUI_Behaviors.cxx b/src/PVGUI/view/PVViewer_Behaviors.cxx similarity index 93% rename from src/PVGUI/view/PVGUI_Behaviors.cxx rename to src/PVGUI/view/PVViewer_Behaviors.cxx index 2a1a2a38..417cd65c 100644 --- a/src/PVGUI/view/PVGUI_Behaviors.cxx +++ b/src/PVGUI/view/PVViewer_Behaviors.cxx @@ -18,7 +18,7 @@ // // Author: Adrien Bruneton (CEA) -#include "PVGUI_Behaviors.h" +#include "PVViewer_Behaviors.h" #include #include @@ -50,9 +50,9 @@ #include #include -bool PVGUI_Behaviors::hasMinimalInstanciated = false; +bool PVViewer_Behaviors::hasMinimalInstanciated = false; -PVGUI_Behaviors::PVGUI_Behaviors(SUIT_Desktop * parent) +PVViewer_Behaviors::PVViewer_Behaviors(SUIT_Desktop * parent) : QObject(static_cast(parent)) { } @@ -61,7 +61,7 @@ PVGUI_Behaviors::PVGUI_Behaviors(SUIT_Desktop * parent) * This method should be updated at each new version of ParaView with what is found in * Qt/ApplicationComponents/pqParaViewBehaviors.cxx */ -void PVGUI_Behaviors::instanciateMinimalBehaviors(SUIT_Desktop * desk) +void PVViewer_Behaviors::instanciateMinimalBehaviors(SUIT_Desktop * desk) { hasMinimalInstanciated = true; @@ -90,7 +90,7 @@ void PVGUI_Behaviors::instanciateMinimalBehaviors(SUIT_Desktop * desk) * This method should be updated at each new version of ParaView with what is found in * Qt/ApplicationComponents/pqParaViewBehaviors.cxx */ -void PVGUI_Behaviors::instanciateAllBehaviors(SUIT_Desktop * desk) +void PVViewer_Behaviors::instanciateAllBehaviors(SUIT_Desktop * desk) { // "new pqParaViewBehaviors(anApp->desktop(), this);" // -> (which loads all standard ParaView behaviors at once) has to be replaced in order to diff --git a/src/PVGUI/view/PVGUI_Behaviors.h b/src/PVGUI/view/PVViewer_Behaviors.h similarity index 92% rename from src/PVGUI/view/PVGUI_Behaviors.h rename to src/PVGUI/view/PVViewer_Behaviors.h index 63639056..6e99c26c 100644 --- a/src/PVGUI/view/PVGUI_Behaviors.h +++ b/src/PVGUI/view/PVViewer_Behaviors.h @@ -32,18 +32,18 @@ class SUIT_Desktop; * Qt/ApplicationComponents/pqParaViewBehaviors.cxx * Except a few ones, behaviors are destroyed when the module is destroyed. */ -class PVGUI_Behaviors: public QObject +class PVViewer_Behaviors: public QObject { Q_OBJECT public: - PVGUI_Behaviors(SUIT_Desktop * parent); + PVViewer_Behaviors(SUIT_Desktop * parent); void instanciateMinimalBehaviors(SUIT_Desktop * desk); void instanciateAllBehaviors(SUIT_Desktop * desk); - virtual ~PVGUI_Behaviors() {} + virtual ~PVViewer_Behaviors() {} private: static bool hasMinimalInstanciated; diff --git a/src/PVGUI/view/PVGUI_LogWindowAdapter.cxx b/src/PVGUI/view/PVViewer_LogWindowAdapter.cxx similarity index 77% rename from src/PVGUI/view/PVGUI_LogWindowAdapter.cxx rename to src/PVGUI/view/PVViewer_LogWindowAdapter.cxx index 6469f0f5..736b77b6 100644 --- a/src/PVGUI/view/PVGUI_LogWindowAdapter.cxx +++ b/src/PVGUI/view/PVViewer_LogWindowAdapter.cxx @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "PVGUI_LogWindowAdapter.h" +#include "PVViewer_LogWindowAdapter.h" #include @@ -26,7 +26,7 @@ #include #include -vtkStandardNewMacro(PVGUI_LogWindowAdapter); +vtkStandardNewMacro(PVViewer_LogWindowAdapter); @@ -53,7 +53,7 @@ class TEvent: public SALOME_Event { }; -PVGUI_LogWindowAdapter::PVGUI_LogWindowAdapter() : +PVViewer_LogWindowAdapter::PVViewer_LogWindowAdapter() : TextCount(0), ErrorCount(0), WarningCount(0), @@ -61,26 +61,26 @@ PVGUI_LogWindowAdapter::PVGUI_LogWindowAdapter() : { } -PVGUI_LogWindowAdapter::~PVGUI_LogWindowAdapter() +PVViewer_LogWindowAdapter::~PVViewer_LogWindowAdapter() { } -const unsigned int PVGUI_LogWindowAdapter::getTextCount() +const unsigned int PVViewer_LogWindowAdapter::getTextCount() { return this->TextCount; } -const unsigned int PVGUI_LogWindowAdapter::getErrorCount() +const unsigned int PVViewer_LogWindowAdapter::getErrorCount() { return this->ErrorCount; } -const unsigned int PVGUI_LogWindowAdapter::getWarningCount() +const unsigned int PVViewer_LogWindowAdapter::getWarningCount() { return this->WarningCount; } -const unsigned int PVGUI_LogWindowAdapter::getGenericWarningCount() +const unsigned int PVViewer_LogWindowAdapter::getGenericWarningCount() { return this->GenericWarningCount; } @@ -94,25 +94,25 @@ static LogWindow* getLogWindow() return wnd; } -void PVGUI_LogWindowAdapter::DisplayText(const char* text) +void PVViewer_LogWindowAdapter::DisplayText(const char* text) { ++this->TextCount; ProcessVoidEvent( new TEvent( getLogWindow(), text, Qt::darkGreen, LogWindow::DisplayNormal )); } -void PVGUI_LogWindowAdapter::DisplayErrorText(const char* text) +void PVViewer_LogWindowAdapter::DisplayErrorText(const char* text) { ++this->ErrorCount; ProcessVoidEvent( new TEvent( getLogWindow(), text, Qt::darkRed, LogWindow::DisplayNormal )); } -void PVGUI_LogWindowAdapter::DisplayWarningText(const char* text) +void PVViewer_LogWindowAdapter::DisplayWarningText(const char* text) { ++this->WarningCount; ProcessVoidEvent( new TEvent( getLogWindow(), text, Qt::black, LogWindow::DisplayNormal )); } -void PVGUI_LogWindowAdapter::DisplayGenericWarningText(const char* text) +void PVViewer_LogWindowAdapter::DisplayGenericWarningText(const char* text) { ++this->GenericWarningCount; ProcessVoidEvent( new TEvent( getLogWindow() , text, Qt::black, LogWindow::DisplayNormal )); diff --git a/src/PVGUI/view/PVGUI_LogWindowAdapter.h b/src/PVGUI/view/PVViewer_LogWindowAdapter.h similarity index 76% rename from src/PVGUI/view/PVGUI_LogWindowAdapter.h rename to src/PVGUI/view/PVViewer_LogWindowAdapter.h index ef539420..cd8332a8 100644 --- a/src/PVGUI/view/PVGUI_LogWindowAdapter.h +++ b/src/PVGUI/view/PVViewer_LogWindowAdapter.h @@ -17,24 +17,24 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifndef _PVGUI_LogWindowAdapter_h -#define _PVGUI_LogWindowAdapter_h +#ifndef _PVViewer_LogWindowAdapter_h +#define _PVViewer_LogWindowAdapter_h #include /*! vtkOutputWindow implementation that puts VTK output messages to SALOME log window. -To use, create an instance of PVGUI_LogWindowAdapter and pass it to the +To use, create an instance of PVViewer_LogWindowAdapter and pass it to the vtkOutputWindow::setInstance() static method. This class is based on pqOutputWindow ParaView class. */ -class PVGUI_LogWindowAdapter : public vtkOutputWindow +class PVViewer_LogWindowAdapter : public vtkOutputWindow { public: - static PVGUI_LogWindowAdapter *New(); - vtkTypeMacro(PVGUI_LogWindowAdapter, vtkOutputWindow); + static PVViewer_LogWindowAdapter *New(); + vtkTypeMacro(PVViewer_LogWindowAdapter, vtkOutputWindow); //! Returns the number of text messages received const unsigned int getTextCount(); @@ -46,10 +46,10 @@ public: const unsigned int getGenericWarningCount(); private: - PVGUI_LogWindowAdapter(); - PVGUI_LogWindowAdapter(const PVGUI_LogWindowAdapter&); - PVGUI_LogWindowAdapter& operator=(const PVGUI_LogWindowAdapter&); - ~PVGUI_LogWindowAdapter(); + PVViewer_LogWindowAdapter(); + PVViewer_LogWindowAdapter(const PVViewer_LogWindowAdapter&); + PVViewer_LogWindowAdapter& operator=(const PVViewer_LogWindowAdapter&); + ~PVViewer_LogWindowAdapter(); unsigned int TextCount; unsigned int ErrorCount; @@ -62,4 +62,4 @@ private: virtual void DisplayGenericWarningText(const char*); }; -#endif // !_PVGUI_LogWindowAdapter_h +#endif // !_PVViewer_LogWindowAdapter_h diff --git a/src/PVGUI/view/PVGUI_ViewManager.cxx b/src/PVGUI/view/PVViewer_ViewManager.cxx similarity index 86% rename from src/PVGUI/view/PVGUI_ViewManager.cxx rename to src/PVGUI/view/PVViewer_ViewManager.cxx index 1688e863..b187ca44 100644 --- a/src/PVGUI/view/PVGUI_ViewManager.cxx +++ b/src/PVGUI/view/PVViewer_ViewManager.cxx @@ -16,11 +16,11 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -46,21 +46,21 @@ #include //---------- Static init ----------------- -pqPVApplicationCore* PVGUI_ViewManager::MyCoreApp = 0; -PARAVIS_ORB::PARAVIS_Gen_var PVGUI_ViewManager::MyEngine; +pqPVApplicationCore* PVViewer_ViewManager::MyCoreApp = 0; +PARAVIS_ORB::PARAVIS_Gen_var PVViewer_ViewManager::MyEngine; /*! Constructor */ -PVGUI_ViewManager::PVGUI_ViewManager( SUIT_Study* study, SUIT_Desktop* desk ) -: SUIT_ViewManager( study, desk, new PVGUI_Viewer() ) +PVViewer_ViewManager::PVViewer_ViewManager( SUIT_Study* study, SUIT_Desktop* desk ) +: SUIT_ViewManager( study, desk, new PVViewer_Viewer() ) { MESSAGE("PARAVIS - view manager created ...") setTitle( tr( "PARAVIEW_VIEW_TITLE" ) ); } -pqPVApplicationCore * PVGUI_ViewManager::GetPVApplication() +pqPVApplicationCore * PVViewer_ViewManager::GetPVApplication() { return MyCoreApp; } @@ -70,7 +70,7 @@ pqPVApplicationCore * PVGUI_ViewManager::GetPVApplication() \param fullSetup whether to instanciate all behaviors or just the minimal ones. \return \c true if ParaView has been initialized successfully, otherwise false */ -bool PVGUI_ViewManager::ParaviewInitApp(SUIT_Desktop * aDesktop) +bool PVViewer_ViewManager::ParaviewInitApp(SUIT_Desktop * aDesktop) { if ( ! MyCoreApp) { // Obtain command-line arguments @@ -96,7 +96,7 @@ bool PVGUI_ViewManager::ParaviewInitApp(SUIT_Desktop * aDesktop) } // Direct VTK log messages to our SALOME window - TODO: review this - vtkOutputWindow::SetInstance(PVGUI_LogWindowAdapter::New()); + vtkOutputWindow::SetInstance(PVViewer_LogWindowAdapter::New()); new pqTabbedMultiViewWidget(); // registers a "MULTIVIEW_WIDGET" on creation @@ -122,22 +122,22 @@ bool PVGUI_ViewManager::ParaviewInitApp(SUIT_Desktop * aDesktop) return true; } -void PVGUI_ViewManager::ParaviewInitBehaviors(bool fullSetup, SUIT_Desktop* aDesktop) +void PVViewer_ViewManager::ParaviewInitBehaviors(bool fullSetup, SUIT_Desktop* aDesktop) { - PVGUI_Behaviors * behav = new PVGUI_Behaviors(aDesktop); + PVViewer_Behaviors * behav = new PVViewer_Behaviors(aDesktop); if(fullSetup) behav->instanciateAllBehaviors(aDesktop); else behav->instanciateMinimalBehaviors(aDesktop); } -void PVGUI_ViewManager::ParaviewCleanup() +void PVViewer_ViewManager::ParaviewCleanup() { // Disconnect from server pqServer* server = pqActiveObjects::instance().activeServer(); if (server && server->isRemote()) { - MESSAGE("~PVGUI_Module(): Disconnecting from remote server ..."); + MESSAGE("~PVViewer_Module(): Disconnecting from remote server ..."); pqServerDisconnectReaction::disconnectFromServer(); } @@ -149,7 +149,7 @@ void PVGUI_ViewManager::ParaviewCleanup() app->deleteLater(); } -PARAVIS_ORB::PARAVIS_Gen_var PVGUI_ViewManager::GetEngine() +PARAVIS_ORB::PARAVIS_Gen_var PVViewer_ViewManager::GetEngine() { // initialize PARAVIS module engine (load, if necessary) if ( CORBA::is_nil( MyEngine ) ) { @@ -160,7 +160,7 @@ PARAVIS_ORB::PARAVIS_Gen_var PVGUI_ViewManager::GetEngine() return MyEngine; } -bool PVGUI_ViewManager::ConnectToExternalPVServer(SUIT_Desktop* aDesktop) +bool PVViewer_ViewManager::ConnectToExternalPVServer(SUIT_Desktop* aDesktop) { pqServer* server = pqActiveObjects::instance().activeServer(); if (server && server->isRemote()) diff --git a/src/PVGUI/view/PVGUI_ViewManager.h b/src/PVGUI/view/PVViewer_ViewManager.h similarity index 89% rename from src/PVGUI/view/PVGUI_ViewManager.h rename to src/PVGUI/view/PVViewer_ViewManager.h index be03a4e7..fe389603 100644 --- a/src/PVGUI/view/PVGUI_ViewManager.h +++ b/src/PVGUI/view/PVViewer_ViewManager.h @@ -16,8 +16,8 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifndef PVGUI_VIEWMANAGER_H -#define PVGUI_VIEWMANAGER_H +#ifndef PVViewer_VIEWMANAGER_H +#define PVViewer_VIEWMANAGER_H #include #include @@ -28,13 +28,13 @@ class SUIT_Study; class pqTabbedMultiViewWidget; class pqPVApplicationCore; -class PVGUI_ViewManager : public SUIT_ViewManager +class PVViewer_ViewManager : public SUIT_ViewManager { Q_OBJECT public: - PVGUI_ViewManager( SUIT_Study*, SUIT_Desktop* ); - ~PVGUI_ViewManager() {} + PVViewer_ViewManager( SUIT_Study*, SUIT_Desktop* ); + ~PVViewer_ViewManager() {} static pqPVApplicationCore * GetPVApplication(); static PARAVIS_ORB::PARAVIS_Gen_var GetEngine(); diff --git a/src/PVGUI/view/PVGUI_ViewModel.cxx b/src/PVGUI/view/PVViewer_ViewModel.cxx similarity index 79% rename from src/PVGUI/view/PVGUI_ViewModel.cxx rename to src/PVGUI/view/PVViewer_ViewModel.cxx index 98039462..ef1771eb 100644 --- a/src/PVGUI/view/PVGUI_ViewModel.cxx +++ b/src/PVGUI/view/PVViewer_ViewModel.cxx @@ -17,8 +17,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "PVGUI_ViewModel.h" -#include "PVGUI_ViewWindow.h" +#include "PVViewer_ViewModel.h" +#include "PVViewer_ViewWindow.h" #include #include @@ -26,10 +26,10 @@ #include //---------------------------------------- -PVGUI_Viewer::PVGUI_Viewer() +PVViewer_Viewer::PVViewer_Viewer() :SUIT_ViewModel() { - MESSAGE("PVGUI_Viewer: creating view model ..."); + MESSAGE("PVViewer_Viewer: creating view model ..."); } @@ -37,9 +37,9 @@ PVGUI_Viewer::PVGUI_Viewer() Create new instance of view window on desktop \a theDesktop. \retval SUIT_ViewWindow* - created view window pointer. */ -SUIT_ViewWindow* PVGUI_Viewer::createView(SUIT_Desktop* theDesktop) +SUIT_ViewWindow* PVViewer_Viewer::createView(SUIT_Desktop* theDesktop) { - PVGUI_ViewWindow* aPVView = new PVGUI_ViewWindow(theDesktop, this); + PVViewer_ViewWindow* aPVView = new PVViewer_ViewWindow(theDesktop, this); return aPVView; } diff --git a/src/PVGUI/view/PVGUI_ViewModel.h b/src/PVGUI/view/PVViewer_ViewModel.h similarity index 84% rename from src/PVGUI/view/PVGUI_ViewModel.h rename to src/PVGUI/view/PVViewer_ViewModel.h index 664d15ef..6463c7ac 100644 --- a/src/PVGUI/view/PVGUI_ViewModel.h +++ b/src/PVGUI/view/PVViewer_ViewModel.h @@ -16,8 +16,8 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#if !defined(_PVGUI_VIEWMODEL_H) -#define _PVGUI_VIEWMODEL_H +#if !defined(_PVViewer_VIEWMODEL_H) +#define _PVViewer_VIEWMODEL_H #include @@ -25,13 +25,13 @@ class SUIT_ViewWindow; class SUIT_Desktop; class SUIT_Desktop; -class PVGUI_Viewer: public SUIT_ViewModel +class PVViewer_Viewer: public SUIT_ViewModel { Q_OBJECT public: - PVGUI_Viewer(); - virtual ~PVGUI_Viewer() {} + PVViewer_Viewer(); + virtual ~PVViewer_Viewer() {} virtual SUIT_ViewWindow* createView(SUIT_Desktop* theDesktop); virtual QString getType() const { return Type(); } @@ -39,5 +39,5 @@ public: }; -#endif // !defined(_PVGUI_VIEWMODEL_H) +#endif // !defined(_PVViewer_VIEWMODEL_H) diff --git a/src/PVGUI/view/PVGUI_ViewWindow.cxx b/src/PVGUI/view/PVViewer_ViewWindow.cxx similarity index 82% rename from src/PVGUI/view/PVGUI_ViewWindow.cxx rename to src/PVGUI/view/PVViewer_ViewWindow.cxx index a976975b..84e37f0e 100644 --- a/src/PVGUI/view/PVGUI_ViewWindow.cxx +++ b/src/PVGUI/view/PVViewer_ViewWindow.cxx @@ -16,11 +16,11 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : PVGUI_ViewWindow.cxx +// File : PVViewer_ViewWindow.cxx // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // -#include "PVGUI_ViewWindow.h" +#include "PVViewer_ViewWindow.h" #include #include @@ -31,7 +31,7 @@ #include /*! - \class PVGUI_ViewWindow + \class PVViewer_ViewWindow \brief PVGUI view window. */ @@ -40,7 +40,7 @@ \param theDesktop parent desktop window \param theModel plt2d view model */ -PVGUI_ViewWindow::PVGUI_ViewWindow( SUIT_Desktop* theDesktop, PVGUI_Viewer* theModel ) +PVViewer_ViewWindow::PVViewer_ViewWindow( SUIT_Desktop* theDesktop, PVViewer_Viewer* theModel ) : SUIT_ViewWindow( theDesktop ), myPVMgr( 0 ) { myModel = theModel; @@ -57,10 +57,10 @@ PVGUI_ViewWindow::PVGUI_ViewWindow( SUIT_Desktop* theDesktop, PVGUI_Viewer* theM /*! \brief Destructor. As pqViewManager persists through the whole session, - the destructor first removes it from the children of this PVGUI_ViewWindow + the destructor first removes it from the children of this PVViewer_ViewWindow to prevent its unexpected deletion. */ -PVGUI_ViewWindow::~PVGUI_ViewWindow() +PVViewer_ViewWindow::~PVViewer_ViewWindow() { if ( myPVMgr ) { myPVMgr->setParent( 0 ); @@ -74,7 +74,7 @@ PVGUI_ViewWindow::~PVGUI_ViewWindow() \brief Get the visual parameters of the view window. \return visual parameters of this view window formatted to the string */ -QString PVGUI_ViewWindow::getVisualParameters() +QString PVViewer_ViewWindow::getVisualParameters() { return SUIT_ViewWindow::getVisualParameters(); } @@ -83,7 +83,7 @@ QString PVGUI_ViewWindow::getVisualParameters() \brief Restore visual parameters of the view window from the formated string \param parameters view window visual parameters */ -void PVGUI_ViewWindow::setVisualParameters( const QString& parameters ) +void PVViewer_ViewWindow::setVisualParameters( const QString& parameters ) { SUIT_ViewWindow::setVisualParameters( parameters ); } @@ -92,7 +92,7 @@ void PVGUI_ViewWindow::setVisualParameters( const QString& parameters ) /*! \brief Returns the ParaView multi-view manager previously set with setMultiViewManager() */ -pqTabbedMultiViewWidget* PVGUI_ViewWindow::getMultiViewManager() const +pqTabbedMultiViewWidget* PVViewer_ViewWindow::getMultiViewManager() const { return myPVMgr; } diff --git a/src/PVGUI/view/PVGUI_ViewWindow.h b/src/PVGUI/view/PVViewer_ViewWindow.h similarity index 84% rename from src/PVGUI/view/PVGUI_ViewWindow.h rename to src/PVGUI/view/PVViewer_ViewWindow.h index 48f97c29..fb5dd106 100644 --- a/src/PVGUI/view/PVGUI_ViewWindow.h +++ b/src/PVGUI/view/PVViewer_ViewWindow.h @@ -20,23 +20,23 @@ // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // -#ifndef PVGUI_VIEWWINDOW_H -#define PVGUI_VIEWWINDOW_H +#ifndef PVViewer_VIEWWINDOW_H +#define PVViewer_VIEWWINDOW_H #include #include class SUIT_Desktop; -class PVGUI_Viewer; +class PVViewer_Viewer; class pqTabbedMultiViewWidget; -class PVGUI_ViewWindow : public SUIT_ViewWindow +class PVViewer_ViewWindow : public SUIT_ViewWindow { Q_OBJECT public: - PVGUI_ViewWindow( SUIT_Desktop*, PVGUI_Viewer* ); - virtual ~PVGUI_ViewWindow(); + PVViewer_ViewWindow( SUIT_Desktop*, PVViewer_Viewer* ); + virtual ~PVViewer_ViewWindow(); virtual QString getVisualParameters(); virtual void setVisualParameters( const QString& ); @@ -44,7 +44,7 @@ public: pqTabbedMultiViewWidget* getMultiViewManager() const; private: - PVGUI_Viewer* myModel; + PVViewer_Viewer* myModel; pqTabbedMultiViewWidget* myPVMgr; }; -- 2.39.2