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 b53c73db5fe2003deaf70e95f425e807c81b0a02..d07458ed48e8d70f8f98e803b0329d0e36097d01 100644 (file)
--- a/src/MEDCalc/gui/WorkspaceController.hxx
+++ b/src/MEDCalc/gui/WorkspaceController.hxx
@@ -22,11 +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>
@@ -51,15 +52,16 @@ public:
   ~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 processPresentationEvent(const PresentationEvent* event);
+  void processProcessingEvent(const ProcessingEvent* event);
   void OnSaveWorkspace();
   void OnCleanWorkspace();
 
@@ -77,15 +79,13 @@ private:
   void _saveItemList(QStringList itemNameIdList);
   void _removeItemList(QStringList itemNameIdList);
   void _viewItemList(QStringList itemNameIdList);
-  QString _getViewMode();
-  QString _getColorMap();
 
 private:
   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 {