Slightly improved code style in PaintLinearChartView.
This commit is contained in:
parent
d603f4de51
commit
9e8d60065b
|
@ -17,15 +17,12 @@ namespace Statistic {
|
||||||
void PaintLinearChartView(
|
void PaintLinearChartView(
|
||||||
QPainter &p,
|
QPainter &p,
|
||||||
const Data::StatisticalChart &chartData,
|
const Data::StatisticalChart &chartData,
|
||||||
const Limits &xPercentageLimitsNow,
|
const Limits &xPercentageLimits,
|
||||||
const Limits &xPercentageLimitsNowY,
|
const Limits &heightLimits,
|
||||||
const QRect &rect) {
|
const QRect &rect) {
|
||||||
const auto offset = 0;
|
|
||||||
const auto currentMinHeight = rect.y(); //
|
const auto currentMinHeight = rect.y(); //
|
||||||
const auto currentMaxHeight = rect.height() + rect.y(); //
|
const auto currentMaxHeight = rect.height() + rect.y(); //
|
||||||
|
|
||||||
const auto xPercentageLimits = xPercentageLimitsNow;
|
|
||||||
|
|
||||||
for (const auto &line : chartData.lines) {
|
for (const auto &line : chartData.lines) {
|
||||||
const auto additionalP = (chartData.xPercentage.size() < 2)
|
const auto additionalP = (chartData.xPercentage.size() < 2)
|
||||||
? 0.
|
? 0.
|
||||||
|
@ -46,19 +43,15 @@ void PaintLinearChartView(
|
||||||
int(chartData.xPercentage.size() - 1),
|
int(chartData.xPercentage.size() - 1),
|
||||||
endXIndex + additionalPoints);
|
endXIndex + additionalPoints);
|
||||||
|
|
||||||
auto minY = std::numeric_limits<float64>::max();
|
|
||||||
auto maxY = 0.;
|
|
||||||
minY = xPercentageLimitsNowY.min;
|
|
||||||
maxY = xPercentageLimitsNowY.max;
|
|
||||||
|
|
||||||
for (auto i = localStart; i <= localEnd; i++) {
|
for (auto i = localStart; i <= localEnd; i++) {
|
||||||
if (line.y[i] < 0) {
|
if (line.y[i] < 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const auto xPoint = ((chartData.xPercentage[i] - xPercentageLimits.min) / (xPercentageLimits.max - xPercentageLimits.min)) * rect.width()
|
const auto xPoint = rect.width()
|
||||||
- offset;
|
* ((chartData.xPercentage[i] - xPercentageLimits.min)
|
||||||
const auto yPercentage = (line.y[i] - minY)
|
/ (xPercentageLimits.max - xPercentageLimits.min));
|
||||||
/ float64(maxY - minY);
|
const auto yPercentage = (line.y[i] - heightLimits.min)
|
||||||
|
/ float64(heightLimits.max - heightLimits.min);
|
||||||
const auto yPoint = rect.y() + (1. - yPercentage) * rect.height();
|
const auto yPoint = rect.y() + (1. - yPercentage) * rect.height();
|
||||||
if (first) {
|
if (first) {
|
||||||
first = false;
|
first = false;
|
||||||
|
|
|
@ -18,8 +18,8 @@ struct Limits;
|
||||||
void PaintLinearChartView(
|
void PaintLinearChartView(
|
||||||
QPainter &p,
|
QPainter &p,
|
||||||
const Data::StatisticalChart &chartData,
|
const Data::StatisticalChart &chartData,
|
||||||
const Limits &xPercentageLimitsNow,
|
const Limits &xPercentageLimits,
|
||||||
const Limits &xPercentageLimitsNowY,
|
const Limits &heightLimits,
|
||||||
const QRect &rect);
|
const QRect &rect);
|
||||||
|
|
||||||
} // namespace Statistic
|
} // namespace Statistic
|
||||||
|
|
Loading…
Reference in New Issue