X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.cxx;h=ba31ad82e4c0b010e89da283171866f569a8ca70;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=ece8150415041034e80a48e899dcd9832dcd49c3;hpb=4b82ec592a58884d56d7637ab16c3cff757f4b8f;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx index ece81504..ba31ad82 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx @@ -356,7 +356,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject ) myBathymetryChoice->addItem( tr("MERGE_UNKNOWN"), HYDROData_Zone::Merge_UNKNOWN ); myBathymetryChoice->addItem( tr("MERGE_ZMIN"), HYDROData_Zone::Merge_ZMIN ); myBathymetryChoice->addItem( tr("MERGE_ZMAX"), HYDROData_Zone::Merge_ZMAX ); - QStringList aList = aZone->getBathymetries(); + QStringList aList = aZone->getAltitudes(); for ( int i = 0; i < aList.length(); i++ ) { myBathymetryChoice->addItem( aList.at( i ), HYDROData_Zone::Merge_Object ); @@ -372,7 +372,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject ) aCurIndex = 2; break; case HYDROData_Zone::Merge_Object: - aCurIndex = 3 + aList.indexOf( aZone->text( HYDROGUI_DataObject::BathymetryId ) ); + aCurIndex = 3 + aList.indexOf( aZone->text( HYDROGUI_DataObject::AltitudeObjId ) ); break; default: aCurIndex = 0; // Select unknown by default