LCM // Import/Export of SHP p.3

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

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index a8e7370742ea98954840bd991f932ab593ece12f..aa5a6fe75924d97bef3f89c4c341c6815c807feb 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -23,8 +23,7 @@
 #include "HYDROGUI_Tool.h"
 #include <HYDROGUI_ShapeImage.h>
 #include <HYDROGUI_ShapeBathymetry.h>
-// TODO
-//#include <HYDROGUI_ShapeLandCoverMap.h>
+#include <HYDROGUI_ShapeLandCoverMap.h>
 #include "HYDROGUI_Operation.h"
 #include "HYDROGUI_DataObject.h"
 #include "HYDROGUI_ZLayers.h"
@@ -168,9 +167,7 @@ HYDROGUI_Shape* HYDROGUI_OCCDisplayer::createShape( const int
     aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle_HYDROData_Bathymetry::DownCast( theObject ) );
   else if( theObject->IsKind( STANDARD_TYPE( HYDROData_LandCoverMap ) ) ) {
     bool isScalarMode = module()->isLandCoversScalarMapModeOn( theViewerId );
-    /* TODO
-    aResShape = new HYDROGUI_ShapeLandCover( 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 );
@@ -422,7 +419,7 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
   int aViewerId = (size_t)theViewer;//TODO: check if viewer id is correct
   bool isLandCoverColoringOn = module()->isLandCoversScalarMapModeOn( aViewerId );
     
-  QList<HYDROGUI_Shape*> aLandCoverShapes = module()->getObjectShapes( aViewerId, KIND_LAND_COVER_MAP );
+  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;
@@ -503,29 +500,31 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
       aView->ColorScaleErase();
   }
 
-  /* TODO
-  foreach( HYDROGUI_Shape* aShape, aLandCoverShapes ) {
-    HYDROGUI_ShapeLandCover* aLandCoverShape = 
-      dynamic_cast<HYDROGUI_ShapeLandCover*>( aShape );
+  foreach( HYDROGUI_Shape* aShape, aLandCoverMapShapes ) {
+    HYDROGUI_ShapeLandCoverMap* aLandCoverMapShape = 
+      dynamic_cast<HYDROGUI_ShapeLandCoverMap*>( aShape );
 
-    if ( !aLandCoverShape || !aLandCoverShape->isVisible() ) {
+    if ( !aLandCoverMapShape || !aLandCoverMapShape->isVisible() ) {
       continue;
     }
     
     QColor aColor;    
-    Handle(HYDROData_LandCover) aLandCover = 
-      Handle(HYDROData_LandCover)::DownCast( aLandCoverShape->getObject() );
+    Handle(HYDROData_LandCoverMap) aLandCoverMap = 
+      Handle(HYDROData_LandCoverMap)::DownCast( aLandCoverMapShape->getObject() );
 
-    if ( aLandCover.IsNull() ) {
+    if ( aLandCoverMap.IsNull() ) {
       continue;
     }
     
     QColor aUndefinedColor( Qt::gray );
-    QColor aColor = isLandCoverColoringOn ? aUndefinedColor : aLandCover->GetFillingColor();
+    aColor = aUndefinedColor;
+    // TODO
+    //QColor aColor = isLandCoverColoringOn ? aUndefinedColor : aLandCoverMap->GetFillingColor();
     
     if ( isLandCoverColoringOn && !aTable.IsNull() ) {
-      QString aStricklerType = 
-        aLandCover->GetStricklerType().toLatin1().constData();
+      QString aStricklerType = "";
+        // TODO
+        //aLandCoverMap->GetStricklerType().toLatin1().constData();
      
       if ( aTable->HasType( aStricklerType ) ) {
         double aStricklerCoeff = aTable->Get( aStricklerType, 0 );
@@ -538,11 +537,10 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
       }
     }    
     
-    aLandCoverShape->setFillingColor( aColor, true, true );
-    aLandCoverShape->setScalarMapModeEnabled( isLandCoverColoringOn );
-    theViewer->getAISContext()->Redisplay( aLandCoverShape->getAISObject() );
+    aLandCoverMapShape->setFillingColor( aColor, true, true );
+    aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn );
+    theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObject() );
   }
-  */
-
+  
   myToUpdateColorScale = false;
 }