Merge remote-tracking branch 'origin/vsr/qtesting'

[modules/med.git] / src / MEDCalc / gui / dialogs / DlgInterpolateField.cxx

diff --git a/src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx b/src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx
index 1d49c9072e11f0bdedc25601cee2c260706bfd4e..4ef53c6f2ec3b36cfbb94bec799a0d93e348eaee 100644 (file)
--- a/src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx
+++ b/src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx
@@ -1,5 +1,24 @@
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #include "DlgInterpolateField.hxx"
-#include "DatasourceConstants.hxx"
+#include <MEDCalcConstants.hxx>
 
 #include <QString>
 #include <QMessageBox>
@@ -31,7 +50,7 @@ DlgInterpolateField::DlgInterpolateField(SALOME_AppStudyEditor * studyEditor,
   this->ui.comboBoxMethod->addItems(methods);
 
   QStringList natures;
-  natures << "NoNature" << "ConservativeVolumic" << "Integral" << "IntegralGlobConstraint" << "RevIntegral";
+  natures << "NoNature" << "IntensiveMaximum" << "ExtensiveMaximum" << "ExtensiveConservation" << "IntensiveConservation";
   this->ui.comboBoxNature->addItems(natures);
 
   connect(this->ui.btnSelectMesh, SIGNAL(clicked()), this, SLOT(OnSelectMesh()));
@@ -96,7 +115,7 @@ void DlgInterpolateField::OnSelectMesh() {
     SALOMEDS::SObject_var soMesh = listOfSObject->at(0);
     // _GBO_ TODO: we should test here if it is a mesh (attribute in
     // the sobject)
-    _meshId = _studyEditor->getParameterInt(soMesh,OBJECT_ID);
+    _meshId = _studyEditor->getParameterInt(soMesh,MESH_ID);
     const char * meshname = _studyEditor->getName(soMesh);
     this->ui.txtMesh->setText(QString(meshname));
   }