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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-09-08 18:19:36 +03:00
parent ad612cbd27
commit 6a5dead134
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
map/chart_generator.cpp
View file

@ -140,9 +140,11 @@ bool NormalizeChartData(vector<double> const & distanceDataM,
bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
vector<double> const & altitudeDataM, vector<double> & yAxisDataPxl)
{
yAxisDataPxl.clear();
if (altitudeDataM.empty())
{
yAxisDataPxl.clear();
return true;
}
uint32_t constexpr kHeightIndentPxl = 2;
uint32_t heightIndentPxl = kHeightIndentPxl;
@ -164,9 +166,9 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
return false;
}
size_t const altitudeDataSz = altitudeDataM.size();
yAxisDataPxl.resize(altitudeDataSz);
for (size_t i = 0; i < altitudeDataSz; ++i)
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;
return true;
@ -268,7 +270,6 @@ bool GenerateChart(uint32_t width, uint32_t height, vector<double> const & dista
geometry[i] = m2::PointD(i * oneSegLenPix, yAxisDataPxl[i]);
}
frameBuffer.clear();
GenerateChartByPoints(width, height, geometry, mapStyle, frameBuffer);
return true;
}