diff --git a/apps/graph/Makefile b/apps/graph/Makefile index cec09dd90..12d99d887 100644 --- a/apps/graph/Makefile +++ b/apps/graph/Makefile @@ -8,11 +8,8 @@ app_objs += $(addprefix apps/graph/,\ graph/graph_controller.o\ graph/graph_view.o\ list/list_controller.o\ - values/abscissa_parameter_controller.o\ values/derivative_parameter_controller.o\ values/function_parameter_controller.o\ - values/interval.o\ - values/interval_parameter_controller.o\ values/values_controller.o\ ) diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index e60637201..41629c4db 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -20,7 +20,7 @@ ValuesController::ValuesController(Responder * parentResponder, CartesianFunctio EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small)}, m_functionStore(functionStore), m_intervalParameterController(IntervalParameterController(this, &m_interval)), - m_abscissaParameterController(AbscissaParameterController(this, &m_intervalParameterController)), + m_abscissaParameterController(ValuesParameterController(this, &m_intervalParameterController)), m_functionParameterController(FunctionParameterController(this)), m_derivativeParameterController(DerivativeParameterController(this)), m_setIntervalButton(Button(this, "Regler l'intervalle",Invocation([](void * context, void * sender) { diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h index 20a8c96f8..6f2181a53 100644 --- a/apps/graph/values/values_controller.h +++ b/apps/graph/values/values_controller.h @@ -5,11 +5,11 @@ #include "../cartesian_function_store.h" #include "../function_title_cell.h" #include "../../shared/editable_cell_table_view_controller.h" -#include "interval.h" -#include "abscissa_parameter_controller.h" +#include "../../shared/interval.h" +#include "../../shared/values_parameter_controller.h" #include "derivative_parameter_controller.h" #include "function_parameter_controller.h" -#include "interval_parameter_controller.h" +#include "../../shared/interval_parameter_controller.h" namespace Graph { @@ -17,7 +17,7 @@ class ValuesController : public Shared::EditableCellTableViewController, public public: ValuesController(Responder * parentResponder, CartesianFunctionStore * functionStore, HeaderViewController * header); const char * title() const override; - Interval * interval(); + Shared::Interval * interval(); bool handleEvent(Ion::Events::Event event) override; void didBecomeFirstResponder() override; ViewController * intervalParameterController(); @@ -66,9 +66,9 @@ private: char m_draftTextBuffer[EditableTextCell::k_bufferLength]; EvenOddEditableTextCell m_abscissaCells[k_maxNumberOfAbscissaCells]; CartesianFunctionStore * m_functionStore; - Interval m_interval; - IntervalParameterController m_intervalParameterController; - AbscissaParameterController m_abscissaParameterController; + Shared::Interval m_interval; + Shared::IntervalParameterController m_intervalParameterController; + Shared::ValuesParameterController m_abscissaParameterController; FunctionParameterController m_functionParameterController; DerivativeParameterController m_derivativeParameterController; Button m_setIntervalButton; diff --git a/apps/shared/Makefile b/apps/shared/Makefile index 91c9bf67a..31d6fe23d 100644 --- a/apps/shared/Makefile +++ b/apps/shared/Makefile @@ -18,6 +18,8 @@ app_objs += $(addprefix apps/shared/,\ initialisation_parameter_controller.o\ interactive_curve_view_controller.o\ interactive_curve_view_range.o\ + interval.o\ + interval_parameter_controller.o\ list_controller.o\ list_parameter_controller.o\ memoized_curve_view_range.o\ @@ -27,5 +29,6 @@ app_objs += $(addprefix apps/shared/,\ store_parameter_controller.o\ text_field_delegate.o\ text_field_delegate_app.o\ + values_parameter_controller.o\ zoom_parameter_controller.o\ ) diff --git a/apps/graph/values/interval.cpp b/apps/shared/interval.cpp similarity index 98% rename from apps/graph/values/interval.cpp rename to apps/shared/interval.cpp index 6cc588b29..e2c423f0c 100644 --- a/apps/graph/values/interval.cpp +++ b/apps/shared/interval.cpp @@ -1,7 +1,7 @@ #include "interval.h" #include -namespace Graph { +namespace Shared { Interval::Interval() : m_start(0), diff --git a/apps/graph/values/interval.h b/apps/shared/interval.h similarity index 90% rename from apps/graph/values/interval.h rename to apps/shared/interval.h index 515c9ef87..236d33d7e 100644 --- a/apps/graph/values/interval.h +++ b/apps/shared/interval.h @@ -1,7 +1,7 @@ -#ifndef GRAPH_VALUES_INTERVAL_H -#define GRAPH_VALUES_INTERVAL_H +#ifndef SHARED_VALUES_INTERVAL_H +#define SHARED_VALUES_INTERVAL_H -namespace Graph { +namespace Shared { class Interval { public: diff --git a/apps/graph/values/interval_parameter_controller.cpp b/apps/shared/interval_parameter_controller.cpp similarity index 92% rename from apps/graph/values/interval_parameter_controller.cpp rename to apps/shared/interval_parameter_controller.cpp index 0ff5c8614..edeec377e 100644 --- a/apps/graph/values/interval_parameter_controller.cpp +++ b/apps/shared/interval_parameter_controller.cpp @@ -1,10 +1,7 @@ #include "interval_parameter_controller.h" -#include "../app.h" #include -using namespace Shared; - -namespace Graph { +namespace Shared { IntervalParameterController::IntervalParameterController(Responder * parentResponder, Interval * interval) : FloatParameterController(parentResponder), @@ -19,7 +16,7 @@ const char * IntervalParameterController::title() const { return "Regler l'intervalle"; } -Graph::Interval * IntervalParameterController::interval() { +Interval * IntervalParameterController::interval() { return m_interval; } diff --git a/apps/graph/values/interval_parameter_controller.h b/apps/shared/interval_parameter_controller.h similarity index 84% rename from apps/graph/values/interval_parameter_controller.h rename to apps/shared/interval_parameter_controller.h index b498df6da..ef7db598a 100644 --- a/apps/graph/values/interval_parameter_controller.h +++ b/apps/shared/interval_parameter_controller.h @@ -1,11 +1,11 @@ -#ifndef GRAPH_INTERVAL_PARAM_CONTROLLER_H -#define GRAPH_INTERVAL_PARAM_CONTROLLER_H +#ifndef SHARED_INTERVAL_PARAM_CONTROLLER_H +#define SHARED_INTERVAL_PARAM_CONTROLLER_H #include #include "interval.h" -#include "../../shared/float_parameter_controller.h" +#include "float_parameter_controller.h" -namespace Graph { +namespace Shared { class IntervalParameterController : public Shared::FloatParameterController { public: diff --git a/apps/graph/values/abscissa_parameter_controller.cpp b/apps/shared/values_parameter_controller.cpp similarity index 71% rename from apps/graph/values/abscissa_parameter_controller.cpp rename to apps/shared/values_parameter_controller.cpp index 99b73e35f..e811955ce 100644 --- a/apps/graph/values/abscissa_parameter_controller.cpp +++ b/apps/shared/values_parameter_controller.cpp @@ -1,9 +1,9 @@ -#include "abscissa_parameter_controller.h" +#include "values_parameter_controller.h" #include -namespace Graph { +namespace Shared { -AbscissaParameterController::AbscissaParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController) : +ValuesParameterController::ValuesParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController) : ViewController(parentResponder), m_deleteColumn(PointerTableCell((char*)"Effacer la colonne")), m_copyColumn(PointerTableCellWithChevron((char*)"Copier la colonne dans une liste")), @@ -14,20 +14,20 @@ AbscissaParameterController::AbscissaParameterController(Responder * parentRespo { } -const char * AbscissaParameterController::title() const { +const char * ValuesParameterController::title() const { return "Colonne x"; } -View * AbscissaParameterController::view() { +View * ValuesParameterController::view() { return &m_selectableTableView; } -void AbscissaParameterController::didBecomeFirstResponder() { +void ValuesParameterController::didBecomeFirstResponder() { m_selectableTableView.selectCellAtLocation(0, 0); app()->setFirstResponder(&m_selectableTableView); } -bool AbscissaParameterController::handleEvent(Ion::Events::Event event) { +bool ValuesParameterController::handleEvent(Ion::Events::Event event) { if (event == Ion::Events::OK) { switch (m_selectableTableView.selectedRow()) { case 0: @@ -56,22 +56,22 @@ bool AbscissaParameterController::handleEvent(Ion::Events::Event event) { return false; } -int AbscissaParameterController::numberOfRows() { +int ValuesParameterController::numberOfRows() { return k_totalNumberOfCell; }; -HighlightCell * AbscissaParameterController::reusableCell(int index) { +HighlightCell * ValuesParameterController::reusableCell(int index) { assert(index >= 0); assert(index < k_totalNumberOfCell); HighlightCell * cells[] = {&m_deleteColumn, &m_copyColumn, &m_setInterval}; return cells[index]; } -int AbscissaParameterController::reusableCellCount() { +int ValuesParameterController::reusableCellCount() { return k_totalNumberOfCell; } -KDCoordinate AbscissaParameterController::cellHeight() { +KDCoordinate ValuesParameterController::cellHeight() { return Metric::ParameterCellHeight; } diff --git a/apps/graph/values/abscissa_parameter_controller.h b/apps/shared/values_parameter_controller.h similarity index 68% rename from apps/graph/values/abscissa_parameter_controller.h rename to apps/shared/values_parameter_controller.h index 935c11317..7ba831b58 100644 --- a/apps/graph/values/abscissa_parameter_controller.h +++ b/apps/shared/values_parameter_controller.h @@ -1,13 +1,13 @@ -#ifndef GRAPH_ABSCISSA_PARAM_CONTROLLER_H -#define GRAPH_ABSCISSA_PARAM_CONTROLLER_H +#ifndef SHARED_VALUES_PARAM_CONTROLLER_H +#define SHARED_VALUES_PARAM_CONTROLLER_H #include #include "interval_parameter_controller.h" -namespace Graph { -class AbscissaParameterController : public ViewController, public SimpleListViewDataSource { +namespace Shared { +class ValuesParameterController : public ViewController, public SimpleListViewDataSource { public: - AbscissaParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController); + ValuesParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController); View * view() override; const char * title() const override;