Copyright update 2022

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

diff --git a/src/MEDCalc/gui/WorkspaceController.hxx b/src/MEDCalc/gui/WorkspaceController.hxx
index 45bc32927c91ec253f7e16faf5cc9fd271100d1b..503e39f55c3150051af06fc506b4f4e3e40996ef 100644 (file)
--- a/src/MEDCalc/gui/WorkspaceController.hxx
+++ b/src/MEDCalc/gui/WorkspaceController.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2022  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
@@ -22,18 +22,22 @@
 #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>
 #include CORBA_CLIENT_HEADER(MEDDataManager)
-#include <StandardApp_Module.hxx>
+#include <SalomeApp_Module.h>
 
 #include <vector>
 
+class MEDModule;
+
 /*!
  * This class defines a DockWidget plugged in the SALOME application,
  * and containing a tree view for rendering a hierarchical data
@@ -44,41 +48,44 @@ class MEDCALCGUI_EXPORT WorkspaceController: public TreeGuiManager {
   Q_OBJECT
 
 public:
-  WorkspaceController(StandardApp_Module * 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:
-  XmedConsoleDriver * _consoleDriver;
-  StandardApp_Module * _salomeModule;
   void _importItem(QString itemNameId);
   void _importItemList(QStringList itemNameIdList);
-  void _importFieldIntoConsole(MEDCALC::FieldHandler * fieldHandler,
-              bool askForOptions,
-              const char * alias=NULL);
+  void _importFieldIntoConsole(MEDCALC::FieldHandler* fieldHandler,
+                               bool askForOptions,
+                               const char* alias=NULL);
 
   void _exportItemList(QStringList itemNameIdList);
   void _saveItemList(QStringList itemNameIdList);
   void _removeItemList(QStringList itemNameIdList);
   void _viewItemList(QStringList itemNameIdList);
 
-  MEDEventListener_i * _medEventListener;
+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 {