X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FXmedDataModel.cxx;h=62e37a660edd109d0957dec7bd04671ed52d4057;hb=d3c583650bcc9d95c88d904800a481ede33049d4;hp=5118ba5b54e8d28053871301d1f2e067d0c0a565;hpb=b23988dad1f2a39ed6630f1ee4eb090e240d9b27;p=modules%2Fmed.git diff --git a/src/MEDCalc/gui/XmedDataModel.cxx b/src/MEDCalc/gui/XmedDataModel.cxx index 5118ba5b5..62e37a660 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-2016 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 +#include "MEDCalcConstants.hxx" // // ================================================================= @@ -47,8 +48,6 @@ 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" }; /*! * This function implements the convention for displaying a fieldname * characterized by its spatial discretisation type. @@ -64,7 +63,7 @@ string XmedDataObject::_getTypedFieldLabel() { // 2 = ON_GAUSS_PT // 3 = ON_GAUSS_NE if ( _fieldHandler.type < 0 || - _fieldHandler.type >= XmedDataObject::NB_TYPE_OF_FIELDS ) { + _fieldHandler.type >= NB_TYPE_OF_FIELDS ) { return string("UNKNOWN"); } string label(_fieldHandler.fieldname);