fix conflict

[modules/med.git] / idl / MEDPresentationManager.idl

diff --git a/idl/MEDPresentationManager.idl b/idl/MEDPresentationManager.idl
index 4a426f43641e20e4ca0be328fcbf79f0598fdad9..2d744bbceb80247a327f8c9f873b7cae66c3a930 100644 (file)
--- a/idl/MEDPresentationManager.idl
+++ b/idl/MEDPresentationManager.idl
@@ -23,13 +23,26 @@
 #include "SALOME_GenericObj.idl"
 #include "MEDDataManager.idl"
 
-module MEDOP
+module MEDCALC
 {
+  enum MEDPresentationViewMode {
+    VIEW_MODE_OVERLAP,
+    VIEW_MODE_REPLACE,
+    VIEW_MODE_NEW_LAYOUT,
+    VIEW_MODE_SPLIT_VIEW
+  };
+
+  struct ScalarMapParameters {
+    long fieldHandlerId;
+    MEDPresentationViewMode viewMode;
+  };
 
   interface MEDPresentationManager : SALOME::GenericObj
   {
 
-    void MakeScalarMap(in long fieldHandlerId, in string viewMode);
+    long makeScalarMap(in ScalarMapParameters params);
+    void setPresentationProperty(in long presId, in string propName, in string propValue);
+    string getPresentationProperty(in long presId, in string propName);
 
   };