X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPVGUI%2FPVGUI_Module.h;h=0b30e767f72741eb8006aa13d4bc198d7a372652;hb=866822387420d8da61654fcabf49a9e51308c507;hp=dad5800a96f646fbd797c995acd760ac49d99af3;hpb=45730a713833b123768d9e895d06ffd86bca71d0;p=modules%2Fparavis.git

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index dad5800a..0b30e767 100644
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -1,12 +1,11 @@
 // PARAVIS : ParaView wrapper SALOME module
 //
-// Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 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
@@ -30,6 +29,9 @@
 #include <SalomeApp_Module.h>
 
 #include <ostream>
+#include <vtkType.h>
+
+#include <pqVariableType.h>
 
 class QMenu;
 class QDockWidget;
@@ -37,8 +39,15 @@ class QToolBar;
 class vtkPVMain;
 class pqOptions;
 class pqServer;
-class pqViewManager;
+class pqTabbedMultiViewWidget;
 class pqMainWindowCore;
+class vtkEventQtSlotConnect;
+class pqPythonScriptEditor;
+class pqPVApplicationCore;
+class pqDataRepresentation;
+class pqRepresentation;
+
+class PyConsole_Interp;
 
 class PVGUI_Module : public SalomeApp_Module
 {
@@ -46,104 +55,85 @@ class PVGUI_Module : public SalomeApp_Module
    
   //! Menu actions
   enum { // Menu "File"
-         OpenFileId,
-
-	 LoadStateId,
-	 SaveStateId,
-
-	 SaveDataId,
-	 SaveScreenshotId,
-	 ExportId,
-
-	 SaveAnimationId,
-	 SaveGeometryId,
-
-	 ConnectId,
-	 DisconnectId,
-
-	 // Menu "Edit"
-	 UndoId,
-	 RedoId,
-
-	 CameraUndoId,
-	 CameraRedoId,
-
-	 ChangeInputId,
-   IgnoreTimeId, 
-	 DeleteId,
-	 DeleteAllId,
-
-	 //InteractId,
-	 //SelectCellsOnId,
-	 //SelectPointsOnId,
-	 //SelectCellsThroughId,
-	 //SelectPointsThroughId,
-	 //SelectBlockId,
-
-	 SettingsId,
-	 ViewSettingsId,
-
-	 // Menu "View"
-   FullScreenId, 
-// 	 ResetCameraId,
-// 	 PositiveXId,
-// 	 NegativeXId,
-// 	 PositiveYId,
-// 	 NegativeYId,
-// 	 PositiveZId,
-// 	 NegativeZId,
-// 
-// 	 ShowCenterId,
-// 	 ResetCenterId,
-// 	 PickCenterId,
-// 	 ShowColorLegendId,
-// 	 EditColorMapId,
-// 	 ResetRangeId,
-// 
-// 	 AnimationInspectorId,
-// 	 AnimationViewId,
-// 	 ComparativeViewInspectorId,
-// 	 SelectionInspectorId,
-// 	 LookmarkBrowserId,
-// 	 LookmarkInspectorId,
-// 	 ObjectInspectorId,
-// 	 PipelineBrowserId,
-// 	 StatisticsViewId,
-
-	 // Menu "Sources"
-	 // TODO...
-
-	 // Menu "Filters"
-	 // TODO...
-
-	 // Menu "Animation"
-	 FirstFrameId,
-	 PreviousFrameId,
-	 PlayId,
-	 NextFrameId,
-	 LastFrameId,
-	 LoopId,
-
-	 // Menu "Tools" 
-	 CreateCustomFilterId,
-	 ManageCustomFiltersId,
-	 CreateLookmarkId,
-	 ManageLinksId,
-	 AddCameraLinkId,
-	 ManagePluginsExtensionsId,
-	 DumpWidgetNamesId,
-	 RecordTestId,
-	 RecordTestScreenshotId,
-	 PlayTestId,
-	 MaxWindowSizeId,
-	 TimerLogId,
-	 OutputWindowId,
-	 PythonShellId,
-
-	 // Menu "Help" 
-	 AboutParaViewId,
-	 ParaViewHelpId,
-	 EnableTooltipsId
+     OpenFileId,
+
+     LoadStateId,
+     SaveStateId,
+
+     SaveDataId,
+     SaveScreenshotId,
+     ExportId,
+
+     SaveAnimationId,
+     SaveGeometryId,
+
+     ConnectId,
+     DisconnectId,
+
+     // Menu "Edit"
+     UndoId,
+     RedoId,
+
+     CameraUndoId,
+     CameraRedoId,
+
+     FindDataId,
+     ChangeInputId,
+     IgnoreTimeId,
+     DeleteId,
+     DeleteAllId,
+
+     SettingsId,
+     ViewSettingsId,
+
+     // Menu "View"
+     FullScreenId,
+
+     // Menu "Animation"
+     FirstFrameId,
+     PreviousFrameId,
+     PlayId,
+     NextFrameId,
+     LastFrameId,
+     LoopId,
+
+     // Menu "Tools"
+     CreateCustomFilterId,
+     ManageCustomFiltersId,
+     CreateLookmarkId,
+     ManageLinksId,
+     AddCameraLinkId,
+     ManagePluginsExtensionsId,
+     DumpWidgetNamesId,
+     RecordTestId,
+     RecordTestScreenshotId,
+     PlayTestId,
+     MaxWindowSizeId,
+     CustomWindowSizeId,
+     TimerLogId,
+     OutputWindowId,
+     PythonShellId,
+     ShowTraceId,
+     RestartTraceId,
+
+     // Menu "Help"
+     AboutParaViewId,
+     ParaViewHelpId,
+     EnableTooltipsId,
+
+     // Menu "Window" - "New Window"
+     ParaViewNewWindowId,
+
+     // "Save state" ParaVis module root object popup
+     SaveStatePopupId,
+
+     // "Add state" and "Reload state" popups
+     AddStatePopupId,
+     CleanAndAddStatePopupId,
+
+     // "Rename" and "Delete" popups (Object Browser)
+     ParaVisRenameId,
+     ParaVisDeleteId
   };
 
 public:
@@ -153,19 +143,15 @@ public:
   virtual void           initialize( CAM_Application* );
   virtual void           windows( QMap<int, int>& ) const;
 
-  pqViewManager*         getMultiViewManager() const;
+  pqTabbedMultiViewWidget*         getMultiViewManager() const;
 
   virtual QString engineIOR() const;
 
-  /*! Compares the contents of the window with the given reference image,
-   * returns true if they "match" within some tolerance
-   */
-  /*bool                   compareView( const QString& ReferenceImage, double Threshold,
-    std::ostream& Output, const QString& TempDirectory );*/
-
   void openFile(const char* theName);
+  void executeScript(const char *script);
   void saveParaviewState(const char* theFileName);
   void loadParaviewState(const char* theFileName);
+  void clearParaviewState();
 
   QString getTraceString();
   void saveTrace(const char* theName);
@@ -174,6 +160,8 @@ public:
 
   virtual void createPreferences();
 
+  virtual void contextMenuPopup(const QString& theClient, QMenu* theMenu, QString& theTitle);
+
 public slots:
   void onImportFromVisu(QString theEntry);
 
@@ -204,30 +192,82 @@ private:
 
   //! Returns QMenu object for a given menu id
   QMenu*                 getMenu( const int );
+  
+  //! Discover help project files from the resources.
+  QString getHelpFileName();
 
   void                   deleteTemporaryFiles();
   
-  QList<QToolBar*>       getParaViewToolbars();
+  //QList<QToolBar*>       getParaViewToolbars();
+
+  //! Create actions for ParaViS
+  void createActions();
+
+  //! Create menus for ParaViS
+  void createMenus();
+
+  //! Load selected state
+  void loadSelectedState(bool toClear);
+
+  //! Get list of embedded macros files
+  QStringList getEmbeddedMacrosList();
+
+  //! update macros state
+  void updateMacros();
+
+  //! store visibility of the common dockable windows (OB, PyConsole, ... etc.)
+  void storeCommonWindowsState();
+
+  //! restore visibility of the common dockable windows (OB, PyConsole, ... etc.)
+  void restoreCommonWindowsState();
+
+  //! run Python command (either in SALOME's Python interpreter, or in ParaView's Python's interpreter)
+  void execPythonCommand(const QString& cmd, bool inSalomeConsole=false);
 
 private slots:
 
-  void showHelpForProxy( const QString& proxy );
+  void showHelpForProxy( const QString&, const QString& );
   
   void onPreAccept();
   void onPostAccept();
   void endWaitCursor();
 
-  void activateTrace();
+  //  void buildToolbarsMenu();
 
-  void buildToolbarsMenu();
+  //void showParaViewHelp();
+  //void showHelp(const QString& url);
 
-  void showParaViewHelp();
-  void showHelp(const QString& url);
+  void onFinishedAddingServer(pqServer*);
+  void onDataRepresentationCreated(pqDataRepresentation*);
+  void onDataRepresentationUpdated();
+  void onVariableChanged(pqVariableType, const QString);
+  void onRepresentationChanged(pqRepresentation*);
+
+  void onStartProgress();
+  void onEndProgress();
+  void onShowTrace();
+  void onRestartTrace();
+
+  void onNewParaViewWindow();
+
+  void onSaveMultiState();
+  void onAddState();
+  void onCleanAddState();
+
+  void onRename();
+  void onDelete();
 
 public slots:
   virtual bool           activateModule( SUIT_Study* );
   virtual bool           deactivateModule( SUIT_Study* );
   virtual void           onApplicationClosed( SUIT_Application* );
+  virtual void           studyClosed( SUIT_Study* );
+
+protected slots:
+  virtual void           onModelOpened();
+
+protected:
+  void timerEvent(QTimerEvent *event);
 
 private:
   class pqImplementation;
@@ -238,14 +278,28 @@ private:
   int                    myFiltersMenuId;
   int                    myToolbarsMenuId;
   int                    myMacrosMenuId;
+  int                    myRecentMenuId;
+  
+  typedef QMap<QWidget*, bool> WgMap;
+  WgMap                  myDockWidgets;
+  WgMap                  myToolbars;
+  WgMap                  myToolbarBreaks;
+  QList<QMenu*>          myMenus;
 
-  QList<QDockWidget*>    myDockWidgets;
+  typedef QMap<int, bool> DockWindowMap;         
+  DockWindowMap           myCommonMap; 
 
   QStringList            myTemporaryFiles;
 
-  QMap<QToolBar*, bool>  myToolbarState;
-
   QtMsgHandler           myOldMsgHandler;
+
+  vtkEventQtSlotConnect *VTKConnect;
+
+  pqPythonScriptEditor* myTraceWindow;
+
+  int myStateCounter;
+
+  static pqPVApplicationCore* MyCoreApp;
 };
 
 #endif // PVGUI_Module_H