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

[apps/statistics] Add temporary parameters for histogram

Browse Source 
Change-Id: I67c21d59263b7eddd7ee8ee9e61c168e6b013d13
This commit is contained in:
Hugo Saint-Vignes
2020-10-21 15:05:33 +02:00
committed by Émilie Feral
parent cab22fcbce
commit a922e44558
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/statistics/histogram_parameter_controller.cpp
View File

@@ -18,6 +18,13 @@ HistogramParameterController::HistogramParameterController(Responder * parentRes
}
}
void HistogramParameterController::viewWillAppear() {
// Initialize temporary parameters to the extracted value.
setParameterAtIndex(0, extractParameterAtIndex(0));
setParameterAtIndex(1, extractParameterAtIndex(1));
FloatParameterController::viewWillAppear();
}
const char * HistogramParameterController::title() {
return I18n::translate(I18n::Message::HistogramSet);
}
@@ -32,11 +39,27 @@ void HistogramParameterController::willDisplayCellForIndex(HighlightCell * cell,
FloatParameterController::willDisplayCellForIndex(cell, index);
}
double HistogramParameterController::parameterAtIndex(int index) {
double HistogramParameterController::extractParameterAtIndex(int index) {
assert(index >= 0 && index < k_numberOfCells);
return index == 0 ? m_store->barWidth() : m_store->firstDrawnBarAbscissa();
}
double HistogramParameterController::parameterAtIndex(int index) {
assert(index >= 0 && index < k_numberOfCells);
return index == 0 ? m_tempBarWidth : m_tempFirstDrawnBarAbscissa;
}
bool HistogramParameterController::confirmParameterAtIndex(int parameterIndex, double value) {
assert(parameterIndex == 0 || parameterIndex == 1);
if (parameterIndex == 0) {
// Set the bar width
m_store->setBarWidth(value);
} else {
m_store->setFirstDrawnBarAbscissa(value);
}
return true;
}
bool HistogramParameterController::setParameterAtIndex(int parameterIndex, double value) {
assert(parameterIndex == 0 || parameterIndex == 1);
const bool setBarWidth = parameterIndex == 0;
@@ -47,8 +70,8 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
return false;
}
const double nextFirstDrawnBarAbscissa = setBarWidth ? m_store->firstDrawnBarAbscissa() : value;
const double nextBarWidth = setBarWidth ? value : m_store->barWidth();
const double nextFirstDrawnBarAbscissa = setBarWidth ? m_tempFirstDrawnBarAbscissa : value;
const double nextBarWidth = setBarWidth ? value : m_tempBarWidth;
// The number of bars cannot be above the max
assert(DoublePairStore::k_numberOfSeries > 0);
@@ -63,9 +86,9 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
if (setBarWidth) {
// Set the bar width
m_store->setBarWidth(value);
m_tempBarWidth = value;
} else {
m_store->setFirstDrawnBarAbscissa(value);
m_tempFirstDrawnBarAbscissa = value;
}
return true;
}
@@ -75,5 +98,12 @@ HighlightCell * HistogramParameterController::reusableParameterCell(int index, i
return &m_cells[index];
}
void HistogramParameterController::buttonAction() {
// Update parameters values and proceed.
if (confirmParameterAtIndex(0, m_tempBarWidth) && confirmParameterAtIndex(1, m_tempFirstDrawnBarAbscissa)) {
FloatParameterController::buttonAction();
}
}
}

11
apps/statistics/histogram_parameter_controller.h
View File

@@ -10,17 +10,24 @@ namespace Statistics {
class HistogramParameterController : public Shared::FloatParameterController<double> {
public:
HistogramParameterController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegateApp, Store * store);
void viewWillAppear() override;
const char * title() override;
int numberOfRows() const override { return 1+k_numberOfCells; }
void willDisplayCellForIndex(HighlightCell * cell, int index) override;
private:
constexpr static int k_numberOfCells = 2;
double extractParameterAtIndex(int index);
double parameterAtIndex(int index) override;
bool confirmParameterAtIndex(int parameterIndex, double f);
bool setParameterAtIndex(int parameterIndex, double f) override;
HighlightCell * reusableParameterCell(int index, int type) override;
int reusableParameterCellCount(int type) override { return k_numberOfCells; }
double parameterAtIndex(int index) override;
bool setParameterAtIndex(int parameterIndex, double f) override;
void buttonAction() override;
MessageTableCellWithEditableText m_cells[k_numberOfCells];
Store * m_store;
// Temporary parameters
double m_tempBarWidth;
double m_tempFirstDrawnBarAbscissa;
};
}