Fix merge errors.

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_DTM.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 175b42b8a7fbc6de46515e85eeb0ef2a3b5a90b6..7cc7b68212f07515bd6883a388ccb9f7502a09c2 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -30,7 +30,7 @@
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_PointCloud.hxx>
 #include <HYDROGUI_ShapeBathymetry.h>
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
 #include <QGraphicsItem>
 #include <QGraphicsScene>
 #include <QGraphicsView>
@@ -200,7 +200,7 @@ void test_HYDROData_DTM::test_hydraulic_axis()
   profiles.push_back( aProfile2 );
   profiles.push_back( aProfile3 );
 
-  Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
+  Handle(Geom2d_BSplineCurve) HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
   CPPUNIT_ASSERT_EQUAL( false, (bool)HA.IsNull() );
   CPPUNIT_ASSERT_EQUAL( 3, (int)distances.size() );
 
@@ -244,8 +244,8 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
          aUMin2 = aUMin1,
          aUMax2 = aUMax1;
   gp_Vec2d aProfileDir;
-  std::vector<Handle_Geom2d_Curve> curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir );
-  std::vector<Handle_Geom2d_Curve> curves2 = HYDROData_DTM::ProfileToParametric( aProfile2, aUMin2, aUMax2, aProfileDir );
+  std::vector<Handle(Geom2d_Curve)> curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir );
+  std::vector<Handle(Geom2d_Curve)> curves2 = HYDROData_DTM::ProfileToParametric( aProfile2, aUMin2, aUMax2, aProfileDir );
 
   gp_Pnt2d aFirst, aLast;
   CPPUNIT_ASSERT_EQUAL( 3, (int)curves1.size() );
@@ -496,7 +496,7 @@ void test_HYDROData_DTM::test_curve_to_3d()
   profiles.push_back( aProfile1 );
   profiles.push_back( aProfile2 );
 
-  Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
+  Handle(Geom2d_BSplineCurve) HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
   HYDROData_DTM::AltitudePoints points;
   HYDROData_DTM::CurveUZ mid( 5.0, gp_Vec2d(-10,10), 0 );
   mid.push_back( HYDROData_DTM::PointUZ( 0, 5 ) );
@@ -549,13 +549,13 @@ void test_HYDROData_DTM::test_presentation()
   
   CPPUNIT_ASSERT_EQUAL( 9177, (int)DTM->GetAltitudePoints().size() ); 
 
-  Handle_AIS_InteractiveContext aContext = TestViewer::context();
+  Handle(AIS_InteractiveContext) aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
   aBathPrs->update( true, false );
 
   bool ColorScaleIsDisp = TestViewer::ColorScaleIsDisplayed();
   TestViewer::showColorScale( true );
-  Handle_Aspect_ColorScale aCS = TestViewer::colorScale();
+  Handle(AIS_ColorScale) aCS = TestViewer::colorScale();
   aCS->SetMin( 0.0 );
   aCS->SetMax( 5.0 );
   aCS->SetNumberOfIntervals( 10 );
@@ -602,14 +602,14 @@ void test_HYDROData_DTM::test_garonne()
   
   CPPUNIT_ASSERT_EQUAL( 282338, (int)DTM->GetAltitudePoints().size() ); 
   
-  Handle_AIS_InteractiveContext aContext = TestViewer::context();
+  Handle(AIS_InteractiveContext) aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
   aBathPrs->update( true, false );
   
   bool ColorScaleIsDisp = TestViewer::ColorScaleIsDisplayed();
 
   TestViewer::showColorScale( true );
-  Handle_Aspect_ColorScale aCS = TestViewer::colorScale();
+  Handle(AIS_ColorScale) aCS = TestViewer::colorScale();
   aCS->SetMin( 0.0 );
   aCS->SetMax( 25.0 );
   aCS->SetNumberOfIntervals( 30 );