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 #568: use ordered list view with selection synchronized with object browser...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ObjComboBox.h
diff --git
a/src/HYDROGUI/HYDROGUI_ObjComboBox.h
b/src/HYDROGUI/HYDROGUI_ObjComboBox.h
index 0cb5ca386cc1d12b7a37a4f6a53216190a15ee1e..1697309f1268b053fb556fce0541d6c9f060f1a9 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ObjComboBox.h
+++ b/
src/HYDROGUI/HYDROGUI_ObjComboBox.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
@@
-24,12
+20,10
@@
#define HYDROGUI_OBJCOMBOBOX_H
#include <HYDROData_Entity.h>
#define HYDROGUI_OBJCOMBOBOX_H
#include <HYDROData_Entity.h>
-
-#include <QComboBox.h>
+#include <QComboBox>
class HYDROGUI_Module;
class HYDROGUI_ObjComboBoxFilter;
class HYDROGUI_Module;
class HYDROGUI_ObjComboBoxFilter;
-
class SUIT_SelectionMgr;
class HYDROGUI_ObjComboBox : public QWidget
class SUIT_SelectionMgr;
class HYDROGUI_ObjComboBox : public QWidget
@@
-59,6
+53,8
@@
private slots:
void onSelectionChanged();
void onIndexChanged( int );
void onSelectionChanged();
void onIndexChanged( int );
+ void updateSelection();
+
protected:
QStringList objectNames() const;
SUIT_SelectionMgr* selectionMgr() const;
protected:
QStringList objectNames() const;
SUIT_SelectionMgr* selectionMgr() const;
@@
-76,6
+72,7
@@
public:
HYDROGUI_ObjComboBoxFilter() {};
virtual ~HYDROGUI_ObjComboBoxFilter() {};
HYDROGUI_ObjComboBoxFilter() {};
virtual ~HYDROGUI_ObjComboBoxFilter() {};
+ virtual bool isActive( HYDROGUI_ObjComboBox* ) const { return true; };
virtual bool isOk( const Handle(HYDROData_Entity)& ) const = 0;
};
virtual bool isOk( const Handle(HYDROData_Entity)& ) const = 0;
};