Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ObjComboBox.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx b/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx
index 8dff3a2f3d747acaa761b3d68d9a7c51ca8b5c38..8d2ef26ef570d45a22acaec35d8525ee7240b936 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx
+++ b/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx
@@ -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
@@ -22,12 +18,13 @@
 
 #include "HYDROGUI_ObjComboBox.h"
 
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_Module.h"
 
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
 
+#include <QTimer>
 #include <QLabel>
 #include <QLayout>
 #include <QComboBox>
@@ -44,7 +41,8 @@ HYDROGUI_ObjComboBox::HYDROGUI_ObjComboBox( HYDROGUI_Module* theModule, const QS
     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 ) );
@@ -80,12 +78,21 @@ void HYDROGUI_ObjComboBox::setObjectFilter( HYDROGUI_ObjComboBoxFilter* filter )
 
 void HYDROGUI_ObjComboBox::reset()
 {
+    bool block = myObject->signalsBlocked();
+    myObject->blockSignals( true );
+
     myObject->clear();
-    myObject->addItems( objectNames() );
-    onSelectionChanged();
+    myObjects.Clear();
+    myObject->addItems( objectNames( myObjects ) );
+    myObject->setCurrentIndex( -1 );
+
+    myObject->blockSignals( block );
+
+    onIndexChanged( myObject->currentIndex() );
+    updateSelection();
 }
 
-void HYDROGUI_ObjComboBox::setSectedObject( const QString& theName )
+void HYDROGUI_ObjComboBox::setSelectedObject( const QString& theName )
 {
     int aNewIdx = myObject->findText( theName );
     if ( aNewIdx != myObject->currentIndex() )
@@ -109,13 +116,16 @@ SUIT_SelectionMgr* HYDROGUI_ObjComboBox::selectionMgr() const
     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;
 }
@@ -129,13 +139,31 @@ void HYDROGUI_ObjComboBox::onIndexChanged( int idx )
 }
 
 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 ) );
+    }
 }
+
+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 )();
+}
+