X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_OCCDisplayer.cxx;h=6f5081110ab3a624f5d3235d7536a798ce976768;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=acbfad377df92a493000a37f511e301762ee98b2;hpb=4d678ea7cf2977099c0147d004402066632e240b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index acbfad37..6f508111 100644
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -20,7 +20,7 @@
 
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include <HYDROGUI_ShapeImage.h>
 #include <HYDROGUI_ShapeBathymetry.h>
 #include <HYDROGUI_ShapeLandCoverMap.h>
@@ -29,14 +29,14 @@
 #include "HYDROGUI_ZLayers.h"
 
 #include <HYDROData_Bathymetry.h>
+#include <HYDROData_Image.h>
 #include <HYDROData_LandCoverMap.h>
 #include <HYDROData_StricklerTable.h>
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <AIS_ListOfInteractive.hxx>
-
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
 
 #include <TColStd_SequenceOfInteger.hxx>
 
@@ -162,12 +162,12 @@ HYDROGUI_Shape* HYDROGUI_OCCDisplayer::createShape( const int
     return aResShape;
 
   if( theObject->IsKind( STANDARD_TYPE( HYDROData_Image ) ) )
-    aResShape = new HYDROGUI_ShapeImage( theContext, Handle_HYDROData_Image::DownCast( theObject ) );
+    aResShape = new HYDROGUI_ShapeImage( theContext, Handle(HYDROData_Image)::DownCast( theObject ) );
   else if( theObject->IsKind( STANDARD_TYPE( HYDROData_Bathymetry ) ) )
-    aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle_HYDROData_Bathymetry::DownCast( theObject ) );
+    aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle(HYDROData_Bathymetry)::DownCast( theObject ) );
   else if( theObject->IsKind( STANDARD_TYPE( HYDROData_LandCoverMap ) ) ) {
     bool isScalarMode = module()->isLandCoversScalarMapModeOn( theViewerId );
-    aResShape = new HYDROGUI_ShapeLandCoverMap( this, theContext, Handle_HYDROData_LandCoverMap::DownCast( theObject ), -1, isScalarMode );
+    aResShape = new HYDROGUI_ShapeLandCoverMap( this, theContext, Handle(HYDROData_LandCoverMap)::DownCast( theObject ), -1, isScalarMode );
   }
   else
     aResShape = new HYDROGUI_Shape( theContext, theObject );
@@ -464,10 +464,10 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
     }
   }
 
-  Handle(Aspect_ColorScale) aColorScale;
+  Handle(AIS_ColorScale) aColorScale = GetColorScale( aViewerId );
+  Handle(AIS_InteractiveContext) aCtx = theViewer->getAISContext();
   if( isDisplayColorScale )
   {
-    aColorScale = aView->ColorScale();
     if( !aColorScale.IsNull() )
     {
       aColorScale->SetXPosition( anXPos );
@@ -480,6 +480,8 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
 
       aColorScale->SetTitle( aColorScaleTitle );
       aColorScale->SetRange( aColorScaleMin, aColorScaleMax );
+      
+      aColorScale->SetToUpdate();
 
       if ( !isLandCoverColoringOn ) {
         foreach( HYDROGUI_Shape* aShape, aBathShapes ) {
@@ -490,14 +492,17 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
           aBathShape->UpdateWithColorScale( aColorScale );
         }
       }
+      
+      if ( !aCtx.IsNull() && !aCtx->IsDisplayed( aColorScale ) ) {
+        aCtx->Display( aColorScale );
+      }
     }
-    if( !aView->ColorScaleIsDisplayed() )
-      aView->ColorScaleDisplay();
   }
   else
   {
-    if( aView->ColorScaleIsDisplayed() )
-      aView->ColorScaleErase();
+    if ( !aCtx.IsNull() && aCtx->IsDisplayed( aColorScale ) ) {
+      aCtx->Erase( aColorScale );
+    }
   }
 
   foreach( HYDROGUI_Shape* aShape, aLandCoverMapShapes ) {
@@ -508,7 +513,6 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
       continue;
     }
     
-    QColor aColor;    
     Handle(HYDROData_LandCoverMap) aLandCoverMap = 
       Handle(HYDROData_LandCoverMap)::DownCast( aLandCoverMapShape->getObject() );
 
@@ -516,9 +520,26 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
       continue;
     }
     
-    aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn );
-    theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObject() );
+    bool isScalarMode = aLandCoverMapShape->isScalarMapModeEnabled();
+    if( isScalarMode != isLandCoverColoringOn )
+    {
+      aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn );
+      theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObject() );
+    }
   }
   
   myToUpdateColorScale = false;
 }
+
+Handle(AIS_ColorScale) HYDROGUI_OCCDisplayer::GetColorScale( const int theViewerId )
+{
+  Handle(AIS_ColorScale) aColorScale;
+
+  aColorScale = myColorScales.value( theViewerId, aColorScale );
+  if ( aColorScale.IsNull() ) {
+    aColorScale = new AIS_ColorScale();
+    myColorScales.insert( theViewerId, aColorScale );
+  }
+
+  return aColorScale;
+}