#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>
#include <QPixmap>
#include <QApplication>
+#include <QTest>
const double EPS = 1E-3;
public:
DTM_item( HYDROGUI_ShapeBathymetry* theDTM, double d )
{
- Handle(AIS_PointCloud) pc = Handle(AIS_PointCloud)::DownCast( theDTM->getAISObject() );
+ Handle(AIS_PointCloud) pc = Handle(AIS_PointCloud)::DownCast( theDTM->getAISObjects()[0] );
Handle(Graphic3d_ArrayOfPoints) pp = pc->GetPoints();
myBB = QRectF();
double xmin, xmax, ymin, ymax;
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() );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, distances[0], EPS );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 43.499, distances[1], EPS );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 211.474, distances[2], EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 44.859, distances[1], EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 207.661, distances[2], EPS );
gp_Pnt2d p;
gp_Vec2d q;
HA->D1( 0, p, q );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.75, p.X(), EPS );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 6.25, p.Y(), EPS );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.568, q.X(), EPS );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.568, q.Y(), EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.532, q.X(), EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.532, q.Y(), EPS );
aDoc->Close();
}
aProfile2->SetLeftPoint( gp_XY( 10, 10 ) );
aProfile2->SetRightPoint( gp_XY( 20, 20 ) );
- double aUMin1 = std::numeric_limits<double>::max(),
+ double aUMin1 = DBL_MAX,
aUMax1 = -aUMin1,
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() );
aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
aProfile->SetRightPoint( gp_XY( 20, 20 ) );
- HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0 ), aWid( 0.0, gp_Vec2d(), 0 );
+ HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0, 0 ), aWid( 0.0, gp_Vec2d(), 0, 0 );
int dummy = 0;
- HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 0.5, aMid, aWid, dummy );
+ HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 5.0, 0.5, aMid, aWid, dummy );
CPPUNIT_ASSERT_EQUAL( 11, (int)aMid.size() );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, aMid[0].U, EPS );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, aMid[0].Z, EPS );
aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
aProfile->SetRightPoint( gp_XY( 20, 20 ) );
- HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0 ), aWid( 0.0, gp_Vec2d(), 0 );
+ HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0, 0 ), aWid( 0.0, gp_Vec2d(), 0, 0 );
int dummy = 0 ;
- HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 0.5, aMid, aWid, dummy );
+ HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 5.0, 0.5, aMid, aWid, dummy );
CPPUNIT_ASSERT_EQUAL( 11, (int)aMid.size() );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.242, aMid[0].U, EPS );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, aMid[0].Z, EPS );
void test_HYDROData_DTM::test_curves_interpolation()
{
- HYDROData_DTM::CurveUZ A(1.0, gp_Vec2d(), 0), B(2.0, gp_Vec2d(), 0);
+ HYDROData_DTM::CurveUZ A(1.0, gp_Vec2d(), 0, 0), B(2.0, gp_Vec2d(), 0, 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 ) );
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 );
+ HYDROData_DTM::CurveUZ mid( 5.0, gp_Vec2d(-10,10), 0, 10 );
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), 0 );
+ HYDROData_DTM::CurveUZ wid( 5.0, gp_Vec2d(-10,10), 0, 10 );
wid.push_back( HYDROData_DTM::PointUZ( 2, 5 ) );
wid.push_back( HYDROData_DTM::PointUZ( 6, 6 ) );
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] );
- CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 15.673, -1.479, 5.0 ), points[1] );
- CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 14.259, -0.065, 5.0 ), points[2] );
- CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 12.137, 2.056, 6.0 ), points[3] );
+ CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 21.588, 5.419, 6.0 ), points[0] );
+ CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 20.881, 6.126, 5.0 ), points[1] );
+ CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 19.466, 7.541, 5.0 ), points[2] );
+ CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 17.345, 9.662, 6.0 ), points[3] );
aDoc->Close();
}
CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
DTM->Update();
- CPPUNIT_ASSERT_EQUAL( 9177, (int)DTM->GetAltitudePoints().size() );
+ CPPUNIT_ASSERT_EQUAL( 9108, (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 );
+ aBathPrs->RescaleDefault();
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 );
aBathPrs->UpdateWithColorScale( aCS );
-
+ //QTest::qWait(50000);
QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
- CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_1" );
+ CPPUNIT_ASSERT_IMAGES3( &aDTMPrs, "DTM_1", false );
delete aBathPrs;
TestViewer::showColorScale( ColorScaleIsDisp );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
DTM->Update();
- CPPUNIT_ASSERT_EQUAL( 282338, (int)DTM->GetAltitudePoints().size() );
+ CPPUNIT_ASSERT_EQUAL( 281898, (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 );
+ aBathPrs->RescaleDefault();
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 );
aBathPrs->UpdateWithColorScale( aCS );
QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
- CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_2" );
+ CPPUNIT_ASSERT_IMAGES3( &aDTMPrs, "DTM_2", false );
TestViewer::showColorScale( ColorScaleIsDisp );
delete aBathPrs;
aDoc->Close();
{
TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
fname += "/pb_1066.cbf";
- CPPUNIT_ASSERT_EQUAL( DocError_OK, HYDROData_Document::Load( fname.ToCString(), 1 ) );
+ CPPUNIT_ASSERT_EQUAL( (int)DocError_OK, (int)HYDROData_Document::Load( fname.ToCString(), 1 ) );
Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
Handle(HYDROData_CalculationCase) aCase =
Handle(HYDROData_CalculationCase)::DownCast( aDoc->FindObjectByName( "Case_1" ) );
- CPPUNIT_ASSERT_EQUAL( Standard_False, aCase.IsNull() );
+ CPPUNIT_ASSERT_EQUAL( false, aCase.IsNull() );
std::vector<gp_XY> points;
points.push_back( gp_XY( 43.4842, 3.33176 ) );
points.push_back( gp_XY( -125.777, 2.24728 ) );
points.push_back( gp_XY( -60.1628, 168.262 ) );
+ points.push_back( gp_XY( 21.8055587645, 154.699344457 ) );
+ points.push_back( gp_XY( -84.4764138524, 79.2606012276 ) );
+ points.push_back( gp_XY( -73.4132070504, 69.7096313266 ) );
std::vector<double> values = aCase->GetStricklerCoefficientForPoints( points, 0.0, true );
- CPPUNIT_ASSERT_EQUAL( 3, (int)values.size() );
+ CPPUNIT_ASSERT_EQUAL( 6, (int)values.size() );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[0], EPS );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[1], EPS );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0221, values[2], EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0221, values[3], EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0221, values[4], EPS );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0221, values[5], EPS );
std::vector<int> types = aCase->GetStricklerTypeForPoints( points );
- CPPUNIT_ASSERT_EQUAL( 3, (int)types.size() );
+ CPPUNIT_ASSERT_EQUAL( 6, (int)types.size() );
CPPUNIT_ASSERT_EQUAL( 123, types[0] );
CPPUNIT_ASSERT_EQUAL( 123, types[1] );
CPPUNIT_ASSERT_EQUAL( 221, types[2] );
+ CPPUNIT_ASSERT_EQUAL( 221, types[3] );
+ CPPUNIT_ASSERT_EQUAL( 221, types[4] );
+ CPPUNIT_ASSERT_EQUAL( 221, types[5] );
aDoc->Close();
}