From 5688ded91e1ba4c8c71ab220fb273aa76af5df01 Mon Sep 17 00:00:00 2001 From: san Date: Wed, 17 Dec 2008 14:56:05 +0000 Subject: [PATCH] Minor changes --- INSTALL | 4 ++-- src/PVGUI/PVGUI_Module.cxx | 30 ++++-------------------------- src/PVGUI/PVGUI_Module.h | 19 ++----------------- 3 files changed, 8 insertions(+), 45 deletions(-) diff --git a/INSTALL b/INSTALL index d5637fda..ecaacbc7 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Building and installing PARAVIS module PARAVIS is a light SALOME module that wraps ParaView GUI and makes it available in SALOME GUI. -As any other SALOME module, PARAVIS requires PARAVIS_ROOT_DIR environment variable to be set to PARAVIS +Like any other SALOME module, PARAVIS requires PARAVIS_ROOT_DIR environment variable to be set to PARAVIS installation directory. Specific prerequisites: @@ -18,7 +18,7 @@ Environment variables needed for correct detection of ParaView location: ParaView should not be installed, its build directory is used instead). It also requires common SALOME environment including GUI_ROOT_DIR and -other standard SALOME prerequsites. +other standard SALOME prerequisites. As soon as the environment is set, execute the following commands in a shell: diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index cb5fe5be..0a558e42 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -215,7 +215,10 @@ PVGUI_ProcessModuleHelper* PVGUI_Module::pqImplementation::myPVHelper = 0; menu and toolbar commands using SALOME menu and toolbar managers, connecting the actions to %pqMainWindowCore slots or to the module's slots in some cases. It also sets up dock widgets for ParaView widgets, such as object inspector, pipeline browser, etc. - As both SALOME destop and ParaView main winodw classes inherit QMainWindow and %pqMainWindowCore deals with QMainWindow API to control + ParaView GUI resources (icons) are reused directly from the ParaView resource directory, they are loaded into SALOME GUI + resource manager, the path to these icons is specified in PARAVIS configuration XML files (LightApp.xml and SlomeApp.xml). + + As both SALOME destop and ParaView main window classes inherit QMainWindow and %pqMainWindowCore deals with QMainWindow API to control menus, tollbars and dock widgets, its integration into SALOME GUI is straightforward and smooth.

Multi-view manager

@@ -245,31 +248,6 @@ PVGUI_ProcessModuleHelper* PVGUI_Module::pqImplementation::myPVHelper = 0; on its own if needed. */ -/* - A link to the file documentation PVGUI_Module_actions.cxx - - A link to the file documentation PVGUI_Module_impl.h - - A link to the class documentation PVGUI_Module - - The class name as a text (not a link to its documentation) %PVGUI_Module - - A link to the constructor of the class PVGUI_ViewWindow#PVGUI_ViewWindow or PVGUI_Module::PVGUI_Module() - - A link to the destructor of the class PVGUI_ViewWindow#~PVGUI_ViewWindow - - A link to the member function PVGUI_ViewWindow::getVisualParameters or PVGUI_ViewWindow#getVisualParameters - - Arguments of a function should be specified only for the overloaded functions PVGUI_Module::initialize(CAM_Application*) - - A link to some enumeration values PVGUI_Module::OpenFileId and PVGUI_Module::CreateLookmarkId - - A link to a protected member variable of the class PVGUI_ViewWindow#myModel - - A link to a variable \link PVGUI_ViewWindow#myModel using another text\endlink as a link - -*/ - /*! \class PVGUI_Module \brief Implementation of light (no-CORBA-engine) diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h index 6918361e..f6802684 100644 --- a/src/PVGUI/PVGUI_Module.h +++ b/src/PVGUI/PVGUI_Module.h @@ -144,17 +144,6 @@ class PVGUI_Module : public LightApp_Module AboutParaViewId, ParaViewHelpId, EnableTooltipsId - - /* - lgLoadFile = 931, //!< load text file - lgSaveFile, //!< save text file - lgDisplayLine, //!< display selected line - lgEraseLine, //!< erase selected line - lgEditLine, //!< edit selected line - lgAddLine, //!< insert new line - lgDelLine, //!< delete selected line - lgClear //!< clear all contents - */ }; public: @@ -164,8 +153,6 @@ public: virtual void initialize( CAM_Application* ); virtual void windows( QMap& ) const; - //virtual LightApp_Selection* createSelection() const; - pqViewManager* getMultiViewManager() const; virtual bool eventFilter( QObject*, QEvent* ); @@ -186,12 +173,10 @@ private: //! Create actions for ParaView GUI operations void pvCreateActions(); - //! Create menus for ParaView GUI operations - //! duplicating menus in pqMainWindow ParaView class + //! Create menus for ParaView GUI operations duplicating menus in pqMainWindow ParaView class void pvCreateMenus(); - //! Create toolbars for ParaView GUI operations - //! duplicating toolbars in pqMainWindow ParaView class + //! Create toolbars for ParaView GUI operations duplicating toolbars in pqMainWindow ParaView class void pvCreateToolBars(); //! Create dock widgets for ParaView widgets -- 2.39.2