From 28636c34a364551e0e56bb1d9ba0b4f5151eae7e Mon Sep 17 00:00:00 2001 From: koldo Date: Wed, 11 Dec 2019 08:48:47 +0000 Subject: [PATCH] *ScatterDraw: Fixed histogram git-svn-id: svn://ultimatepp.org/upp/trunk@13750 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ScatterDraw/Histogram.cpp | 2 +- uppsrc/ScatterDraw/Histogram.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/ScatterDraw/Histogram.cpp b/uppsrc/ScatterDraw/Histogram.cpp index 9ea823fd5..b3bd91e5a 100644 --- a/uppsrc/ScatterDraw/Histogram.cpp +++ b/uppsrc/ScatterDraw/Histogram.cpp @@ -106,7 +106,7 @@ Histogram &Histogram::Create(DataSource &data, double min, double max, int numVa ranges[0].SetCount(numVals); double delta = (max - min)/numVals; for (int ii = 0; ii < numVals; ++ii) - ranges[0][ii] = (ii + 1)*delta; + ranges[0][ii] = min + (ii + 0.5)*delta; int64 total = data.GetCount(); totalVals = 0; diff --git a/uppsrc/ScatterDraw/Histogram.h b/uppsrc/ScatterDraw/Histogram.h index e216bfb88..316027a8a 100644 --- a/uppsrc/ScatterDraw/Histogram.h +++ b/uppsrc/ScatterDraw/Histogram.h @@ -125,7 +125,7 @@ public: } inline double x(int64 id) { ASSERT(values.size()); - return id == 0 ? ranges[0][0]/2 : (ranges[0][int(id)] + ranges[0][int(id)-1])/2.; + return ranges[0][int(id)]; } inline virtual int64 GetCount() const {return !values.size() ? 0 : values.size();};