Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 f8f647199ed0fac90b937ffb37224d7c12393332..4ef53c6f2ec3b36cfbb94bec799a0d93e348eaee 100644
(file)
--- a/
src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx
+++ b/
src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx
@@
-18,7
+18,7
@@
//
#include "DlgInterpolateField.hxx"
//
#include "DlgInterpolateField.hxx"
-#include
"DatasourceConstants.hxx"
+#include
<MEDCalcConstants.hxx>
#include <QString>
#include <QMessageBox>
#include <QString>
#include <QMessageBox>
@@
-50,7
+50,7
@@
DlgInterpolateField::DlgInterpolateField(SALOME_AppStudyEditor * studyEditor,
this->ui.comboBoxMethod->addItems(methods);
QStringList natures;
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()));
this->ui.comboBoxNature->addItems(natures);
connect(this->ui.btnSelectMesh, SIGNAL(clicked()), this, SLOT(OnSelectMesh()));
@@
-115,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)
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));
}
const char * meshname = _studyEditor->getName(soMesh);
this->ui.txtMesh->setText(QString(meshname));
}