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/shared] Fix typos for Interval and curve view temporary params

Browse Source 
Change-Id: I610726ed5966d353397be923b76dd003297940a7
This commit is contained in:
Hugo Saint-Vignes
2020-07-27 14:06:30 +02:00
committed by LeaNumworks
parent d37bf9e344
commit 61792058d3
7 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/shared/interactive_curve_view_controller.h
View File

@@ -57,9 +57,9 @@ protected:
// SimpleInteractiveCurveViewController
float cursorBottomMarginRatio() override;
OkView m_okView;
InteractiveCurveViewRange * interactiveRange() { return m_interactiveRange; }
InteractiveCurveViewRange * interactiveRange(){return m_interactiveRange;}
OkView m_okView;
private:
/* The value 21 is the actual height of the ButtonRow, that is
* ButtonRowController::ContentView::k_plainStyleHeight + 1.

2
apps/shared/interval.cpp
View File

@@ -47,7 +47,7 @@ void Interval::reset() {
void Interval::clear() {
m_parameters.setStart(1.0);
m_parameters.setEnd(10.0);
m_parameters.setEnd(0.0);
m_parameters.setStep(1.0);
m_needCompute = true;
}

34
apps/shared/interval.h
View File

@@ -10,22 +10,22 @@ public:
Interval(const Interval&) = delete;
int numberOfElements();
void deleteElementAtIndex(int index);
class intervalParameters {
public:
void setStart(double f) { m_start = f; }
void setEnd(double f) { m_end = f; }
void setStep(double f) {m_step = f; }
double start() const { return m_start; }
double end() const { return m_end; }
double step() const { return m_step; }
private:
double m_start;
double m_end;
double m_step;
class IntervalParameters {
public:
void setStart(double f) { m_start = f; }
void setEnd(double f) { m_end = f; }
void setStep(double f) { m_step = f; }
double start() const { return m_start; }
double end() const { return m_end; }
double step() const { return m_step; }
private:
double m_start;
double m_end;
double m_step;
};
double element(int i);
intervalParameters * parameters() { return &m_parameters; }
void setParameters(intervalParameters parameters) { m_parameters = parameters; }
IntervalParameters * parameters() { return &m_parameters; }
void setParameters(IntervalParameters parameters) { m_parameters = parameters; }
void setElement(int i, double f);
void forceRecompute(){ m_needCompute = true;}
void reset();
@@ -37,11 +37,11 @@ private:
int m_numberOfElements;
double m_intervalBuffer[k_maxNumberOfElements];
bool m_needCompute;
intervalParameters m_parameters;
IntervalParameters m_parameters;
};
typedef void (Interval::intervalParameters::*SetterPointer)(double);
typedef double (Interval::intervalParameters::*GetterPointer)() const;
typedef void (Interval::IntervalParameters::*SetterPointer)(double);
typedef double (Interval::IntervalParameters::*GetterPointer)() const;
}

25
apps/shared/interval_parameter_controller.cpp
View File

@@ -2,7 +2,10 @@
namespace Shared {
static Interval::intervalParameters s_tempIntevalParameters;
Interval::IntervalParameters * IntervalParameterController::SharedTempIntervalParameters() {
static Interval::IntervalParameters sTempIntervalParameters;
return &sTempIntervalParameters;
}
IntervalParameterController::IntervalParameterController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate) :
FloatParameterController<double>(parentResponder),
@@ -18,9 +21,9 @@ IntervalParameterController::IntervalParameterController(Responder * parentRespo
}
}
void IntervalParameterController::setInterval(Interval * interval) {
void IntervalParameterController::setInterval(Interval * interval) {
m_interval = interval;
s_tempIntevalParameters = *(*interval).parameters();
*SharedTempIntervalParameters() = *(interval->parameters());
}
const char * IntervalParameterController::title() {
@@ -49,8 +52,8 @@ void IntervalParameterController::willDisplayCellForIndex(HighlightCell * cell,
}
double IntervalParameterController::parameterAtIndex(int index) {
GetterPointer getters[k_totalNumberOfCell] = {&Shared::Interval::intervalParameters::start, &Shared::Interval::intervalParameters::end, &Shared::Interval::intervalParameters::step};
return (s_tempIntevalParameters.*getters[index])();
GetterPointer getters[k_totalNumberOfCell] = {&Shared::Interval::IntervalParameters::start, &Shared::Interval::IntervalParameters::end, &Shared::Interval::IntervalParameters::step};
return (SharedTempIntervalParameters()->*getters[index])();
}
bool IntervalParameterController::setParameterAtIndex(int parameterIndex, double f) {
@@ -58,18 +61,18 @@ bool IntervalParameterController::setParameterAtIndex(int parameterIndex, double
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
double start = parameterIndex == 0 ? f : s_tempIntevalParameters.start();
double end = parameterIndex == 1 ? f : s_tempIntevalParameters.end();
double start = parameterIndex == 0 ? f : SharedTempIntervalParameters()->start();
double end = parameterIndex == 1 ? f : SharedTempIntervalParameters()->end();
if (start > end) {
if (parameterIndex == 1) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
double g = f+1.0;
s_tempIntevalParameters.setEnd(g);
SharedTempIntervalParameters()->setEnd(g);
}
SetterPointer setters[k_totalNumberOfCell] = {&Shared::Interval::intervalParameters::setStart, &Shared::Interval::intervalParameters::setEnd, &Shared::Interval::intervalParameters::setStep};
(s_tempIntevalParameters.*setters[parameterIndex])(f);
SetterPointer setters[k_totalNumberOfCell] = {&Shared::Interval::IntervalParameters::setStart, &Shared::Interval::IntervalParameters::setEnd, &Shared::Interval::IntervalParameters::setStep};
(SharedTempIntervalParameters()->*setters[parameterIndex])(f);
return true;
}
@@ -92,7 +95,7 @@ int IntervalParameterController::reusableParameterCellCount(int type) {
}
void IntervalParameterController::buttonAction() {
m_interval->setParameters(s_tempIntevalParameters);
m_interval->setParameters(*SharedTempIntervalParameters());
m_interval->forceRecompute();
StackViewController * stack = stackController();
stack->pop();

1
apps/shared/interval_parameter_controller.h
View File

@@ -24,6 +24,7 @@ protected:
Interval * m_interval;
bool handleEvent(Ion::Events::Event event) override;
private:
static Interval::IntervalParameters * SharedTempIntervalParameters();
HighlightCell * reusableParameterCell(int index, int type) override;
int reusableParameterCellCount(int type) override;
double parameterAtIndex(int index) override;

1
apps/shared/range_parameter_controller.cpp
View File

@@ -131,5 +131,4 @@ void RangeParameterController::buttonAction() {
stack->pop();
}
}

2
apps/shared/range_parameter_controller.h
View File

@@ -36,6 +36,7 @@ private:
int reusableParameterCellCount(int type) override;
float parameterAtIndex(int index) override;
bool setParameterAtIndex(int parameterIndex, float f) override;
void buttonAction() override;
constexpr static int k_numberOfEditableTextCell = 2;
constexpr static int k_numberOfConvertibleTextCell = 2;
constexpr static int k_numberOfTextCell = k_numberOfEditableTextCell+k_numberOfConvertibleTextCell;
@@ -44,7 +45,6 @@ private:
MessageTableCellWithEditableText m_xRangeCells[k_numberOfEditableTextCell];
MessageTableCellWithConvertibleEditableText m_yRangeCells[k_numberOfConvertibleTextCell];
MessageTableCellWithSwitch m_yAutoCell;
void buttonAction() override;
};
}