Merge remote-tracking branch 'origin/V8_3_BR' into gdd/python3_dev

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

diff --git a/src/MEDCalc/gui/MEDModule.hxx b/src/MEDCalc/gui/MEDModule.hxx
index d32a1c93cd5737a8a0431a96f45aa37cedb57043..9cbfc070cec9909deabb0bc6ce23b03617529bbc 100644 (file)
--- a/src/MEDCalc/gui/MEDModule.hxx
+++ b/src/MEDCalc/gui/MEDModule.hxx
@@ -22,6 +22,7 @@
 #ifndef _MED_MODULE_HXX_
 #define _MED_MODULE_HXX_
 
+#include <Python.h>
 #include "MEDCALCGUI.hxx"
 
 #include <SalomeApp_Module.h>
@@ -80,14 +81,19 @@ public:
                             const QString& menus="",
                             const QString& rule="client='ObjectBrowser'");
 
-  MEDCALC::MEDPresentationViewMode getSelectedViewMode();
-  MEDCALC::MEDPresentationColorMap getSelectedColorMap();
+//  MEDCALC::ViewModeType getSelectedViewMode() const;
+//  MEDCALC::ColorMapType getSelectedColorMap() const;
+//  MEDCALC::ScalarBarRangeType getSelectedScalarBarRange() const;
 
   inline SALOME_AppStudyEditor* getStudyEditor() { return _studyEditor; }
-
   void requestSALOMETermination() const;
 
-//  bool hasMainEventLoopStarted() const;
+  bool itemClickGeneric(std::string& name, std::string& type, int& presId) const;
+
+  int getIntParamFromStudyEditor(SALOMEDS::SObject_var obj, const char* name);
+
+signals:
+  void presentationSelected(int presId, const QString& presType, const QString& presName);
 
 public slots:
   virtual bool activateModule(SUIT_Study* theStudy);
@@ -99,7 +105,6 @@ private:
   void createModuleWidgets();
   void createModuleActions();
   void initToolbars();
-  bool itemClickGeneric(const QModelIndex & index, std::string & name, int & fieldId, int & presId) const;
 
   static void init();
 
@@ -115,13 +120,9 @@ private:
 
   static MED_ORB::MED_Gen_var _MED_engine;
 
-  // GUI needs to talk directly to the pres manager to activate a view, get some params, etc ...:
-  static MEDCALC::MEDPresentationManager_ptr _presManager;
-
 #ifdef MED_HAS_QTTESTING
   TestController * _testController;
 #endif
-
 };
 
 #endif