From: rkv <rkv@opencascade.com>
Date: Wed, 30 Oct 2013 10:13:22 +0000 (+0000)
Subject: - The bug is fixed: iterator on an invalid sequence which is out of scope.
X-Git-Tag: BR_hydro_v_0_3~66
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3be929a2da8f7d604c9aacd64d95ce6eab850b76;p=modules%2Fhydro.git

- The bug is fixed: iterator on an invalid sequence which is out of scope.
- List of objects is sorted on the first page of Calcualtion Case wizard.
---

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
index 302efd74..8d43d446 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
@@ -104,6 +104,7 @@ QWizardPage* HYDROGUI_CalculationDlg::createObjectsPage() {
   myGeomObjects->setSelectionMode( QListWidget::SingleSelection );
   myGeomObjects->setEditTriggers( QListWidget::NoEditTriggers );
   myGeomObjects->setViewMode( QListWidget::ListMode );
+  myGeomObjects->setSortingEnabled( true );
 
   QFrame* aBtnsFrame = new QFrame( aPage );
   QVBoxLayout* aBtnsLayout = new QVBoxLayout( aBtnsFrame );
diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index 133a99d3..e060a5ac 100644
--- a/src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx
@@ -85,7 +85,8 @@ QString HYDROGUI_DataObject::text( const int theColumnId ) const
       Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( myData );
       if ( !aZone.IsNull() )
       {
-        HYDROData_SequenceOfObjects::Iterator anIter( aZone->GetGeometryObjects() );
+        HYDROData_SequenceOfObjects aSeq = aZone->GetGeometryObjects();
+        HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
         for ( ; anIter.More(); anIter.Next() )
         {
           Handle(HYDROData_Object) aRefGeomObj =