AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Calculating altitude chart points with the help of following method: ScaleChartData, ReflectChartData, ShiftChartData.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-09-13 15:47:36 +03:00
parent 38969d8130
commit 7c5e968486
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
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,7 +184,8 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
return false;
}
double const freeHeightSpacePxl = drawHeightPxl - deltaAltM / 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,
@ -174,11 +193,11 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
return false;
}
double const shift = heightIndentPxl + freeHeightSpacePxl / 2.0;
size_t const altitudeDataSize = altitudeDataM.size();
yAxisDataPxl.resize(altitudeDataSize);
for (size_t i = 0; i < altitudeDataSize; ++i)
yAxisDataPxl[i] = height - shift - (altitudeDataM[i] - minAltM) / metersPerPxl;
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.