refs #550: fix crash when myObject is NULL

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

diff --git a/src/HYDROGUI/HYDROGUI_RiverBottomDlg.cxx b/src/HYDROGUI/HYDROGUI_RiverBottomDlg.cxx
index 7e93c158fec7a212c76ddda5902e27b659671d32..2ca6d905b6a74ea417063a852a74352614e5bbe9 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_RiverBottomDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_RiverBottomDlg.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
@@ -25,19 +21,24 @@
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_ObjComboBox.h"
 
+#include <HYDROData_Stream.h>
+#include <HYDROData_Polyline3D.h>
+
 #include <QLabel>
 #include <QLayout>
 #include <QComboBox>
 #include <QGroupBox>
 
 HYDROGUI_RiverBottomDlg::HYDROGUI_RiverBottomDlg( HYDROGUI_Module* theModule, const QString& theTitle )
-    : HYDROGUI_InputPanel( theModule, theTitle )
+    : HYDROGUI_InputPanel( theModule, theTitle ),
+    HYDROGUI_ObjComboBoxFilter()
 {
     // Channel name
     QGroupBox* group = new QGroupBox( mainFrame() );
     QBoxLayout* base = new QVBoxLayout( group );
 
-    base->addWidget( myRivers = new HYDROGUI_ObjComboBox( theModule, tr( "RIVER_OBJECT" ), KIND_STREAM, group ) );
+    base->addWidget( myRivers = new HYDROGUI_ObjComboBox( theModule, tr( "STREAM_OBJECT" ), KIND_STREAM, group ) );
+    myRivers->setObjectFilter( this );
 
     addWidget( group );
 
@@ -73,6 +74,12 @@ void HYDROGUI_RiverBottomDlg::setRiverName( const QString& theName )
     myRivers->setSectedObject( theName );
 }
 
+bool HYDROGUI_RiverBottomDlg::isOk( const Handle(HYDROData_Entity)& theEntity ) const
+{
+    Handle(HYDROData_Stream) aStream = Handle(HYDROData_Stream)::DownCast(theEntity);
+    return !aStream.IsNull() && aStream->GetBottomPolyline().IsNull();
+}
+
 void HYDROGUI_RiverBottomDlg::onRiverChanged( const QString& )
 {
     updateState();