refs #1327: debug of scaling operations

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

diff --git a/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx b/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx
index 18639114738a43049abf688f2b9f27d3da1808ee..8d2ef26ef570d45a22acaec35d8525ee7240b936 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx
+++ b/src/HYDROGUI/HYDROGUI_ObjComboBox.cxx
@@ -18,7 +18,7 @@
 
 #include "HYDROGUI_ObjComboBox.h"
 
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_Module.h"
 
 #include <LightApp_Application.h>
@@ -122,7 +122,10 @@ QStringList HYDROGUI_ObjComboBox::objectNames( HYDROData_SequenceOfObjects& theO
     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;
 }
@@ -161,6 +164,6 @@ Handle( HYDROData_Entity ) HYDROGUI_ObjComboBox::GetObject() const
   if( anIndex>=0 && anIndex<myObjects.Length() )
     return myObjects.Value( myObjects.Lower() + anIndex );
   else
-    Handle( HYDROData_Entity )();
+    return Handle( HYDROData_Entity )();
 }