Icons are shown in the object browser tree.

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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 192e5559f87a367eca823cc29b4ea7457e615956..0ded37300fa1e7f28d539dc2f850508c8e586f8e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -30,7 +30,7 @@
 #include "HYDROGUI_Zone.h"
 #include "HYDROGUI_Region.h"
 
-#include <HYDROData_Polyline.h>
+#include <HYDROData_PolylineXY.h>
 #include <HYDROData_Iterator.h>
 #include <HYDROData_ImmersibleZone.h>
 #include <HYDROData_Object.h>
@@ -85,20 +85,24 @@ void HYDROGUI_CalculationOp::startOperation()
   // Get all polylines
   aList.clear();
   anEntryList.clear();
-  HYDROData_Iterator anIter( doc(), KIND_POLYLINE );
-  Handle(HYDROData_Polyline) aPolylineObj;
+  HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
+  Handle(HYDROData_PolylineXY) aPolylineObj;
   QString aPolylineName;
   for ( ; anIter.More(); anIter.Next() )
   {
-    aPolylineObj = Handle(HYDROData_Polyline)::DownCast( anIter.Current() );
+    aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
 
     if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed() )
-    {
-      aPolylineName = aPolylineObj->GetName();
-      if ( !aPolylineName.isEmpty() )
-      {
-        aList.append( aPolylineName );
-        anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) );
+    { 
+      // Check the polyline shape
+      TopoDS_Shape aPolylineShape = aPolylineObj->GetShape();
+      if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+        aPolylineName = aPolylineObj->GetName();
+        if ( !aPolylineName.isEmpty() )
+        {
+          aList.append( aPolylineName );
+          anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) );
+        }
       }
     }
   }
@@ -210,7 +214,7 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
 void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
 {
   // Set the selected boundary polyline to the calculation case
-  Handle(HYDROData_Polyline) anObject;
+  Handle(HYDROData_PolylineXY) anObject;
   Handle(AIS_InteractiveContext) aCtx;
   if ( myPreviewViewManager ) 
   {
@@ -234,10 +238,10 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
   else
   {
     Handle(HYDROData_Entity) anEntity = 
-      HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINE );
+      HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINEXY );
     if ( !anEntity.IsNull() )
     {
-      anObject = Handle(HYDROData_Polyline)::DownCast( anEntity );
+      anObject = Handle(HYDROData_PolylineXY)::DownCast( anEntity );
       if ( !anObject.IsNull() )
       {
         myEditedObject->SetBoundaryPolyline( anObject );