++ shapefil

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ProfileInterpolateDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx
index 42351f79adf0aaf4493a63b4398f78f05c4a921e..add3b8bb55537cd04b741006c4f1358ed000779d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  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
@@ -56,7 +52,7 @@ HYDROGUI_ProfileInterpolateDlg::HYDROGUI_ProfileInterpolateDlg( HYDROGUI_Module*
 
     addWidget( main );
 
-    base->addWidget( new QLabel( tr( "RIVER_OBJECT" ), main ), 0, 0, 1, 1 );
+    base->addWidget( new QLabel( tr( "STREAM_OBJECT" ), main ), 0, 0, 1, 1 );
     base->addWidget( myRiver = new HYDROGUI_ObjComboBox( theModule, QString::null, KIND_STREAM, main ), 0, 1, 1, 1 );
 
     base->addWidget( new QLabel( tr( "INTERPOLATOR" ), main ), 1, 0, 1, 1 );
@@ -147,7 +143,7 @@ QString HYDROGUI_ProfileInterpolateDlg::river() const
 
 void HYDROGUI_ProfileInterpolateDlg::setRiver( const QString& theName )
 {
-    myRiver->setSectedObject( theName );
+    myRiver->setSelectedObject( theName );
 }
 
 QString HYDROGUI_ProfileInterpolateDlg::profileStart() const
@@ -157,7 +153,7 @@ QString HYDROGUI_ProfileInterpolateDlg::profileStart() const
 
 void HYDROGUI_ProfileInterpolateDlg::setProfileStart( const QString& theName )
 {
-    myProfileStart->setSectedObject( theName );
+    myProfileStart->setSelectedObject( theName );
 }
 
 QString HYDROGUI_ProfileInterpolateDlg::profileFinish() const
@@ -167,7 +163,7 @@ QString HYDROGUI_ProfileInterpolateDlg::profileFinish() const
 
 void HYDROGUI_ProfileInterpolateDlg::setProfileFinish( const QString& theName )
 {
-    myProfileFinish->setSectedObject( theName );
+    myProfileFinish->setSelectedObject( theName );
 }
 
 int HYDROGUI_ProfileInterpolateDlg::profileNumber() const
@@ -249,7 +245,7 @@ void HYDROGUI_ProfileInterpolateDlg::onProfileChanged( const QString& )
 
 void HYDROGUI_ProfileInterpolateDlg::updateState()
 {
-    setApplyEnabled( !river().isEmpty() && !profileStart().isEmpty() && !profileFinish().isEmpty() );
+    setApplyEnabled( !river().isEmpty() && !profileStart().isEmpty() && !profileFinish().isEmpty() && profileStart() != profileFinish() );
 }
 
 HYDROGUI_ObjComboBox* HYDROGUI_ProfileInterpolateDlg::activeProfile() const