X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_RiverBottomOp.cxx;h=87ce6116616a8ad82d21f9b6ef1c8e3a123940e2;hb=e1d46e66d9b3c89854d2b81c8b1673791f78d390;hp=9edd16b8a380fb91fb721847b71878074656f7d2;hpb=7e11c53f099ac1d312e9e8580b98f76783b862ae;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx index 9edd16b8..87ce6116 100644 --- a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx +++ b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx @@ -63,25 +63,15 @@ void HYDROGUI_RiverBottomOp::startOperation() HYDROGUI_RiverBottomDlg* aPanel = ::qobject_cast( inputPanel() ); aPanel->reset(); - /* - QString aRiver; - Handle(HYDROData_River) aRiverObj = Handle(HYDROData_River)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); - if ( !aRiverObj.IsNull() ) - aRiver = aRiverObj->GetName(); - - aPanel->setRiverName( aRiver ); - */ } void HYDROGUI_RiverBottomOp::abortOperation() { -// erasePreview(); HYDROGUI_Operation::abortOperation(); } void HYDROGUI_RiverBottomOp::commitOperation() { -// erasePreview(); HYDROGUI_Operation::commitOperation(); } @@ -98,7 +88,7 @@ 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" ); @@ -107,15 +97,8 @@ bool HYDROGUI_RiverBottomOp::processApply( int& theUpdateFlags, QString& theErro 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 +113,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 {