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 f05d6616e834e2d5b5c745e9831bff3886e7ce0c..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>
@@ -32,6 +33,7 @@
 #include "DatasourceController.hxx"
 #include "PresentationController.hxx"
 #include "ProcessingController.hxx"
+#include "TestController.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(MED_Gen)
@@ -40,6 +42,8 @@
 #include <QModelIndex>
 
 class SalomeApp_Application;
+class PVViewer_GUIElements;
+class MEDPresentationManager_i;
 
 /*!
  * This class defines the gui of the MED module.
@@ -77,19 +81,31 @@ 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 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);
   virtual bool deactivateModule(SUIT_Study* theStudy);
   virtual void onDblClick(const QModelIndex& index);
+  virtual void onClick(const QModelIndex& index);
 
 private:
   void createModuleWidgets();
   void createModuleActions();
+  void initToolbars();
+
   static void init();
 
 private:
@@ -99,7 +115,14 @@ private:
   XmedDataModel* _xmedDataModel;
   PresentationController* _presentationController;
   ProcessingController* _processingController;
-  static MED_ORB::MED_Gen_var myEngine;
+
+  PVViewer_GUIElements*   _pvGuiElements;
+
+  static MED_ORB::MED_Gen_var _MED_engine;
+
+#ifdef MED_HAS_QTTESTING
+  TestController * _testController;
+#endif
 };
 
 #endif