PR: quadtree

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

diff --git a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
index 0fad51be853d32d9db3b0d334883fa6c9677960e..405f5f8948253fae783b0a6c4c4b01871f739292 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
@@ -95,46 +95,9 @@ void HYDROGUI_ImmersibleZoneOp::startOperation()
     }
   }
 
-  // collect information about existing closed polylines
-  QStringList aPolylines;
-
-  HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
-  for ( ; anIter.More(); anIter.Next() )
-  {
-    Handle(HYDROData_PolylineXY) aPolylineObj = 
-      Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
-    if ( aPolylineObj.IsNull() )//TODO: || !aPolylineObj->IsClosed() )
-      continue;
-
-    QString aPolylineName = aPolylineObj->GetName();
-    if ( aPolylineName.isEmpty() )
-      continue;
-
-    aPolylines.append( aPolylineName );
-  }
-
-  // collect information about existing bathymetries
-  QStringList aBathymetries;
-
-  anIter = HYDROData_Iterator( doc(), KIND_BATHYMETRY );
-  for ( ; anIter.More(); anIter.Next() )
-  {
-    Handle(HYDROData_Bathymetry) aBathymetryObj = 
-      Handle(HYDROData_Bathymetry)::DownCast( anIter.Current() );
-    if ( aBathymetryObj.IsNull() )
-      continue;
-
-    QString aBathymetryName = aBathymetryObj->GetName();
-    if ( aBathymetryName.isEmpty() )
-      continue;
-
-    aBathymetries.append( aBathymetryName );
-  }
-  
   aPanel->setObjectName( anObjectName );
-
-  aPanel->setPolylineNames( aPolylines );
-  aPanel->setBathymetryNames( aBathymetries );
+  aPanel->setPolylineNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_POLYLINEXY ) );
+  aPanel->setBathymetryNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_BATHYMETRY ) );
 
   aPanel->blockSignals( false );