UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/stats] Finer auto range and bar parameters

Browse Source 
The values are computed so that all bars of all histograms are shown
This commit is contained in:
Léa Saviot
2018-05-23 15:45:40 +02:00
parent b0076e05cf
commit c3b343a108
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/statistics/histogram_controller.cpp
View File

@@ -363,11 +363,16 @@ bool HistogramController::moveSelection(int deltaIndex) {
void HistogramController::initRangeParameters() {
assert(m_selectedSeries >= 0 && m_store->sumOfOccurrences(m_selectedSeries) > 0);
float min = m_store->firstDrawnBarAbscissa();
float max = m_store->maxValue(m_selectedSeries);
float minValue = m_store->firstDrawnBarAbscissa();
float maxValue = -FLT_MAX;
for (int i = 0; i < Store::k_numberOfSeries; i ++) {
if (!m_store->seriesIsEmpty(i)) {
maxValue = max(maxValue, m_store->maxValue(i));
}
}
float barWidth = m_store->barWidth();
float xMin = min;
float xMax = max + barWidth;
float xMin = minValue;
float xMax = maxValue + barWidth;
/* if a bar is represented by less than one pixel, we cap xMax */
if ((xMax - xMin)/barWidth > k_maxNumberOfBarsPerWindow) {
xMax = xMin + k_maxNumberOfBarsPerWindow*barWidth;
@@ -399,11 +404,17 @@ void HistogramController::initYRangeParameters(int series) {
void HistogramController::initBarParameters() {
assert(m_selectedSeries >= 0 && m_store->sumOfOccurrences(m_selectedSeries) > 0);
float min = m_store->minValue(m_selectedSeries);
float max = m_store->maxValue(m_selectedSeries);
max = min >= max ? min + std::pow(10.0f, std::floor(std::log10(std::fabs(min)))-1.0f) : max;
m_store->setFirstDrawnBarAbscissa(min);
float barWidth = m_store->computeGridUnit(CurveViewRange::Axis::X, min, max);
float minValue = -FLT_MAX;
float maxValue = FLT_MAX;
for (int i = 0; i < Store::k_numberOfSeries; i ++) {
if (!m_store->seriesIsEmpty(i)) {
minValue = min(minValue, m_store->minValue(i));
maxValue = max(maxValue, m_store->maxValue(i));
}
}
maxValue = minValue >= maxValue ? minValue + std::pow(10.0f, std::floor(std::log10(std::fabs(minValue)))-1.0f) : maxValue;
m_store->setFirstDrawnBarAbscissa(minValue);
float barWidth = m_store->computeGridUnit(CurveViewRange::Axis::X, minValue, maxValue);
if (barWidth <= 0.0f) {
barWidth = 1.0f;
}