lot 10 - warnings for DTM - untested

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

diff --git a/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx b/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx
index 3446545e3db4973a5ed49219077f8079eaa82aa3..e39176837ff9eafe6dfcc0aa7fda278c02627eb8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx
@@ -46,6 +46,10 @@ HYDROGUI_ShapeLandCoverMap::HYDROGUI_ShapeLandCoverMap( HYDROGUI_OCCDisplayer* t
 
 HYDROGUI_ShapeLandCoverMap::~HYDROGUI_ShapeLandCoverMap()
 {
+#ifndef LIGHT_MODE
+  if( myDisplayer )
+    myDisplayer->SetToUpdateColorScale();
+#endif
 }
 
 void HYDROGUI_ShapeLandCoverMap::update( bool theIsUpdateViewer, bool isDeactivateSelection )
@@ -60,7 +64,8 @@ void HYDROGUI_ShapeLandCoverMap::update( bool theIsUpdateViewer, bool isDeactiva
     setShape( aLandCoverMapShape, false, false );
   }
 
-  Handle(HYDROGUI_LandCoverMapPrs) aLandCoverMapPrs = Handle(HYDROGUI_LandCoverMapPrs)::DownCast( getAISObject() );
+  Handle(HYDROGUI_LandCoverMapPrs) aLandCoverMapPrs = 
+    Handle(HYDROGUI_LandCoverMapPrs)::DownCast( getAISObjects()[0] );
   if ( !aLandCoverMapPrs.IsNull() )
     aLandCoverMapPrs->UpdateColors();
 
@@ -91,8 +96,10 @@ void HYDROGUI_ShapeLandCoverMap::displayShape( const bool theIsUpdateViewer )
   myDisplayer->SetToUpdateColorScale();
 }
 
-Handle(AIS_InteractiveObject) HYDROGUI_ShapeLandCoverMap::createShape() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_ShapeLandCoverMap::createShape() const
 {
+  QList<Handle(AIS_InteractiveObject)> shapes;
+
   Handle(HYDROData_LandCoverMap) aLandCoverMap = Handle(HYDROData_LandCoverMap)::DownCast( getObject() );
   if ( !aLandCoverMap.IsNull() )
   {
@@ -119,9 +126,9 @@ Handle(AIS_InteractiveObject) HYDROGUI_ShapeLandCoverMap::createShape() const
         }
       }
     }
-    return aLandCoverMapPrs;
+    shapes.append( aLandCoverMapPrs );
   }
-  return NULL;
+  return shapes;
 }
 
 void HYDROGUI_ShapeLandCoverMap::display( const bool theIsUpdateViewer )