Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_RiverBottomDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_RiverBottomDlg.h
b/src/HYDROGUI/HYDROGUI_RiverBottomDlg.h
index a59e71bcc20d0b19968de68df144dbe9994a2633..ad15d861031e4c460cb170d109d0cff1c93cfa62 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_RiverBottomDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_RiverBottomDlg.h
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,15
+16,16
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#ifndef HYDROGUI_RIVERBOTTOMD
lg
_H
-#define HYDROGUI_RIVERBOTTOMD
lg
_H
+#ifndef HYDROGUI_RIVERBOTTOMD
LG
_H
+#define HYDROGUI_RIVERBOTTOMD
LG
_H
#include "HYDROGUI_InputPanel.h"
#include "HYDROGUI_InputPanel.h"
+#include "HYDROGUI_ObjComboBox.h"
+
class QComboBox;
class QComboBox;
-class HYDROGUI_ObjComboBox;
-class HYDROGUI_RiverBottomDlg : public HYDROGUI_InputPanel
+class HYDROGUI_RiverBottomDlg : public HYDROGUI_InputPanel
, public HYDROGUI_ObjComboBoxFilter
{
Q_OBJECT
{
Q_OBJECT
@@
-41,7
+38,15
@@
public:
QString getRiverName() const;
void setRiverName( const QString& );
QString getRiverName() const;
void setRiverName( const QString& );
-protected:
+ virtual bool isOk( const Handle(HYDROData_Entity)& ) const;
+
+private slots:
+ void onRiverChanged( const QString& );
+
+private:
+ void updateState();
+
+private:
HYDROGUI_ObjComboBox* myRivers;
};
HYDROGUI_ObjComboBox* myRivers;
};