patch for install error on Linux

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

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index aa5a6fe75924d97bef3f89c4c341c6815c807feb..b7505b0c0d19a980056972e8ba9df22c9b1ffa2a 100644 (file)
--- 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,6 +29,7 @@
 #include "HYDROGUI_ZLayers.h"
 
 #include <HYDROData_Bathymetry.h>
+#include <HYDROData_Image.h>
 #include <HYDROData_LandCoverMap.h>
 #include <HYDROData_StricklerTable.h>
 
@@ -508,7 +509,6 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
       continue;
     }
     
-    QColor aColor;    
     Handle(HYDROData_LandCoverMap) aLandCoverMap = 
       Handle(HYDROData_LandCoverMap)::DownCast( aLandCoverMapShape->getObject() );
 
@@ -516,30 +516,12 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
       continue;
     }
     
-    QColor aUndefinedColor( Qt::gray );
-    aColor = aUndefinedColor;
-    // TODO
-    //QColor aColor = isLandCoverColoringOn ? aUndefinedColor : aLandCoverMap->GetFillingColor();
-    
-    if ( isLandCoverColoringOn && !aTable.IsNull() ) {
-      QString aStricklerType = "";
-        // TODO
-        //aLandCoverMap->GetStricklerType().toLatin1().constData();
-     
-      if ( aTable->HasType( aStricklerType ) ) {
-        double aStricklerCoeff = aTable->Get( aStricklerType, 0 );
-        Quantity_Color aShapeColor;
-        if ( aColorScale->FindColor( aStricklerCoeff, aShapeColor ) ) {
-          aColor = QColor( aShapeColor.Red() * 255, 
-                           aShapeColor.Green() * 255,
-                           aShapeColor.Blue() * 255 );
-        }
-      }
-    }    
-    
-    aLandCoverMapShape->setFillingColor( aColor, true, true );
-    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;