kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #4256 from bykoianko/master-moving-to-the-middle-route-altitude-chart

Browse source 
Moving altitude chart diagram to the middle of the canvas.
This commit is contained in:
mpimenov 2016-09-14 13:35:14 +03:00 • committed by GitHub
commit fe21053628
3 changed files with 65 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
map/chart_generator.cpp
View file

@ -83,6 +83,24 @@ agg::rgba8 GetCurveColor(MapStyle mapStyle)
namespace maps
{
void ScaleChartData(vector<double> & chartData, double scale)
{
for (size_t i = 0; i < chartData.size(); ++i)
chartData[i] *= scale;
}
void ShiftChartData(vector<double> & chartData, double shift)
{
for (size_t i = 0; i < chartData.size(); ++i)
chartData[i] += shift;
}
void ReflectChartData(vector<double> & chartData)
{
for (size_t i = 0; i < chartData.size(); ++i)
chartData[i] = -chartData[i];
}
bool NormalizeChartData(vector<double> const & distanceDataM,
feature::TAltitudes const & altitudeDataM, size_t resultPointCount,
vector<double> & uniformAltitudeDataM)
@ -166,10 +184,20 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
return false;
}
size_t const altitudeDataSize = altitudeDataM.size();
yAxisDataPxl.resize(altitudeDataSize);
for (size_t i = 0; i < altitudeDataSize; ++i)
yAxisDataPxl[i] = height - heightIndentPxl - (altitudeDataM[i] - minAltM) / metersPerPxl;
double const deltaAltPxl = deltaAltM / metersPerPxl;
double const freeHeightSpacePxl = drawHeightPxl - deltaAltPxl;
if (freeHeightSpacePxl < 0 || freeHeightSpacePxl > drawHeightPxl)
{
LOG(LERROR, ("Number of pixels free of chart points (", freeHeightSpacePxl,
") is below zero or greater than the number of pixels for the chart (", drawHeightPxl, ")."));
return false;
}
double const maxAltPxl = maxAltM / metersPerPxl;
yAxisDataPxl.assign(altitudeDataM.cbegin(), altitudeDataM.cend());
ScaleChartData(yAxisDataPxl, 1.0 / metersPerPxl);
ReflectChartData(yAxisDataPxl);
ShiftChartData(yAxisDataPxl, maxAltPxl + heightIndentPxl + freeHeightSpacePxl / 2.0);
return true;
}

5
map/chart_generator.hpp
View file

@ -10,8 +10,13 @@
namespace maps
{
uint32_t constexpr kAltitudeChartBPP = 4;
void ScaleChartData(vector<double> & chartData, double scale);
void ShiftChartData(vector<double> & chartData, double shift);
void ReflectChartData(vector<double> & chartData);
/// \brief fills uniformAltitudeDataM with altitude data which evenly distributed by
/// |resultPointCount| points. |distanceDataM| and |altitudeDataM| form a curve of route altitude.
/// This method is used to generalize and evenly distribute points of the chart.

32
map/map_tests/chart_generator_tests.cpp
View file

@ -47,6 +47,30 @@ void TestAngleColors(size_t width, size_t height, vector<uint8_t> const & frameB
expectedR, expectedG, expectedB, expectedA), ());
}
UNIT_TEST(ScaleChartData_Test)
{
vector<double> chartData = {0.0, -1.0, 2.0};
maps::ScaleChartData(chartData, 2.0 /* scale */);
vector<double> const expectedChartData = {0.0, -2.0, 4.0};
TEST_EQUAL(chartData, expectedChartData, ());
}
UNIT_TEST(ShiftChartData_Test)
{
vector<double> chartData = {0.0, -1.0, 2.0};
maps::ShiftChartData(chartData, 1 /* shift */);
vector<double> const expectedChartData = {1.0, 0.0, 3.0};
TEST_EQUAL(chartData, expectedChartData, ());
}
UNIT_TEST(ReflectChartData_Test)
{
vector<double> chartData = {0.0, -1.0, 2.0};
maps::ReflectChartData(chartData);
vector<double> const expectedChartData = {0.0, 1.0, -2.0};
TEST_EQUAL(chartData, expectedChartData, ());
}
UNIT_TEST(NormalizeChartData_SmokeTest)
{
vector<double> const distanceDataM = {0.0, 0.0, 0.0};
@ -104,8 +128,8 @@ UNIT_TEST(GenerateYAxisChartData_SmokeTest)
vector<double> yAxisDataPxl;
TEST(maps::GenerateYAxisChartData(30 /* height */, 1.0 /* minMetersPerPxl */, altitudeDataM, yAxisDataPxl), ());
vector<double> expecttedYAxisDataPxl = {28.0, 28.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expecttedYAxisDataPxl), ());
vector<double> expectedYAxisDataPxl = {15.0, 15.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expectedYAxisDataPxl), ());
}
UNIT_TEST(GenerateYAxisChartData_EmptyAltitudeDataTest)
@ -123,8 +147,8 @@ UNIT_TEST(GenerateYAxisChartData_Test)
vector<double> yAxisDataPxl;
TEST(maps::GenerateYAxisChartData(100 /* height */, 1.0 /* minMetersPerPxl */, altitudeDataM, yAxisDataPxl), ());
vector<double> expecttedYAxisDataPxl = {96.0, 94.0, 96.0, 98.0, 95.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expecttedYAxisDataPxl), ());
vector<double> expectedYAxisDataPxl = {50.0, 48.0, 50.0, 52.0, 49.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expectedYAxisDataPxl), ());
}
UNIT_TEST(GenerateChartByPoints_NoGeometryTest)