refs #1832

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

diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
index 0afe0e31f9f880e7c544f5985d5390c2945f7388..7888166a154e4fa55f84f2b97dc2b4e50d9edbe9 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
@@ -22,16 +22,15 @@
 #include <AIS_DisplayMode.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <SelectMgr_SequenceOfOwner.hxx>
-#include <StdPrs_WFDeflectionShape.hxx>
+#include <StdPrs_WFShape.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Face.hxx>
 #include <QColor>
 #include <QString>
 
-const Quantity_Color EDGES_COLOR = Quantity_NOC_WHITE;
+const Quantity_Color EDGES_COLOR = Quantity_NOC_SLATEGRAY;
 const int HILIGHT_ISO_NB = 10;
 
-IMPLEMENT_STANDARD_HANDLE( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
 IMPLEMENT_STANDARD_RTTIEXT( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
 
 HYDROGUI_LandCoverMapPrs::HYDROGUI_LandCoverMapPrs( const Handle(HYDROData_LandCoverMap)& theMap )
@@ -59,12 +58,15 @@ void HYDROGUI_LandCoverMapPrs::SetLandCoverMap( const Handle(HYDROData_LandCover
 
 void HYDROGUI_LandCoverMapPrs::UpdateColors()
 {
-  if( !myLCMap.IsNull() )
-    SetTransparency( myLCMap->GetTransparency() );
-
-  Set( myLCMap->GetShape() );
   SetMaterial( Graphic3d_NOM_PLASTIC );
-  HYDROData_LandCoverMap::Iterator anIt( myLCMap );
+  if( myLCMap.IsNull() )
+  {
+    Set( TopoDS_Shape() );
+    return;
+  }
+  
+  Set( myLCMap->GetShape() );
+  HYDROData_LandCoverMap::Explorer anIt( myLCMap );
   for( ; anIt.More(); anIt.Next() )
   {
     TopoDS_Face aFace = anIt.Face();
@@ -72,15 +74,16 @@ void HYDROGUI_LandCoverMapPrs::UpdateColors()
     Quantity_Color aColor = GetColor( aStricklerType );
     SetCustomColor( aFace, aColor );
     SetCustomWidth( aFace, 1.0 );
-  }
+  } 
+  SetTransparency( myLCMap->GetTransparency() );
 }
 
-Handle(Aspect_ColorScale) HYDROGUI_LandCoverMapPrs::GetColorScale() const
+Handle(AIS_ColorScale) HYDROGUI_LandCoverMapPrs::GetColorScale() const
 {
   return myColorScale;
 }
 
-void HYDROGUI_LandCoverMapPrs::SetColorScale( const Handle(Aspect_ColorScale)& theColorScale )
+void HYDROGUI_LandCoverMapPrs::SetColorScale( const Handle(AIS_ColorScale)& theColorScale )
 {
   myColorScale = theColorScale;
   double aMin = 0, aMax = 0;
@@ -148,7 +151,7 @@ void HYDROGUI_LandCoverMapPrs::Compute( const Handle(PrsMgr_PresentationManager3
   }
 
   if( theMode==AIS_Shaded )
-    StdPrs_WFDeflectionShape::Add( thePresentation, Shape(), myDrawer );
+    StdPrs_WFShape::Add( thePresentation, Shape(), myDrawer );
 }
 
 void HYDROGUI_LandCoverMapPrs::HilightSelected( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
@@ -162,7 +165,7 @@ void HYDROGUI_LandCoverMapPrs::HilightSelected( const Handle(PrsMgr_Presentation
   {
     Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast( theOwners.Value( i ) );
     if( !anOwner.IsNull() )
-      StdPrs_WFDeflectionShape::Add( aSelectPrs, anOwner->Shape(), HilightAttributes() );
+      StdPrs_WFShape::Add( aSelectPrs, anOwner->Shape(), HilightAttributes() );
   }
 
   HilightAttributes()->UIsoAspect()->SetNumber( 0 );
@@ -174,6 +177,8 @@ void HYDROGUI_LandCoverMapPrs::HilightSelected( const Handle(PrsMgr_Presentation
 
 void HYDROGUI_LandCoverMapPrs::SetHilightAttributes( const Quantity_Color& theEdgesColor )
 {
+  if (HilightAttributes().IsNull())
+    AIS_ColoredShape::SetHilightAttributes(new Prs3d_Drawer());
   HilightAttributes()->UIsoAspect()->SetNumber( HILIGHT_ISO_NB );
   HilightAttributes()->UIsoAspect()->SetColor( theEdgesColor );
   HilightAttributes()->VIsoAspect()->SetNumber( HILIGHT_ISO_NB );