-// 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
myObject->blockSignals( true );
myObject->clear();
- myObject->addItems( objectNames() );
+ myObjects.Clear();
+ myObject->addItems( objectNames( myObjects ) );
myObject->setCurrentIndex( -1 );
myObject->blockSignals( block );
updateSelection();
}
-void HYDROGUI_ObjComboBox::setSectedObject( const QString& theName )
+void HYDROGUI_ObjComboBox::setSelectedObject( const QString& theName )
{
int aNewIdx = myObject->findText( theName );
if ( aNewIdx != myObject->currentIndex() )
return aSelMgr;
}
-QStringList HYDROGUI_ObjComboBox::objectNames() const
+QStringList HYDROGUI_ObjComboBox::objectNames( HYDROData_SequenceOfObjects& theObjects ) const
{
QStringList aNames;
for ( HYDROData_Iterator it( HYDROData_Document::Document( module()->getStudyId() ), objectType() ); it.More(); it.Next() )
{
if ( !objectFilter() || objectFilter()->isOk( it.Current() ) )
+ {
+ theObjects.Append( it.Current() );
aNames.append( it.Current()->GetName() );
+ }
}
return aNames;
}
emit objectSelected( myObject->itemText( idx ) );
}
}
+
+Handle( HYDROData_Entity ) HYDROGUI_ObjComboBox::GetObject() const
+{
+ int anIndex = myObject->currentIndex();
+ if( anIndex>=0 && anIndex<myObjects.Length() )
+ return myObjects.Value( myObjects.Lower() + anIndex );
+ else
+ return Handle( HYDROData_Entity )();
+}
+