lot 10 - warnings for DTM - untested

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

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index f0386a463fe7a568a55a7de8c01c6c1c8fdc0f50..de674e8b413e1688fcd0962af2b346c3449ba316 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>
@@ -293,7 +294,7 @@ void HYDROGUI_OCCDisplayer::Display( const HYDROData_SequenceOfObjects& theObjs,
     }
   } 
   else if ( !aCtx.IsNull() ) { // TODO: determine if this code is necessary (added as a fix for issue# 359)
-    aCtx->UpdateSelected();
+    aCtx->UpdateSelected(true);
   }
 
   UpdateColorScale( aViewer );
@@ -324,6 +325,7 @@ void HYDROGUI_OCCDisplayer::purgeObjects( const int theViewerId )
     if ( !anOwnerObj.IsNull() && anOwnerObj->IsRemoved() )
       module()->removeObjectShape( (size_t)aViewer, anOwnerObj );
   }
+  UpdateColorScale( aViewer );
 }
 
 QString HYDROGUI_OCCDisplayer::GetType() const
@@ -398,8 +400,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 );
   }
 }
 
@@ -416,14 +421,33 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
   OCCViewer_ViewWindow* aWnd = dynamic_cast<OCCViewer_ViewWindow*>( theViewer->getViewManager()->getActiveView() );
   Handle(V3d_View) aView = aWnd->getViewPort()->getView();
       
+
+  HYDROGUI_Module* aModule = module();
   int aViewerId = (size_t)theViewer;//TODO: check if viewer id is correct
-  bool isLandCoverColoringOn = module()->isLandCoversScalarMapModeOn( aViewerId );
+  bool isLandCoverColoringOn = aModule->isLandCoversScalarMapModeOn( aViewerId );
     
-  QList<HYDROGUI_Shape*> aLandCoverMapShapes = module()->getObjectShapes( aViewerId, KIND_LAND_COVER_MAP );
-  QList<HYDROGUI_Shape*> aBathShapes = module()->getObjectShapes( aViewerId, KIND_BATHYMETRY );
-
-  bool isDisplayColorScale = !aBathShapes.empty() || isLandCoverColoringOn;
+  QList<HYDROGUI_Shape*> aLandCoverMapShapes = aModule->getObjectShapes( aViewerId, KIND_LAND_COVER_MAP );
+  QList<HYDROGUI_Shape*> aBathShapes = aModule->getObjectShapes( aViewerId, KIND_BATHYMETRY );
 
+  bool isDisplayColorScale = false;
+  foreach (HYDROGUI_Shape* shape, aLandCoverMapShapes)
+  {
+    if (aModule->isObjectVisible(aViewerId, shape->getObject()))
+    {
+      isDisplayColorScale = true;
+      break;
+    }
+  }
+  if (!isDisplayColorScale)
+    foreach (HYDROGUI_Shape* shape, aBathShapes)
+    {
+      if (aModule->isObjectVisible(aViewerId, shape->getObject()))
+      {
+        isDisplayColorScale = true;
+        break;
+      }
+    }
+  
   Standard_Real aColorScaleMin = 0, aColorScaleMax = 1;
 
   // Get range
@@ -487,14 +511,14 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
          aCtx->Display( aColorScale, Standard_False );
        }
 
-       aCtx->Update( aColorScale );
+       aCtx->Update( aColorScale, true );
       }
     }
   }
   else
   {
     if ( !aCtx.IsNull() && aCtx->IsDisplayed( aColorScale ) ) {
-      aCtx->Erase( aColorScale );
+      aCtx->Erase( aColorScale, true );
     }
   }
 
@@ -517,7 +541,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 +581,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();
+}