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] Fix histogram display if series 0 is empty

Browse Source
This commit is contained in:
Léa Saviot
2018-05-23 11:26:18 +02:00
parent 645fcdfcd8
commit 8980a7d90a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/statistics/histogram_controller.cpp
View File

@@ -84,16 +84,16 @@ View * HistogramController::ContentView::subviewAtIndex(int index) {
return &m_bannerView;
}
int seriesIndex = 0;
int nonEmptySeriesIndex = 0;
while (nonEmptySeriesIndex < index && seriesIndex < Store::k_numberOfSeries) {
int nonEmptySeriesIndex = -1;
while (seriesIndex < Store::k_numberOfSeries) {
if (!m_store->seriesIsEmpty(seriesIndex)) {
nonEmptySeriesIndex++;
if (nonEmptySeriesIndex == index) {
return histogramViewAtIndex(seriesIndex);
}
}
seriesIndex++;
}
if (nonEmptySeriesIndex == index) {
return histogramViewAtIndex(seriesIndex);
}
assert(false);
return nullptr;
}
@@ -190,7 +190,10 @@ bool HistogramController::handleEvent(Ion::Events::Event event) {
}
void HistogramController::didBecomeFirstResponder() {
if (m_selectedSeries < 0) {
if (m_selectedSeries < 0 || m_store->sumOfOccurrences(m_selectedSeries) == 0) {
if (m_selectedSeries >= 0) {
m_view.histogramViewAtIndex(m_selectedSeries)->selectMainView(false);
}
m_selectedSeries = m_view.seriesOfSubviewAtIndex(0);
m_view.histogramViewAtIndex(m_selectedSeries)->selectMainView(true);
}