Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index f0386a463fe7a568a55a7de8c01c6c1c8fdc0f50..feed7992d67883154a4baa224d5ff72824a839de 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -27,6 +27,7 @@
 #include "HYDROGUI_Operation.h"
 #include "HYDROGUI_DataObject.h"
 #include "HYDROGUI_ZLayers.h"
+#include "HYDROGUI_Polyline.h"
 
 #include <HYDROData_Bathymetry.h>
 #include <HYDROData_Image.h>
@@ -398,8 +399,11 @@ void HYDROGUI_OCCDisplayer::SetZLayer( const OCCViewer_Viewer* theViewer,
   HYDROGUI_Shape* anObjShape = module()->getObjectShape( aViewerId, theObject );
 
   // Set Z layer
-  if ( anObjShape ) {
-    aCtx->SetZLayer( anObjShape->getAISObject(), theZLayerId );
+  if ( anObjShape )
+  {
+    QList<Handle(AIS_InteractiveObject)> shapes = anObjShape->getAISObjects();
+    foreach( Handle(AIS_InteractiveObject) shape, shapes )
+      aCtx->SetZLayer( shape, theZLayerId );
   }
 }
 
@@ -517,7 +521,7 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
     if( isScalarMode != isLandCoverColoringOn )
     {
       aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn );
-      theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObject() );
+      theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObjects()[0], Standard_False );
     }
   }
   
@@ -557,3 +561,32 @@ Handle(AIS_ColorScale) HYDROGUI_OCCDisplayer::GetColorScale( const int theViewer
 
   return aColorScale;
 }
+
+void HYDROGUI_OCCDisplayer::UpdatePolylines( int theViewerId, int theType, int theSize )
+{
+  OCCViewer_Viewer* aViewer = module()->getOCCViewer( theViewerId );
+  if( !aViewer )
+    return;
+
+  // Get interactive context
+  Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+  if( aCtx.IsNull() )
+    return;
+
+  AIS_ListOfInteractive objs;
+  aCtx->DisplayedObjects( objs );
+  AIS_ListOfInteractive::const_iterator it = objs.begin(), last = objs.end();
+  for( ; it!=last; it++ )
+  {
+    Handle(HYDROGUI_Arrow) arr = Handle(HYDROGUI_Arrow)::DownCast( *it );
+    if( !arr.IsNull() )
+    {
+      if( theType>=0 )
+        arr->SetType( (HYDROGUI_Arrow::Type)theType );
+      if( theSize>=0 )
+        arr->SetSize( theSize );
+      aCtx->Redisplay( arr, Standard_False );
+    }
+  }
+  aCtx->UpdateCurrentViewer();
+}