UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/regression/graph_controller] Remove setRoundCrossCursorView's parameter

Browse Source 
Get it directly from model
This commit is contained in:
Ruben Dashyan
2020-02-25 16:35:22 +01:00
committed by LeaNumworks
parent b8b6e4b5b8
commit bdb29b9bf9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/regression/graph_controller.cpp
View File

@@ -84,7 +84,7 @@ void GraphController::viewWillAppear() {
/* Since *m_selectedDotIndex is altered by initCursorParameters(),
* the following must absolutely come at the end. */
setRoundCrossCursorView(*m_selectedDotIndex < 0);
setRoundCrossCursorView();
}
// Private
@@ -319,7 +319,7 @@ bool GraphController::moveCursorVertically(int direction) {
// Select the regression
*m_selectedSeriesIndex = closestRegressionSeries;
*m_selectedDotIndex = -1;
setRoundCrossCursorView(true);
setRoundCrossCursorView();
m_cursor->moveTo(x, x, yValue(*m_selectedSeriesIndex, x, context));
return true;
}
@@ -328,7 +328,7 @@ bool GraphController::moveCursorVertically(int direction) {
// Select the dot
*m_selectedSeriesIndex = closestDotSeries;
*m_selectedDotIndex = dotSelected;
setRoundCrossCursorView(false);
setRoundCrossCursorView();
if (dotSelected == m_store->numberOfPairsOfSeries(*m_selectedSeriesIndex)) {
// Select the mean dot
double x = m_store->meanOfColumn(*m_selectedSeriesIndex, 0);
@@ -396,9 +396,10 @@ InteractiveCurveViewRangeDelegate::Range GraphController::computeYRange(Interact
return range;
}
void GraphController::setRoundCrossCursorView(bool round) {
void GraphController::setRoundCrossCursorView() {
/* At this point, the model (selected series and dot indices) should be up
* to date. */
bool round = *m_selectedDotIndex < 0;
if (round) {
// Set the color although the cursor view stays round
m_roundCursorView.setColor(Palette::DataColor[*m_selectedSeriesIndex]);

2
apps/regression/graph_controller.h
View File

@@ -55,7 +55,7 @@ private:
// InteractiveCurveViewRangeDelegate
Shared::InteractiveCurveViewRangeDelegate::Range computeYRange(Shared::InteractiveCurveViewRange * interactiveCurveViewRange) override;
void setRoundCrossCursorView(bool round);
void setRoundCrossCursorView();
Shared::CursorView m_crossCursorView;
Shared::RoundCursorView m_roundCursorView;
BannerView m_bannerView;