Merge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc

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

diff --git a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
index f0312216e068e5ebec0e4e6dff85c56761f477ec..aeaadfb52176fe0d4045d14a5340af61f9b7ea88 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-// version 2.1 of the License.
+// 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
@@ -49,7 +45,7 @@
 HYDROGUI_RiverBottomOp::HYDROGUI_RiverBottomOp( HYDROGUI_Module* theModule )
 : HYDROGUI_Operation( theModule )
 {
-  setName( tr( "FIND_RIVER_BOTTOM" ) );
+  setName( tr( "FIND_STREAM_BOTTOM" ) );
 }
 
 HYDROGUI_RiverBottomOp::~HYDROGUI_RiverBottomOp()
@@ -60,28 +56,21 @@ void HYDROGUI_RiverBottomOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  HYDROGUI_RiverBottomDlg* aPanel = ::qobject_cast<HYDROGUI_RiverBottomDlg*>( inputPanel() );
-
-  aPanel->reset();
-  /*
-  QString aRiver;
-  Handle(HYDROData_River) aRiverObj = Handle(HYDROData_River)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
-  if ( !aRiverObj.IsNull() )
-      aRiver = aRiverObj->GetName();
+  if ( isApplyAndClose() )
+  {
+    HYDROGUI_RiverBottomDlg* aPanel = ::qobject_cast<HYDROGUI_RiverBottomDlg*>( inputPanel() );
 
-  aPanel->setRiverName( aRiver );
-  */
+    aPanel->reset();
+  }
 }
 
 void HYDROGUI_RiverBottomOp::abortOperation()
 {
-//  erasePreview();
   HYDROGUI_Operation::abortOperation();
 }
 
 void HYDROGUI_RiverBottomOp::commitOperation()
 {
-//  erasePreview();
   HYDROGUI_Operation::commitOperation();
 }
 
@@ -98,24 +87,17 @@ bool HYDROGUI_RiverBottomOp::processApply( int& theUpdateFlags, QString& theErro
   if ( !aPanel )
     return false;
 
-  Handle(HYDROData_River) aRiver = riverObject( aPanel->getRiverName() );
+  Handle(HYDROData_Stream) aRiver = riverObject( aPanel->getRiverName() );
   if ( aRiver.IsNull() )
   {
-    theErrorMsg = tr( "INCORRECT_RIVER_OBJECT" );
+    theErrorMsg = tr( "INCORRECT_STREAM_OBJECT" );
     return false;
   }
 
   startDocOperation();
 
-//  Handle(HYDRO_RiverBottom) aBottom = createNewObject();
-//  aBottom->SetName( QString( "%1_Bottom" ).arg( aRiver->GetName() ) );
-
-//  erasePreview();
-
-//    module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aBottom, true );
-//    theBrowseObjectsEntries.append( HYDROGUI_DataObject::dataObjectEntry( aBottom ) );
-
-//  module()->setIsToUpdate( aBottom );
+  aRiver->GenerateBottomPolyline();
+  aRiver->Update();
 
   theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
 
@@ -130,9 +112,9 @@ Handle(HYDROData_RiverBottom) HYDROGUI_RiverBottomOp::createNewObject()
 }
 */
 
-Handle(HYDROData_River) HYDROGUI_RiverBottomOp::riverObject( const QString& theName ) const
+Handle(HYDROData_Stream) HYDROGUI_RiverBottomOp::riverObject( const QString& theName ) const
 {
-    return Handle(HYDROData_River)::DownCast( HYDROGUI_Tool::FindObjectByName( module(), theName ) );
+    return Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::FindObjectByName( module(), theName ) );
 }
 QStringList HYDROGUI_RiverBottomOp::riverNames( bool all ) const
 {