X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FDatasourceController.hxx;h=7d9e5bef233059a94ad8ea8e71a71895c0eb39f3;hb=b20f7e235416dfe68ef29bc5ea806a776a5bdd73;hp=a6b2cf68702b3321e0ffd75992de2d677aa923ef;hpb=10e479e70a8c12d2ed92af46375266826616cf2c;p=modules%2Fmed.git

diff --git a/src/MEDCalc/gui/DatasourceController.hxx b/src/MEDCalc/gui/DatasourceController.hxx
index a6b2cf687..7d9e5bef2 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-2016  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
@@ -31,8 +31,6 @@
 #include <MEDPresentation.hxx>
 
 #include "XmedDataModel.hxx"
-#include "DlgChangeUnderlyingMesh.hxx"
-#include "DlgInterpolateField.hxx"
 #include "MEDCALCGUI.hxx"
 //
 // The DatasourceController defines data structures and classes to
@@ -54,14 +52,20 @@ 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_PRESENTATION
   };
   int eventtype;
-  XmedDataObject * objectdata;
+  XmedDataObject* objectdata;
   QString objectalias;
 } DatasourceEvent;
 
@@ -76,42 +80,30 @@ class MEDCALCGUI_EXPORT DatasourceController: public QObject {
   Q_OBJECT
 
 public:
-  DatasourceController(MEDModule * 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*);
-  void updateTreeViewWithNewPresentation(long fieldId, long presentationId);
 
 private:
   MEDModule* _salomeModule;
-  SALOME_AppStudyEditor * _studyEditor;
-
-  DlgChangeUnderlyingMesh * _dlgChangeUnderlyingMesh;
-  DlgInterpolateField * _dlgInterpolateField;
-
+  SALOME_AppStudyEditor* _studyEditor; // borrowed to MEDModule
 };
 
 #endif