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/statistics] Repaire histogram controller

Browse Source 
Change-Id: Ib8b7a9bed80a0f22a7c6701f863299e4bb5c1527
This commit is contained in:
Émilie Feral
2017-03-02 17:12:25 +01:00
committed by Romain Goyet
parent 3245704ded
commit 08642bad26
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/statistics/histogram_controller.cpp
View File

@@ -66,9 +66,10 @@ bool HistogramController::handleEvent(Ion::Events::Event event) {
}
if (m_view.isMainViewSelected() && (event == Ion::Events::Left || event == Ion::Events::Right)) {
int direction = event == Ion::Events::Left ? -1 : 1;
moveSelection(direction);
reloadBannerView();
m_view.reload();
if (moveSelection(direction)) {
reloadBannerView();
m_view.reload();
}
return true;
}
return false;
@@ -192,10 +193,11 @@ bool HistogramController::moveSelection(int deltaIndex) {
newSelectedBarIndex--;
} while (m_store->heightOfBarAtIndex(newSelectedBarIndex) == 0 && newSelectedBarIndex >= 0);
}
if (newSelectedBarIndex >= 0 && newSelectedBarIndex < m_store->numberOfBars()) {
if (newSelectedBarIndex >= 0 && newSelectedBarIndex < m_store->numberOfBars() && m_selectedBarIndex != newSelectedBarIndex) {
m_selectedBarIndex = newSelectedBarIndex;
m_view.setHighlight(m_store->startOfBarAtIndex(m_selectedBarIndex), m_store->endOfBarAtIndex(m_selectedBarIndex));
return m_store->scrollToSelectedBarIndex(m_selectedBarIndex);
m_store->scrollToSelectedBarIndex(m_selectedBarIndex);
return true;
}
return false;
}

2
apps/statistics/store.cpp
View File

@@ -63,7 +63,7 @@ float Store::startOfBarAtIndex(int index) {
}
float Store::endOfBarAtIndex(int index) {
return startOfBarAtIndex(index) + m_barWidth;
return startOfBarAtIndex(index+1);
}
int Store::numberOfBars() {