Fix for the bug #45: check and warning when the same image is used in 2 arguments.

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

diff --git a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
index 56ef1cd39b83f9671091b1496d4c4aaff64850a9..3e9fd482bbee6b2f055c3c4c33e747f5825c59ed 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
@@ -31,7 +31,7 @@
 
 #include <HYDROData_Bathymetry.h>
 #include <HYDROData_Iterator.h>
-#include <HYDROData_Polyline.h>
+#include <HYDROData_PolylineXY.h>
 
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewModel.h>
@@ -69,7 +69,7 @@ void HYDROGUI_ImmersibleZoneOp::startOperation()
 
   aPanel->reset();
 
-  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), "Zone" );
+  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMMERSIBLE_ZONE_NAME" ) );
 
   QColor      aFillingColor( HYDROData_ImmersibleZone::DefaultFillingColor() );
   QColor      aBorderColor( HYDROData_ImmersibleZone::DefaultBorderColor() );
@@ -86,7 +86,7 @@ void HYDROGUI_ImmersibleZoneOp::startOperation()
       aFillingColor = myEditedObject->GetFillingColor();
       aBorderColor = myEditedObject->GetBorderColor();
 
-      Handle(HYDROData_Polyline) aRefPolyline = myEditedObject->GetPolyline();
+      Handle(HYDROData_PolylineXY) aRefPolyline = myEditedObject->GetPolyline();
       if ( !aRefPolyline.IsNull() )
         aSelectedPolyline = aRefPolyline->GetName();
 
@@ -99,11 +99,11 @@ void HYDROGUI_ImmersibleZoneOp::startOperation()
   // collect information about existing closed polylines
   QStringList aPolylines;
 
-  HYDROData_Iterator anIter( doc(), KIND_POLYLINE );
+  HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
   for ( ; anIter.More(); anIter.Next() )
   {
-    Handle(HYDROData_Polyline) aPolylineObj = 
-      Handle(HYDROData_Polyline)::DownCast( anIter.Current() );
+    Handle(HYDROData_PolylineXY) aPolylineObj = 
+      Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
     if ( aPolylineObj.IsNull() || !aPolylineObj->IsClosed() )
       continue;
 
@@ -133,9 +133,6 @@ void HYDROGUI_ImmersibleZoneOp::startOperation()
   }
   
   aPanel->setObjectName( anObjectName );
-  
-  aPanel->setFillingColor( aFillingColor );
-  aPanel->setBorderColor( aBorderColor );
 
   aPanel->setPolylineNames( aPolylines );
   aPanel->setBathymetryNames( aBathymetries );
@@ -198,14 +195,14 @@ bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
   if ( aZoneObj.IsNull() )
     return false;
 
-  Handle(HYDROData_Polyline) aZonePolyline;
+  Handle(HYDROData_PolylineXY) aZonePolyline;
   Handle(HYDROData_Bathymetry) aZoneBathymetry;
 
   QString aPolylineName = aPanel->getPolylineName();
   if ( !aPolylineName.isEmpty() )
   {
-    aZonePolyline = Handle(HYDROData_Polyline)::DownCast(
-      HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINE ) );
+    aZonePolyline = Handle(HYDROData_PolylineXY)::DownCast(
+      HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINEXY ) );
   }
 
   QString aBathymetryName = aPanel->getBathymetryName();
@@ -217,11 +214,14 @@ bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
 
   aZoneObj->SetName( anObjectName );
 
-  aZoneObj->SetFillingColor( aPanel->getFillingColor() );
-  aZoneObj->SetBorderColor( aPanel->getBorderColor() );
+  if ( !myIsEdit ) {
+    aZoneObj->SetFillingColor( HYDROData_ImmersibleZone::DefaultFillingColor() );
+    aZoneObj->SetBorderColor( HYDROData_ImmersibleZone::DefaultBorderColor() );
+  }
 
   aZoneObj->SetPolyline( aZonePolyline );
   aZoneObj->SetBathymetry( aZoneBathymetry );
+  aZoneObj->Update();
 
   closePreview();
 
@@ -240,12 +240,16 @@ void HYDROGUI_ImmersibleZoneOp::onCreatePreview( const QString& thePolylineName
     return;
 
   TopoDS_Wire aWire;
+  TopoDS_Shape aShape;
 
-  Handle(HYDROData_Polyline) aPolyline = Handle(HYDROData_Polyline)::DownCast(
-    HYDROGUI_Tool::FindObjectByName( module(), thePolylineName, KIND_POLYLINE ) );
+  Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), thePolylineName, KIND_POLYLINEXY ) );
   if ( !aPolyline.IsNull() )
   {
-    aWire = TopoDS::Wire( aPolyline->GetTopShape() );
+    aShape = aPolyline->GetShape();
+    if ( aShape.ShapeType() == TopAbs_WIRE ) {
+      aWire = TopoDS::Wire( aShape );
+    }
   }
 
   LightApp_Application* anApp = module()->getApp();
@@ -266,9 +270,23 @@ void HYDROGUI_ImmersibleZoneOp::onCreatePreview( const QString& thePolylineName
   if ( !myViewManager || !myPreviewPrs )
     return;
 
-  myPreviewPrs->setFillingColor( aPanel->getFillingColor(), false, false );
-  myPreviewPrs->setBorderColor( aPanel->getBorderColor(), false, false );
-  myPreviewPrs->setFace( aWire );
+  QColor aFillingColor = HYDROData_ImmersibleZone::DefaultFillingColor();
+  QColor aBorderColor = HYDROData_ImmersibleZone::DefaultBorderColor();
+  if ( !myEditedObject.IsNull() ) {
+    aFillingColor = myEditedObject->GetFillingColor();
+    aBorderColor = myEditedObject->GetBorderColor();
+  }
+
+  myPreviewPrs->setFillingColor( aFillingColor, false, false );
+  myPreviewPrs->setBorderColor( aBorderColor, false, false );
+  if ( !aWire.IsNull() ) {
+    myPreviewPrs->setFace( aWire );
+  } else if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_COMPOUND ) {
+    TopoDS_Compound aCompound = TopoDS::Compound( aShape );
+    if ( !aCompound.IsNull() ) {
+      myPreviewPrs->setFaces( aCompound );
+    }
+  }
 }
 
 void HYDROGUI_ImmersibleZoneOp::closePreview()