Merge master branch into V9_dev.

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

diff --git a/src/MEDCalc/gui/PresentationController.hxx b/src/MEDCalc/gui/PresentationController.hxx
index 9d92c1b0a9fc4f3d9271de428db4ab26775efabe..dcc16516c5a5ffd191804d94595251e57c690333 100644 (file)
--- a/src/MEDCalc/gui/PresentationController.hxx
+++ b/src/MEDCalc/gui/PresentationController.hxx
@@ -20,10 +20,11 @@
 #ifndef PRESENTATION_CONTROLLER_HXX
 #define PRESENTATION_CONTROLLER_HXX
 
+#include "MEDEventListener_i.hxx"
+
 #include <QObject>
 #include "MEDCALCGUI.hxx"
 
-#include "MEDEventListener_i.hxx"
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MEDPresentationManager)
 #include CORBA_CLIENT_HEADER(MEDDataManager)
@@ -48,9 +49,9 @@ public:
 
   void createActions();
 
-  MEDCALC::MEDPresentationViewMode getSelectedViewMode() const;
-  MEDCALC::MEDPresentationColorMap getSelectedColorMap() const;
-  MEDCALC::MEDPresentationScalarBarRange getSelectedScalarBarRange() const;
+  MEDCALC::ViewModeType getSelectedViewMode() const;
+  MEDCALC::ColorMapType getSelectedColorMap() const;
+  MEDCALC::ScalarBarRangeType getSelectedScalarBarRange() const;
 
   void showDockWidgets(bool isVisible);
 
@@ -76,24 +77,24 @@ protected slots:
   void onPresentationSelected(int presId, const QString& presType, const QString& presName);
 
   void processWorkspaceEvent(const MEDCALC::MedEvent*);
-  void processPresentationEvent(const PresentationEvent* event);
+  void processPresentationEvent(const PresentationEvent*);
 
 private:
   void visualize(PresentationEvent::EventType);
-  void updateTreeViewWithNewPresentation(long, long);
-  void updateTreeViewForPresentationRemoval(long);
+  void updateTreeViewWithNewPresentation(long dataId, long presentationId);
+  void updateTreeViewForPresentationRemoval(long presId);
   std::string _getIconName(const std::string&);
   MEDWidgetHelper * findOrCreateWidgetHelper(MEDCALC::MEDPresentationManager_ptr presManager,
                                              int presId, const std::string& type, const std::string& name);
 
-  int getIntParamFromStudyEditor(SALOMEDS::SObject_var obj, const char * name);
-
   QString getViewModePython() const;
   QString getColorMapPython() const;
   QString getScalarBarRangePython() const;
   QString getMeshModePython(const int mode) const;
   QString getSliceOrientationPython(const int orient) const;
 
+  void _dealWithReplaceMode();
+
 private:
   MEDModule* _salomeModule;
   XmedConsoleDriver* _consoleDriver;   // the same as in WorkspaceController