X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ObjComboBox.h;h=5f983c44acfd78d85ea9b3cbbfc9b92d9d19d978;hb=fce3f1240b6161d7cb837344078e5943b90eca65;hp=96889e0102f5755036675b2781becbb6d5ce5751;hpb=ca0608cb7f006c4c53ab5990c37be86457935b05;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ObjComboBox.h b/src/HYDROGUI/HYDROGUI_ObjComboBox.h index 96889e01..5f983c44 100644 --- a/src/HYDROGUI/HYDROGUI_ObjComboBox.h +++ b/src/HYDROGUI/HYDROGUI_ObjComboBox.h @@ -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 @@ -46,10 +42,12 @@ public: void setObjectFilter( HYDROGUI_ObjComboBoxFilter* ); QString selectedObject() const; - void setSectedObject( const QString& ); + void setSelectedObject( const QString& ); void reset(); + Handle( HYDROData_Entity ) GetObject() const; + signals: void objectSelected( const QString& ); @@ -60,7 +58,7 @@ private slots: void updateSelection(); protected: - QStringList objectNames() const; + QStringList objectNames( HYDROData_SequenceOfObjects& ) const; SUIT_SelectionMgr* selectionMgr() const; private: @@ -68,6 +66,7 @@ private: QComboBox* myObject; HYDROGUI_Module* myModule; HYDROGUI_ObjComboBoxFilter* myFilter; + HYDROData_SequenceOfObjects myObjects; }; class HYDROGUI_ObjComboBoxFilter