-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
// 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
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
+#include <QTimer>
#include <QLabel>
#include <QLayout>
#include <QComboBox>
QBoxLayout* base = new QHBoxLayout( this );
base->setMargin( 0 );
- base->addWidget( new QLabel( theTitle, this ) );
+ if ( !theTitle.isEmpty() )
+ base->addWidget( new QLabel( theTitle, this ) );
base->addWidget( myObject = new QComboBox( this ) );
myObject->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
void HYDROGUI_ObjComboBox::reset()
{
+ bool block = myObject->signalsBlocked();
+ myObject->blockSignals( true );
+
myObject->clear();
myObject->addItems( objectNames() );
- onSelectionChanged();
+ myObject->setCurrentIndex( -1 );
+
+ myObject->blockSignals( block );
+
+ onIndexChanged( myObject->currentIndex() );
+ updateSelection();
}
void HYDROGUI_ObjComboBox::setSectedObject( const QString& theName )
}
void HYDROGUI_ObjComboBox::onSelectionChanged()
+{
+ if ( !objectFilter() || objectFilter()->isActive( this ) )
+ QTimer::singleShot( 0, this, SLOT( updateSelection() ) );
+}
+
+void HYDROGUI_ObjComboBox::updateSelection()
{
int idx = -1;
Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::GetSelectedObject( module() );
if ( !anObject.IsNull() )
idx = myObject->findText( anObject->GetName() );
- myObject->setCurrentIndex( idx );
- if ( idx >= 0 )
+ if ( idx >= 0 && myObject->currentIndex() != idx )
+ {
+ myObject->setCurrentIndex( idx );
emit objectSelected( myObject->itemText( idx ) );
+ }
}