Additional commit for '[CEA 13302] Policy for c++ files ? using namespaces in c+...

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

diff --git a/src/MEDCalc/gui/XmedDataModel.hxx b/src/MEDCalc/gui/XmedDataModel.hxx
index fa2f6c1c60976f2f3dad5ca6cdf0a8f9a7567068..71c08431aa2e9e238d4f9dc69d03ca1caa4300f9 100644 (file)
--- a/src/MEDCalc/gui/XmedDataModel.hxx
+++ b/src/MEDCalc/gui/XmedDataModel.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  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
@@ -35,17 +35,18 @@
 class MEDCALCGUI_EXPORT XmedDataObject: public DataObject {
 public:
   XmedDataObject();
-  virtual string getPath();
+  virtual std::string getPath();
 
   void setFieldHandler(MEDCALC::FieldHandler fieldHandler);
   MEDCALC::FieldHandler * getFieldHandler();
 
-  static const int NB_TYPE_OF_FIELDS = 4;
-  static const char *  mapTypeOfFieldLabel[NB_TYPE_OF_FIELDS];
+  void setPresentationId(int presId);
+  int getPresentationId() const;
 
 private:
   MEDCALC::FieldHandler _fieldHandler;
-  string _getTypedFieldLabel();
+  int _presId;
+  std::string _getTypedFieldLabel();
 };
 
 //
@@ -71,7 +72,7 @@ public:
 // then get the result you are interested in, using the corresponding
 // "result*" function.
 //
-// 2) Alternativly, you can just call directly the suitable master
+// 2) Alternatively, you can just call directly the suitable master
 // "get*" function to process and get the result you are interested
 // in.
 //