#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>
aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
aProfile->SetRightPoint( gp_XY( 20, 20 ) );
- HYDROData_DTM::CurveUZ aMid( 0.0 ), aWid( 0.0 );
+ HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0 ), aWid( 0.0, gp_Vec2d(), 0 );
int dummy = 0;
HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 0.5, aMid, aWid, dummy );
CPPUNIT_ASSERT_EQUAL( 11, (int)aMid.size() );
aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
aProfile->SetRightPoint( gp_XY( 20, 20 ) );
- HYDROData_DTM::CurveUZ aMid( 0.0 ), aWid( 0.0 );
+ HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0 ), aWid( 0.0, gp_Vec2d(), 0 );
int dummy = 0 ;
HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 0.5, aMid, aWid, dummy );
CPPUNIT_ASSERT_EQUAL( 11, (int)aMid.size() );
void test_HYDROData_DTM::test_curves_interpolation()
{
- HYDROData_DTM::CurveUZ A(1.0), B(2.0);
+ HYDROData_DTM::CurveUZ A(1.0, gp_Vec2d(), 0), B(2.0, gp_Vec2d(), 0);
A.push_back( HYDROData_DTM::PointUZ( 0, 0 ) );
A.push_back( HYDROData_DTM::PointUZ( 1, 1 ) );
A.push_back( HYDROData_DTM::PointUZ( 2, 2 ) );
Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
HYDROData_DTM::AltitudePoints points;
- HYDROData_DTM::CurveUZ mid( 5.0, gp_Vec2d(-10,10) );
+ HYDROData_DTM::CurveUZ mid( 5.0, gp_Vec2d(-10,10), 0 );
mid.push_back( HYDROData_DTM::PointUZ( 0, 5 ) );
mid.push_back( HYDROData_DTM::PointUZ( 1, 6 ) );
- HYDROData_DTM::CurveUZ wid( 5.0, gp_Vec2d(-10,10) );
+ HYDROData_DTM::CurveUZ wid( 5.0, gp_Vec2d(-10,10), 0 );
wid.push_back( HYDROData_DTM::PointUZ( 2, 5 ) );
wid.push_back( HYDROData_DTM::PointUZ( 6, 6 ) );
- HYDROData_DTM::CurveTo3D( HA, mid, wid, points, 0.0 );
+ HYDROData_DTM::CurveTo3D( HA, mid, wid, points );
CPPUNIT_ASSERT_EQUAL( 4, (int)points.size() );
CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 16.380, -2.186, 6.0 ), points[0] );
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 );
QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_1" );
delete aBathPrs;
+ TestViewer::showColorScale( ColorScaleIsDisp );
aDoc->Close();
}
CPPUNIT_ASSERT_EQUAL( 11, (int)profiles.Size() );
-
-
Handle(HYDROData_DTM) DTM = Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
DTM->SetProfiles( profiles );
DTM->SetDDZ( 0.1 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
DTM->Update();
- CPPUNIT_ASSERT_EQUAL( 275690, (int)DTM->GetAltitudePoints().size() );
-
+ CPPUNIT_ASSERT_EQUAL( 282338, (int)DTM->GetAltitudePoints().size() );
+
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 );
QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_2" );
+ TestViewer::showColorScale( ColorScaleIsDisp );
delete aBathPrs;
-
aDoc->Close();
+
}