X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FDatasourceController.hxx;h=ec318fdf0e9836f07c495ab1240582b72a27d871;hb=c933321e259af4968b2469c1d4f6b7ac5178e294;hp=a1f0b6fdf2866da383588b368bcc65c9fbbc061f;hpb=e417eb14540b5836898a72890f924ca575af3b3b;p=modules%2Fmed.git

diff --git a/src/MEDCalc/gui/DatasourceController.hxx b/src/MEDCalc/gui/DatasourceController.hxx
index a1f0b6fdf..ec318fdf0 100644
--- a/src/MEDCalc/gui/DatasourceController.hxx
+++ b/src/MEDCalc/gui/DatasourceController.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,14 +25,12 @@
 #include "MEDEventListener_i.hxx"
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(MEDDataManager)
-#include <StandardApp_Module.hxx>
-#include <SALOME_AppStudyEditor.hxx>
 
-#include <map>
+#include <SalomeApp_Module.h>
+#include <SALOME_AppStudyEditor.hxx>
+#include <MEDPresentation.hxx>
 
 #include "XmedDataModel.hxx"
-#include "DlgChangeUnderlyingMesh.hxx"
-#include "DlgInterpolateField.hxx"
 #include "MEDCALCGUI.hxx"
 //
 // The DatasourceController defines data structures and classes to
@@ -54,16 +52,25 @@ typedef struct {
     EVENT_IMPORT_OBJECT, // Simply import the object in the workspace
     EVENT_USE_OBJECT,    // Import in the workspace AND define a proxy
                          // variable in the tui console to use it
+    // presentations
+    EVENT_VIEW_OBJECT_CONTOUR,
+    EVENT_VIEW_OBJECT_DEFLECTION_SHAPE,
+    EVENT_VIEW_OBJECT_POINT_SPRITE,
     EVENT_VIEW_OBJECT_SCALAR_MAP,
+    EVENT_VIEW_OBJECT_SLICES,
+    EVENT_VIEW_OBJECT_VECTOR_FIELD,
     // these ones forward actions to workspace (and then to python console)
     EVENT_ADD_DATASOURCE,
-    EVENT_ADD_IMAGE_AS_DATASOURCE
+    EVENT_ADD_IMAGE_AS_DATASOURCE,
+    EVENT_ADD_PRESENTATION
   };
   int eventtype;
-  XmedDataObject * objectdata;
+  XmedDataObject* objectdata;
   QString objectalias;
 } DatasourceEvent;
 
+class MEDModule;
+
 //
 // ==============================================================
 // Datasource controller
@@ -73,41 +80,30 @@ class MEDCALCGUI_EXPORT DatasourceController: public QObject {
   Q_OBJECT
 
 public:
-  DatasourceController(StandardApp_Module * salomeModule);
+  DatasourceController(MEDModule* salomeModule);
   ~DatasourceController();
 
   void createActions();
 
 public slots:
-  // Callback connected to dialog box validation signals
-  void OnChangeUnderlyingMeshInputValidated();
-  void OnInterpolateFieldInputValidated();
-  void processWorkspaceEvent(const MEDCALC::MedEvent * event);
+  void processWorkspaceEvent(const MEDCALC::MedEvent* event);
 
 signals:
-  void datasourceSignal(const DatasourceEvent * event);
+  void datasourceSignal(const DatasourceEvent* event);
 
 protected slots:
   void OnAddDatasource();
   void OnAddImagesource();
   void OnExpandField();
-  void OnVisualizeScalarMap();
   void OnUseInWorkspace();
-  void OnChangeUnderlyingMesh();
-  void OnInterpolateField();
 
 private:
-  void visualize(DatasourceEvent::EventType);
   void addDatasource(const char* filename);
   void updateTreeViewWithNewDatasource(const MEDCALC::DatasourceHandler*);
 
 private:
-  StandardApp_Module * _salomeModule;
-  SALOME_AppStudyEditor * _studyEditor;
-
-  DlgChangeUnderlyingMesh * _dlgChangeUnderlyingMesh;
-  DlgInterpolateField * _dlgInterpolateField;
-
+  MEDModule* _salomeModule;
+  SALOME_AppStudyEditor* _studyEditor; // borrowed to MEDModule
 };
 
 #endif