Merge 'abn/V8_1_fix' branch into V8_1_BR.

[modules/med.git] / src / MEDCalc / cmp / MED.hxx

diff --git a/src/MEDCalc/cmp/MED.hxx b/src/MEDCalc/cmp/MED.hxx
index 57a3cc381385511efa38b67ee2eacca74f70b418..fb78501ca39d2606d69dac884bb55b8f3a42f4a4 100644 (file)
--- a/src/MEDCalc/cmp/MED.hxx
+++ b/src/MEDCalc/cmp/MED.hxx
@@ -55,23 +55,34 @@ public:
   MED_ORB::status addDatasourceToStudy(SALOMEDS::Study_ptr study,
                                        const MEDCALC::DatasourceHandler& datasourceHandler);
 
-  MED_ORB::status registerPresentation(SALOMEDS::Study_ptr study,
+  MED_ORB::status registerPresentationField(SALOMEDS::Study_ptr study,
                                        CORBA::Long fieldId,
                                        const char* name,
                                        const char* type,
                                        const char* ico,
                                        CORBA::Long presentationId);
 
+  MED_ORB::status registerPresentationMesh(SALOMEDS::Study_ptr study,
+                                         CORBA::Long meshId,
+                                         const char* name,
+                                         const char* type,
+                                         const char* ico,
+                                         CORBA::Long presentationId);
+
   MED_ORB::status unregisterPresentation(SALOMEDS::Study_ptr study,
                                          CORBA::Long presentationId);
 
-  // Caller owns the returned list, and is responsible for the list deletion.
-  MED_ORB::PresentationsList* getSiblingPresentations(SALOMEDS::Study_ptr study,
-                                                      CORBA::Long presentationId);
+//  // Caller owns the returned list, and is responsible for the list deletion.
+//  MED_ORB::PresentationsList* getSiblingPresentations(SALOMEDS::Study_ptr study,
+//                                                      CORBA::Long presentationId);
 
   // Get all presentations registered in the study
   MED_ORB::PresentationsList* getStudyPresentations(SALOMEDS::Study_ptr study);
 
+  char* getStudyPresentationEntry(SALOMEDS::Study_ptr study, int presentationId);
+
+  void cleanUp();
+
   /*! Dump the study as a Python file */
   virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
                                        CORBA::Boolean isPublished,
@@ -84,6 +95,7 @@ public:
 
  private:
   std::map<long, std::string> _fieldSeriesEntries;
+  std::map<long, std::string> _meshEntries;
 };
 
 extern "C"