X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FXmedDataModel.cxx;h=3199bec3808b0f440ef097fb7b44a2112e33e8c3;hb=bb9014c6fe3e097edd7009a00dc56f514c680365;hp=5118ba5b54e8d28053871301d1f2e067d0c0a565;hpb=1265469b53d28caba60f60b34e8238b26dd119a2;p=modules%2Fmed.git

diff --git a/src/MEDCalc/gui/XmedDataModel.cxx b/src/MEDCalc/gui/XmedDataModel.cxx
index 5118ba5b5..3199bec38 100644
--- a/src/MEDCalc/gui/XmedDataModel.cxx
+++ b/src/MEDCalc/gui/XmedDataModel.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 
 #include "XmedDataModel.hxx"
 #include <Basics_Utils.hxx>
+#include "MEDCalcConstants.hxx"
 
 //
 // =================================================================
@@ -26,34 +27,39 @@
 // =================================================================
 //
 
-XmedDataObject::XmedDataObject() : DataObject() {
+XmedDataObject::XmedDataObject() : DataObject(), _presId(-1) {
 }
 
 /*! This function specified the localization of the object in the
  * hierarchical organization
  */
-string XmedDataObject::getPath() {
-  string path =
-    string(_fieldHandler.meshname) + pathsep +
+std::string XmedDataObject::getPath() {
+  std::string path =
+    std::string(_fieldHandler.meshname) + pathsep +
     _getTypedFieldLabel();
   return path;
 }
 
 void XmedDataObject::setFieldHandler(MEDCALC::FieldHandler fieldHandler) {
   _fieldHandler = fieldHandler;
-  this->setLabel(string("it = ")+ToString(_fieldHandler.iteration));
+  this->setLabel(std::string("it = ")+ToString(_fieldHandler.iteration));
 }
 MEDCALC::FieldHandler * XmedDataObject::getFieldHandler() {
   return &_fieldHandler;
 }
 
-const char * XmedDataObject::mapTypeOfFieldLabel[XmedDataObject::NB_TYPE_OF_FIELDS] =
-  {"ON_CELLS", "ON_NODES", "ON_GAUSS_PT", "ON_GAUSS_NE" };
+void XmedDataObject::setPresentationId(int presId) {
+  _presId = presId;
+}
+
+int XmedDataObject::getPresentationId() const { return _presId; }
+
+
 /*!
  * This function implements the convention for displaying a fieldname
  * characterized by its spatial discretisation type.
  */
-string XmedDataObject::_getTypedFieldLabel() {
+std::string XmedDataObject::_getTypedFieldLabel() {
   // A field name could identify several MEDCoupling fields, that
   // differ by their spatial discretization on the mesh (values on
   // cells, values on nodes, ...). This spatial discretization is
@@ -64,11 +70,11 @@ string XmedDataObject::_getTypedFieldLabel() {
   // 2 = ON_GAUSS_PT
   // 3 = ON_GAUSS_NE
   if ( _fieldHandler.type < 0 ||
-       _fieldHandler.type >= XmedDataObject::NB_TYPE_OF_FIELDS ) {
-    return string("UNKNOWN");
+       _fieldHandler.type >= NB_TYPE_OF_FIELDS ) {
+    return std::string("UNKNOWN");
   }
-  string label(_fieldHandler.fieldname);
-  label +=" ("+string(mapTypeOfFieldLabel[_fieldHandler.type])+")";
+  std::string label(_fieldHandler.fieldname);
+  label +=" ("+std::string(mapTypeOfFieldLabel[_fieldHandler.type])+")";
   return label;
 }