Merge 'master' branch into 'V9_dev' branch.

[modules/med.git] / src / MEDCalc / gui / WorkspaceController.hxx

diff --git a/src/MEDCalc/gui/WorkspaceController.hxx b/src/MEDCalc/gui/WorkspaceController.hxx
index 969fab86a63015a1fe5101b341973d9ad8d1079c..d07458ed48e8d70f8f98e803b0329d0e36097d01 100644 (file)
--- a/src/MEDCalc/gui/WorkspaceController.hxx
+++ b/src/MEDCalc/gui/WorkspaceController.hxx
@@ -22,10 +22,12 @@
 #ifndef _WORKSPACE_CONTROLLER_HXX
 #define _WORKSPACE_CONTROLLER_HXX
 
-#include "TreeGuiManager.hxx"
 #include "MEDEventListener_i.hxx"
+#include "TreeGuiManager.hxx"
 #include "XmedConsoleDriver.hxx"
 #include "DatasourceController.hxx"
+#include "PresentationController.hxx"
+#include "ProcessingController.hxx"
 #include "MEDCALCGUI.hxx"
 
 #include <SALOMEconfig.h>
@@ -46,43 +48,44 @@ class MEDCALCGUI_EXPORT WorkspaceController: public TreeGuiManager {
   Q_OBJECT
 
 public:
-  WorkspaceController(MEDModule * salomeModule);
+  WorkspaceController(MEDModule* salomeModule);
   ~WorkspaceController();
 
   void createActions();
+  XmedConsoleDriver* getConsoleDriver() { return _consoleDriver; }
 
 public slots:
-  // Slots overiding TreeGuiManager
+  // Slots overriding TreeGuiManager
   void processItemList(QStringList itemNameIdList, int actionId);
 
   // Internal slots
-  void processMedEvent(const MEDCALC::MedEvent * event);
-  void processDatasourceEvent(const DatasourceEvent * event);
+  void processMedEvent(const MEDCALC::MedEvent* event);
+  void processDatasourceEvent(const DatasourceEvent* event);
+  void processProcessingEvent(const ProcessingEvent* event);
   void OnSaveWorkspace();
   void OnCleanWorkspace();
 
 signals:
-  void workspaceSignal(const MEDCALC::MedEvent * event);
+  void workspaceSignal(const MEDCALC::MedEvent* event);
 
 private:
   void _importItem(QString itemNameId);
   void _importItemList(QStringList itemNameIdList);
-  void _importFieldIntoConsole(MEDCALC::FieldHandler * fieldHandler,
+  void _importFieldIntoConsole(MEDCALC::FieldHandler* fieldHandler,
                                bool askForOptions,
-                               const char * alias=NULL);
+                               const char* alias=NULL);
 
   void _exportItemList(QStringList itemNameIdList);
   void _saveItemList(QStringList itemNameIdList);
   void _removeItemList(QStringList itemNameIdList);
   void _viewItemList(QStringList itemNameIdList);
-  QString _getViewMode();
 
 private:
-  XmedConsoleDriver * _consoleDriver;
-  MEDModule * _salomeModule;
-  MEDEventListener_i * _medEventListener;
+  XmedConsoleDriver* _consoleDriver;
+  MEDModule* _salomeModule;
+  MEDEventListener_i* _medEventListener;
 
-  // This structure is intended to memorized in a bundle the whole set
+  // This structure is intended to memorize in a bundle the whole set
   // of integers identifying the actions of the popup menu associated
   // to the TreeView embedded in this TreeGuiManager
   typedef struct {