From: mzn <mzn@opencascade.com>
Date: Wed, 15 Apr 2015 07:25:04 +0000 (+0300)
Subject: Porting on the new SALOME version.
X-Git-Tag: v1.4.1~32
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_RIVER;p=modules%2Fhydro.git

Porting on the new SALOME version.
---

diff --git a/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx b/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
index 6d970248..bcf0ff8e 100644
--- a/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
+++ b/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
@@ -26,7 +26,7 @@
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <AIS_Drawer.hxx>
+#include <Prs3d_Drawer.hxx>
 #include <DsgPrs_XYZAxisPresentation.hxx>
 #include <gp_Ax2.hxx>
 
@@ -46,13 +46,14 @@ Handle(AIS_Trihedron) HYDROGUI_AISTrihedron::createTrihedron( double theSize )
   aTrihedron->SetArrowColor( aCol.Name() );
   aTrihedron->SetSize( theSize );
 
-  Handle(AIS_Drawer) aDrawer = aTrihedron->Attributes();
-  if ( aDrawer->HasDatumAspect() ) {
+  Handle(Prs3d_Drawer) aDrawer = aTrihedron->Attributes();
+  if ( aDrawer->HasOwnDatumAspect() ) {
     Handle(Prs3d_DatumAspect) aDaspect = aDrawer->DatumAspect();
     aDaspect->FirstAxisAspect()->SetColor( Quantity_Color( 1.0, 0.0, 0.0, Quantity_TOC_RGB ) );
     aDaspect->SecondAxisAspect()->SetColor( Quantity_Color( 0.0, 1.0, 0.0, Quantity_TOC_RGB ) );
     aDaspect->ThirdAxisAspect()->SetColor( Quantity_Color( 0.0, 0.0, 1.0, Quantity_TOC_RGB ) );
   }
+  
   aTrihedron->SetAxis2Placement();
   return aTrihedron;
 }
diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index c54bb9e0..0cd5d09f 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -523,7 +523,7 @@ void HYDROGUI_Shape::buildShape()
   myShape->SetDisplayMode( (AIS_DisplayMode)myDisplayMode );
 
     // Init default params for shape
-  const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
+  const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
   if ( !anAttributes.IsNull() )
   {
     Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
@@ -564,7 +564,7 @@ void HYDROGUI_Shape::updateShape( const bool theToDisplay,
   if ( myShape.IsNull() )
     return;
 
-  const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
+  const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
   if ( !anAttributes.IsNull() )
   {
     if ( myDisplayMode == AIS_Shaded )
@@ -621,7 +621,7 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
   if ( myShape.IsNull() )
     return;
 
-  const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
+  const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
   if ( anAttributes.IsNull() )
     return;
 
diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index 2e43a726..e4eb333a 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@ -26,7 +26,6 @@
 #include <HYDROData_Bathymetry.h>
 
 #include <AIS_InteractiveContext.hxx>
-#include <AIS_Drawer.hxx>
 #include <Aspect_ColorScale.hxx>
 #include <Prs3d_PointAspect.hxx>