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] Rule of 5 (3)

Browse Source 
Change-Id: Ia85b23a09e9debd62b4f3590463a4f16454ef4b7
This commit is contained in:
Émilie Feral
2017-05-05 18:43:09 +02:00
parent ccd1cef028
commit 96733dbbdc
53 changed files with 157 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/calculation/app.cpp
View File

@@ -9,10 +9,10 @@ namespace Calculation {
App::App(Container * container, Context * context) :
TextFieldDelegateApp(container, &m_editExpressionController, I18n::Message::CalculApp, I18n::Message::CalculAppCapital, ImageStore::CalculationIcon),
m_localContext(LocalContext((GlobalContext *)context, &m_calculationStore)),
m_localContext((GlobalContext *)context, &m_calculationStore),
m_calculationStore(),
m_historyController(HistoryController(&m_editExpressionController, &m_calculationStore)),
m_editExpressionController(EditExpressionController(&m_modalViewController, &m_historyController, &m_calculationStore))
m_historyController(&m_editExpressionController, &m_calculationStore),
m_editExpressionController(&m_modalViewController, &m_historyController, &m_calculationStore)
{
}

4
apps/calculation/history_view_cell.cpp
View File

@@ -8,8 +8,8 @@ namespace Calculation {
HistoryViewCell::HistoryViewCell() :
Responder(nullptr),
m_inputView(ScrollableExpressionView(this)),
m_outputView(ScrollableExpressionView(this)),
m_inputView(this),
m_outputView(this),
m_selectedSubviewType(HistoryViewCell::SubviewType::Output)
{
}

2
apps/calculation/scrollable_expression_view.cpp
View File

@@ -6,7 +6,7 @@ namespace Calculation {
ScrollableExpressionView::ScrollableExpressionView(Responder * parentResponder) :
ScrollableView(parentResponder, &m_expressionView, this),
m_expressionView(ExpressionView())
m_expressionView()
{
}

24
apps/graph/app.cpp
View File

@@ -10,19 +10,19 @@ namespace Graph {
App::App(Container * container, Context * context) :
FunctionApp(container, &m_inputViewController, I18n::Message::FunctionApp, I18n::Message::FunctionAppCapital, ImageStore::GraphIcon),
m_functionStore(),
m_xContext(VariableContext('x', context)),
m_listController(ListController(&m_listFooter, &m_functionStore, &m_listHeader, &m_listFooter)),
m_listFooter(ButtonRowController(&m_listHeader, &m_listController, &m_listController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey)),
m_listHeader(ButtonRowController(&m_listStackViewController, &m_listFooter, &m_listController)),
m_listStackViewController(StackViewController(&m_tabViewController, &m_listHeader)),
m_graphController(GraphController(&m_graphAlternateEmptyViewController, &m_functionStore, &m_graphHeader)),
m_graphAlternateEmptyViewController(AlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController)),
m_graphHeader(ButtonRowController(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController)),
m_graphStackViewController(StackViewController(&m_tabViewController, &m_graphHeader)),
m_xContext('x', context),
m_listController(&m_listFooter, &m_functionStore, &m_listHeader, &m_listFooter),
m_listFooter(&m_listHeader, &m_listController, &m_listController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey),
m_listHeader(&m_listStackViewController, &m_listFooter, &m_listController),
m_listStackViewController(&m_tabViewController, &m_listHeader),
m_graphController(&m_graphAlternateEmptyViewController, &m_functionStore, &m_graphHeader),
m_graphAlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController),
m_graphHeader(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController),
m_graphStackViewController(&m_tabViewController, &m_graphHeader),
m_valuesController(&m_valuesAlternateEmptyViewController, &m_functionStore, &m_valuesHeader),
m_valuesAlternateEmptyViewController(AlternateEmptyViewController(&m_valuesHeader, &m_valuesController, &m_valuesController)),
m_valuesHeader(ButtonRowController(&m_valuesStackViewController, &m_valuesAlternateEmptyViewController, &m_valuesController)),
m_valuesStackViewController(StackViewController(&m_tabViewController, &m_valuesHeader)),
m_valuesAlternateEmptyViewController(&m_valuesHeader, &m_valuesController, &m_valuesController),
m_valuesHeader(&m_valuesStackViewController, &m_valuesAlternateEmptyViewController, &m_valuesController),
m_valuesStackViewController(&m_tabViewController, &m_valuesHeader),
m_tabViewController(&m_inputViewController, &m_listStackViewController, &m_graphStackViewController, &m_valuesStackViewController),
m_inputViewController(&m_modalViewController, &m_tabViewController, this)
{

6
apps/graph/graph/curve_parameter_controller.cpp
View File

@@ -7,10 +7,10 @@ namespace Graph {
CurveParameterController::CurveParameterController(InteractiveCurveViewRange * graphRange, BannerView * bannerView, CurveViewCursor * cursor) :
FunctionCurveParameterController(graphRange, cursor),
m_goToParameterController(FunctionGoToParameterController(this, graphRange, cursor, I18n::Message::X)),
m_goToParameterController(this, graphRange, cursor, I18n::Message::X),
m_bannerView(bannerView),
m_calculationCell(MessageTableCellWithChevron(I18n::Message::Compute)),
m_derivativeCell(MessageTableCellWithSwitch(I18n::Message::DerivateNumber))
m_calculationCell(I18n::Message::Compute),
m_derivativeCell(I18n::Message::DerivateNumber)
{
}

8
apps/graph/graph/graph_controller.cpp
View File

@@ -7,10 +7,10 @@ namespace Graph {
GraphController::GraphController(Responder * parentResponder, CartesianFunctionStore * functionStore, ButtonRowController * header) :
FunctionGraphController(parentResponder, header, &m_graphRange, &m_view),
m_bannerView(BannerView()),
m_view(GraphView(functionStore, &m_graphRange, &m_cursor, &m_bannerView, &m_cursorView)),
m_graphRange(InteractiveCurveViewRange(&m_cursor, this)),
m_curveParameterController(CurveParameterController(&m_graphRange, &m_bannerView, &m_cursor)),
m_bannerView(),
m_view(functionStore, &m_graphRange, &m_cursor, &m_bannerView, &m_cursorView),
m_graphRange(&m_cursor, this),
m_curveParameterController(&m_graphRange, &m_bannerView, &m_cursor),
m_functionStore(functionStore)
{
}

2
apps/graph/list/list_controller.cpp
View File

@@ -11,7 +11,7 @@ ListController::ListController(Responder * parentResponder, CartesianFunctionSto
Shared::ListController(parentResponder, functionStore, header, footer, I18n::Message::AddFunction),
m_functionTitleCells{},
m_expressionCells{},
m_parameterController(ListParameterController(this, functionStore, I18n::Message::FunctionColor, I18n::Message::DeleteFunction))
m_parameterController(this, functionStore, I18n::Message::FunctionColor, I18n::Message::DeleteFunction)
{
}

8
apps/graph/values/derivative_parameter_controller.cpp
View File

@@ -6,12 +6,12 @@ namespace Graph {
DerivativeParameterController::DerivativeParameterController(ValuesController * valuesController) :
ViewController(valuesController),
m_hideColumn(MessageTableCell(I18n::Message::HideDerivativeColumn)),
m_hideColumn(I18n::Message::HideDerivativeColumn),
#if COPY_COLUMN
m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)),
m_copyColumn(I18n::Message::CopyColumnInList),
#endif
m_selectableTableView(SelectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this)),
m_selectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this),
m_function(nullptr),
m_valuesController(valuesController)
{

2
apps/graph/values/function_parameter_controller.cpp
View File

@@ -8,7 +8,7 @@ namespace Graph {
FunctionParameterController::FunctionParameterController(ValuesController * valuesController) :
ValuesFunctionParameterController('x'),
m_displayDerivativeColumn(MessageTableCellWithSwitch(I18n::Message::DerivativeFunctionColumn)),
m_displayDerivativeColumn(I18n::Message::DerivativeFunctionColumn),
m_cartesianFunction(nullptr),
m_valuesController(valuesController)
{

6
apps/graph/values/values_controller.cpp
View File

@@ -12,9 +12,9 @@ ValuesController::ValuesController(Responder * parentResponder, CartesianFunctio
m_functionTitleCells{},
m_floatCells{},
m_functionStore(functionStore),
m_functionParameterController(FunctionParameterController(this)),
m_intervalParameterController(IntervalParameterController(this, &m_interval)),
m_derivativeParameterController(DerivativeParameterController(this))
m_functionParameterController(this),
m_intervalParameterController(this, &m_interval),
m_derivativeParameterController(this)
{
}

2
apps/hardware_test/app.cpp
View File

@@ -9,7 +9,7 @@ namespace HardwareTest {
App::App(AppsContainer * container) :
::App(container, &m_keyboardController),
m_keyboardController(KeyboardController(&m_modalViewController))
m_keyboardController(&m_modalViewController)
{
}

2
apps/hardware_test/color_controller.cpp
View File

@@ -8,7 +8,7 @@ namespace HardwareTest {
ColorController::ColorController(Responder * parentResponder) :
ViewController(parentResponder),
m_view(ColorView())
m_view()
{
}

4
apps/hardware_test/keyboard_controller.cpp
View File

@@ -8,9 +8,9 @@ namespace HardwareTest {
KeyboardController::KeyboardController(Responder * parentResponder) :
ViewController(parentResponder),
m_view(KeyboardView()),
m_view(),
m_color(KDColorBlack),
m_colorController(ColorController(nullptr))
m_colorController(nullptr)
{
}

6
apps/hardware_test/keyboard_view.cpp
View File

@@ -8,9 +8,9 @@ namespace HardwareTest {
KeyboardView::KeyboardView() :
m_testedKey(Ion::Keyboard::Key::A1),
m_batteryLevelView(BufferTextView(KDText::FontSize::Small)),
m_batteryChargingView(BufferTextView(KDText::FontSize::Small)),
m_ledStateView(BufferTextView(KDText::FontSize::Small))
m_batteryLevelView(KDText::FontSize::Small),
m_batteryChargingView(KDText::FontSize::Small),
m_ledStateView(KDText::FontSize::Small)
{
for (int i = 0; i < Ion::Keyboard::NumberOfKeys; i++) {
m_defectiveKey[i] = 0;

2
apps/home/app.cpp
View File

@@ -10,7 +10,7 @@ namespace Home {
App::App(AppsContainer * container) :
::App(container, &m_controller, I18n::Message::Apps, I18n::Message::AppsCapital, nullptr, I18n::Message::Warning),
m_controller(Controller(&m_modalViewController, container))
m_controller(&m_modalViewController, container)
{
}

2
apps/home/app_cell.cpp
View File

@@ -5,7 +5,7 @@ namespace Home {
AppCell::AppCell() :
HighlightCell(),
m_nameView(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, KDColorWhite)),
m_nameView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, KDColorWhite),
m_visible(true)
{
}

4
apps/home/controller.cpp
View File

@@ -7,8 +7,8 @@ extern "C" {
namespace Home {
Controller::ContentView::ContentView(Controller * controller) :
m_selectableTableView(SelectableTableView(controller, controller, 0, 0, 0, k_sideMargin, 0, k_sideMargin, controller, true, false,
KDColorBlack, k_indicatorThickness, Palette::GreyDark, Palette::GreyMiddle, k_indicatorMargin))
m_selectableTableView(controller, controller, 0, 0, 0, k_sideMargin, 0, k_sideMargin, controller, true, false,
KDColorBlack, k_indicatorThickness, Palette::GreyDark, Palette::GreyMiddle, k_indicatorMargin)
{
}

2
apps/probability/cell.cpp
View File

@@ -5,7 +5,7 @@ namespace Probability {
Cell::Cell() :
HighlightCell(),
m_labelView(MessageTextView(KDText::FontSize::Large, (I18n::Message)0, 0, 0.5, KDColorBlack, KDColorWhite))
m_labelView(KDText::FontSize::Large, (I18n::Message)0, 0, 0.5, KDColorBlack, KDColorWhite)
{
}

2
apps/probability/image_table_view.cpp
View File

@@ -56,7 +56,7 @@ void ImageCell::setImage(const Image * image, const Image * focusedImage) {
ImageTableView::ImageTableView(Responder * parentResponder, Calculation * calculation, CalculationController * calculationController) :
View(),
Responder(parentResponder),
m_selectableTableView(SelectableTableView(this, this, 0, 0, 0, 0, 0, 0, this, false, false)),
m_selectableTableView(this, this, 0, 0, 0, 0, 0, 0, this, false, false),
m_isSelected(false),
m_selectedIcon(0),
m_calculation(calculation),

6
apps/probability/law_controller.cpp
View File

@@ -20,7 +20,7 @@
namespace Probability {
LawController::ContentView::ContentView(SelectableTableView * selectableTableView) :
m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ChooseLaw, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
m_titleView(KDText::FontSize::Small, I18n::Message::ChooseLaw, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen),
m_selectableTableView(selectableTableView)
{
}
@@ -53,8 +53,8 @@ static I18n::Message sMessages[] = {
LawController::LawController(Responder * parentResponder) :
ViewController(parentResponder),
m_selectableTableView(SelectableTableView(this, this, 0, 1, Metric::CommonTopMargin-ContentView::k_titleMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this)),
m_selectableTableView(this, this, 0, 1, Metric::CommonTopMargin-ContentView::k_titleMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this),
m_contentView(&m_selectableTableView),
m_law(nullptr),
m_parametersController(nullptr)

6
apps/probability/parameters_controller.cpp
View File

@@ -8,9 +8,9 @@ namespace Probability {
ParametersController::ContentView::ContentView(Responder * parentResponder, SelectableTableView * selectableTableView) :
m_numberOfParameters(1),
m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ChooseParameters, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
m_firstParameterDefinition(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
m_secondParameterDefinition(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
m_titleView(KDText::FontSize::Small, I18n::Message::ChooseParameters, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen),
m_firstParameterDefinition(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen),
m_secondParameterDefinition(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen),
m_selectableTableView(selectableTableView)
{
}

16
apps/regression/app.cpp
View File

@@ -10,15 +10,15 @@ App::App(Container * container) :
TextFieldDelegateApp(container, &m_tabViewController, I18n::Message::RegressionApp, I18n::Message::RegressionAppCapital, ImageStore::RegressionIcon),
m_store(),
m_calculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, &m_store),
m_calculationAlternateEmptyViewController(AlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController)),
m_calculationHeader(ButtonRowController(&m_tabViewController, &m_calculationAlternateEmptyViewController, &m_calculationController)),
m_graphController(GraphController(&m_graphAlternateEmptyViewController, &m_graphHeader, &m_store)),
m_graphAlternateEmptyViewController(AlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController)),
m_graphHeader(ButtonRowController(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController)),
m_graphStackViewController(StackViewController(&m_tabViewController, &m_graphHeader)),
m_calculationAlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController),
m_calculationHeader(&m_tabViewController, &m_calculationAlternateEmptyViewController, &m_calculationController),
m_graphController(&m_graphAlternateEmptyViewController, &m_graphHeader, &m_store),
m_graphAlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController),
m_graphHeader(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController),
m_graphStackViewController(&m_tabViewController, &m_graphHeader),
m_storeController(&m_storeHeader, &m_store, &m_storeHeader),
m_storeHeader(ButtonRowController(&m_storeStackViewController, &m_storeController, &m_storeController)),
m_storeStackViewController(StackViewController(&m_tabViewController, &m_storeHeader)),
m_storeHeader(&m_storeStackViewController, &m_storeController, &m_storeController),
m_storeStackViewController(&m_tabViewController, &m_storeHeader),
m_tabViewController(&m_modalViewController, &m_storeStackViewController, &m_graphStackViewController, &m_calculationHeader)
{
}

4
apps/regression/even_odd_double_buffer_text_cell.cpp
View File

@@ -5,8 +5,8 @@ EvenOddDoubleBufferTextCell::EvenOddDoubleBufferTextCell(Responder * parentRespo
EvenOddCell(),
Responder(parentResponder),
m_firstTextSelected(true),
m_firstBufferTextView(EvenOddBufferTextCell(KDText::FontSize::Small)),
m_secondBufferTextView(EvenOddBufferTextCell(KDText::FontSize::Small))
m_firstBufferTextView(KDText::FontSize::Small),
m_secondBufferTextView(KDText::FontSize::Small)
{
}

8
apps/regression/graph_controller.cpp
View File

@@ -8,11 +8,11 @@ namespace Regression {
GraphController::GraphController(Responder * parentResponder, ButtonRowController * header, Store * store) :
InteractiveCurveViewController(parentResponder, header, store, &m_view),
m_bannerView(BannerView()),
m_view(GraphView(store, &m_cursor, &m_bannerView, &m_cursorView)),
m_bannerView(),
m_view(store, &m_cursor, &m_bannerView, &m_cursorView),
m_store(store),
m_initialisationParameterController(InitialisationParameterController(this, m_store)),
m_predictionParameterController(PredictionParameterController(this, m_store, &m_cursor)),
m_initialisationParameterController(this, m_store),
m_predictionParameterController(this, m_store, &m_cursor),
m_selectedDotIndex(-1)
{
m_store->setCursor(&m_cursor);

4
apps/regression/initialisation_parameter_controller.cpp
View File

@@ -8,8 +8,8 @@ namespace Regression {
InitialisationParameterController::InitialisationParameterController(Responder * parentResponder, Store * store) :
ViewController(parentResponder),
m_selectableTableView(SelectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this)),
m_selectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this),
m_store(store)
{
}

6
apps/regression/prediction_parameter_controller.cpp
View File

@@ -7,9 +7,9 @@ namespace Regression {
PredictionParameterController::PredictionParameterController(Responder * parentResponder, Store * store, CurveViewCursor * cursor) :
ViewController(parentResponder),
m_selectableTableView(SelectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this)),
m_goToParameterController(GoToParameterController(this, store, cursor))
m_selectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin, this),
m_goToParameterController(this, store, cursor)
{
}

20
apps/sequence/app.cpp
View File

@@ -8,19 +8,19 @@ namespace Sequence {
App::App(Container * container, Context * context) :
FunctionApp(container, &m_inputViewController, I18n::Message::SequenceApp, I18n::Message::SequenceAppCapital, ImageStore::SequenceIcon),
m_sequenceStore(),
m_nContext(LocalContext(context)),
m_nContext(context),
m_listController(&m_listFooter, &m_sequenceStore, &m_listHeader, &m_listFooter),
m_listFooter(ButtonRowController(&m_listHeader, &m_listController, &m_listController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey)),
m_listHeader(ButtonRowController(nullptr, &m_listFooter, &m_listController)),
m_listStackViewController(StackViewController(&m_tabViewController, &m_listHeader)),
m_listFooter(&m_listHeader, &m_listController, &m_listController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey),
m_listHeader(nullptr, &m_listFooter, &m_listController),
m_listStackViewController(&m_tabViewController, &m_listHeader),
m_graphController(&m_graphAlternateEmptyViewController, &m_sequenceStore, &m_graphHeader),
m_graphAlternateEmptyViewController(AlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController)),
m_graphHeader(ButtonRowController(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController)),
m_graphStackViewController(StackViewController(&m_tabViewController, &m_graphHeader)),
m_graphAlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController),
m_graphHeader(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController),
m_graphStackViewController(&m_tabViewController, &m_graphHeader),
m_valuesController(&m_valuesAlternateEmptyViewController, &m_sequenceStore, &m_valuesHeader),
m_valuesAlternateEmptyViewController(AlternateEmptyViewController(&m_valuesHeader, &m_valuesController, &m_valuesController)),
m_valuesHeader(ButtonRowController(nullptr, &m_valuesAlternateEmptyViewController, &m_valuesController)),
m_valuesStackViewController(StackViewController(&m_tabViewController, &m_valuesHeader)),
m_valuesAlternateEmptyViewController(&m_valuesHeader, &m_valuesController, &m_valuesController),
m_valuesHeader(nullptr, &m_valuesAlternateEmptyViewController, &m_valuesController),
m_valuesStackViewController(&m_tabViewController, &m_valuesHeader),
m_tabViewController(&m_inputViewController, &m_listStackViewController, &m_graphStackViewController, &m_valuesStackViewController),
m_inputViewController(&m_modalViewController, &m_tabViewController, &m_listController)
{

4
apps/sequence/graph/curve_parameter_controller.cpp
View File

@@ -8,8 +8,8 @@ namespace Sequence {
CurveParameterController::CurveParameterController(GraphController * graphController, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor) :
FunctionCurveParameterController(graphRange, cursor),
m_goToParameterController(GoToParameterController(this, graphRange, cursor, I18n::Message::N)),
m_sumCell(MessageTableCell(I18n::Message::TermSum)),
m_goToParameterController(this, graphRange, cursor, I18n::Message::N),
m_sumCell(I18n::Message::TermSum),
m_graphController(graphController)
{
}

10
apps/sequence/graph/graph_controller.cpp
View File

@@ -6,11 +6,11 @@ namespace Sequence {
GraphController::GraphController(Responder * parentResponder, SequenceStore * sequenceStore, ButtonRowController * header) :
FunctionGraphController(parentResponder, header, &m_graphRange, &m_view),
m_bannerView(BannerView()),
m_view(GraphView(sequenceStore, &m_graphRange, &m_cursor, &m_bannerView, &m_cursorView)),
m_graphRange(CurveViewRange(&m_cursor, this)),
m_curveParameterController(CurveParameterController(this, &m_graphRange, &m_cursor)),
m_termSumController(TermSumController(this, &m_view, &m_graphRange, &m_cursor)),
m_bannerView(),
m_view(sequenceStore, &m_graphRange, &m_cursor, &m_bannerView, &m_cursorView),
m_graphRange(&m_cursor, this),
m_curveParameterController(this, &m_graphRange, &m_cursor),
m_termSumController(this, &m_view, &m_graphRange, &m_cursor),
m_sequenceStore(sequenceStore)
{
}

8
apps/sequence/graph/term_sum_controller.cpp
View File

@@ -16,11 +16,11 @@ namespace Sequence {
TermSumController::TermSumController(Responder * parentResponder, GraphView * graphView, CurveViewRange * graphRange, CurveViewCursor * cursor) :
ViewController(parentResponder),
m_contentView(ContentView(graphView)),
m_contentView(graphView),
m_graphRange(graphRange),
m_sequence(nullptr),
m_cursor(cursor),
m_cursorView(VerticalCursorView()),
m_cursorView(),
m_bufferCursorPosition(0),
m_step(0),
m_startSum(-1),
@@ -194,9 +194,9 @@ View * TermSumController::ContentView::subviewAtIndex(int index) {
/* Legend View */
TermSumController::ContentView::LegendView::LegendView() :
m_sum(ExpressionView(0.0f, 0.5f, KDColorBlack, Palette::GreyBright)),
m_sum(0.0f, 0.5f, KDColorBlack, Palette::GreyBright),
m_sumLayout(nullptr),
m_legend(MessageTextView(KDText::FontSize::Small, I18n::Message::Default, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright))
m_legend(KDText::FontSize::Small, I18n::Message::Default, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright)
{
}

4
apps/sequence/graph/term_sum_controller.h
View File

@@ -29,6 +29,10 @@ private:
public:
LegendView();
~LegendView();
LegendView(const LegendView& other) = delete;
LegendView(LegendView&& other) = delete;
LegendView& operator=(const LegendView& other) = delete;
LegendView& operator=(LegendView&& other) = delete;
void drawRect(KDContext * ctx, KDRect rect) const override;
void setLegendMessage(I18n::Message message);
void setSumSubscript(float start);

6
apps/sequence/list/list_controller.cpp
View File

@@ -12,10 +12,10 @@ ListController::ListController(Responder * parentResponder, SequenceStore * sequ
m_sequenceStore(sequenceStore),
m_sequenceTitleCells{},
m_expressionCells{},
m_parameterController(ListParameterController(this, sequenceStore)),
m_parameterController(this, sequenceStore),
m_typeParameterController(this, sequenceStore, this, TableCell::Layout::Vertical),
m_typeStackController(StackViewController(nullptr, &m_typeParameterController, true, KDColorWhite, Palette::PurpleDark, Palette::PurpleDark)),
m_sequenceToolbox(SequenceToolbox())
m_typeStackController(nullptr, &m_typeParameterController, true, KDColorWhite, Palette::PurpleDark, Palette::PurpleDark),
m_sequenceToolbox()
{
}

6
apps/sequence/list/list_parameter_controller.cpp
View File

@@ -8,9 +8,9 @@ namespace Sequence {
ListParameterController::ListParameterController(ListController * listController, SequenceStore * sequenceStore) :
Shared::ListParameterController(listController, sequenceStore, I18n::Message::SequenceColor, I18n::Message::DeleteSequence),
m_typeCell(MessageTableCellWithChevronAndExpression(I18n::Message::SequenceType)),
m_typeParameterController(TypeParameterController(this, sequenceStore, listController, TableCell::Layout::Horizontal, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin))
m_typeCell(I18n::Message::SequenceType),
m_typeParameterController(this, sequenceStore, listController, TableCell::Layout::Horizontal, Metric::CommonTopMargin, Metric::CommonRightMargin,
Metric::CommonBottomMargin, Metric::CommonLeftMargin)
{
}

4
apps/sequence/list/sequence_toolbox.h
View File

@@ -9,6 +9,10 @@ class SequenceToolbox : public MathToolbox {
public:
SequenceToolbox();
~SequenceToolbox();
SequenceToolbox(const SequenceToolbox& other) = delete;
SequenceToolbox(SequenceToolbox&& other) = delete;
SequenceToolbox& operator=(const SequenceToolbox& other) = delete;
SequenceToolbox& operator=(SequenceToolbox&& other) = delete;
bool handleEvent(Ion::Events::Event event) override;
int numberOfRows() override;
HighlightCell * reusableCell(int index, int type) override;

8
apps/sequence/list/type_parameter_controller.cpp
View File

@@ -11,11 +11,11 @@ namespace Sequence {
TypeParameterController::TypeParameterController(Responder * parentResponder, SequenceStore * sequenceStore, ListController * list, TableCell::Layout cellLayout,
KDCoordinate topMargin, KDCoordinate rightMargin, KDCoordinate bottomMargin, KDCoordinate leftMargin) :
ViewController(parentResponder),
m_expliciteCell(ExpressionTableCellWithPointer(I18n::Message::Explicite, cellLayout)),
m_singleRecurrenceCell(ExpressionTableCellWithPointer(I18n::Message::SingleRecurrence, cellLayout)),
m_doubleRecurenceCell(ExpressionTableCellWithPointer(I18n::Message::DoubleRecurrence, cellLayout)),
m_expliciteCell(I18n::Message::Explicite, cellLayout),
m_singleRecurrenceCell(I18n::Message::SingleRecurrence, cellLayout),
m_doubleRecurenceCell(I18n::Message::DoubleRecurrence, cellLayout),
m_expressionLayouts{},
m_selectableTableView(SelectableTableView(this, this, 0, 1, topMargin, rightMargin, bottomMargin, leftMargin, this, false)),
m_selectableTableView(this, this, 0, 1, topMargin, rightMargin, bottomMargin, leftMargin, this, false),
m_sequenceStore(sequenceStore),
m_sequence(nullptr),
m_listController(list)

4
apps/sequence/list/type_parameter_controller.h
View File

@@ -14,6 +14,10 @@ public:
TableCell::Layout cellLayout, KDCoordinate topMargin = 0, KDCoordinate rightMargin = 0,
KDCoordinate bottomMargin = 0, KDCoordinate leftMargin = 0);
~TypeParameterController();
TypeParameterController(const TypeParameterController& other) = delete;
TypeParameterController(TypeParameterController&& other) = delete;
TypeParameterController& operator=(const TypeParameterController& other) = delete;
TypeParameterController& operator=(TypeParameterController&& other) = delete;
const char * title() override;
View * view() override;
void didBecomeFirstResponder() override;

4
apps/sequence/values/values_controller.cpp
View File

@@ -11,9 +11,9 @@ ValuesController::ValuesController(Responder * parentResponder, SequenceStore *
m_floatCells{},
m_sequenceStore(sequenceStore),
#if COPY_COLUMN
m_sequenceParameterController(Shared::ValuesFunctionParameterController('n')),
m_sequenceParameterController('n'),
#endif
m_intervalParameterController(IntervalParameterController(this, &m_interval))
m_intervalParameterController(this, &m_interval)
{
}

4
apps/settings/app.cpp
View File

@@ -6,8 +6,8 @@ namespace Settings {
App::App(Container * container) :
::App(container, &m_stackViewController, I18n::Message::SettingsApp, I18n::Message::SettingsAppCapital, ImageStore::SettingsIcon, I18n::Message::Warning),
m_mainController(MainController(&m_stackViewController)),
m_stackViewController(StackViewController(&m_modalViewController, &m_mainController))
m_mainController(&m_stackViewController),
m_stackViewController(&m_modalViewController, &m_mainController)
{
}

4
apps/settings/main_controller.h
View File

@@ -11,6 +11,10 @@ class MainController : public ViewController, public ListViewDataSource, public
public:
MainController(Responder * parentResponder);
~MainController();
MainController(const MainController& other) = delete;
MainController(MainController&& other) = delete;
MainController& operator=(const MainController& other) = delete;
MainController& operator=(MainController&& other) = delete;
View * view() override;
const char * title() override;
bool handleEvent(Ion::Events::Event event) override;

4
apps/settings/sub_controller.h
View File

@@ -10,6 +10,10 @@ class SubController : public ViewController, public SimpleListViewDataSource, pu
public:
SubController(Responder * parentResponder);
~SubController();
SubController(const SubController& other) = delete;
SubController(SubController&& other) = delete;
SubController& operator=(const SubController& other) = delete;
SubController& operator=(SubController&& other) = delete;
View * view() override;
const char * title() override;
bool handleEvent(Ion::Events::Event event) override;

4
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -12,8 +12,8 @@ InteractiveCurveViewController::InteractiveCurveViewController(Responder * paren
ButtonRowDelegate(header, nullptr),
m_cursor(),
m_cursorView(CursorView()),
m_rangeParameterController(RangeParameterController(this, interactiveRange)),
m_zoomParameterController(ZoomParameterController(this, interactiveRange, curveView)),
m_rangeParameterController(this, interactiveRange),
m_zoomParameterController(this, interactiveRange, curveView),
m_rangeButton(this, I18n::Message::Axis, Invocation([](void * context, void * sender) {
InteractiveCurveViewController * graphController = (InteractiveCurveViewController *) context;
StackViewController * stack = graphController->stackController();

24
apps/statistics/app.cpp
View File

@@ -8,19 +8,19 @@ namespace Statistics {
App::App(Container * container) :
TextFieldDelegateApp(container, &m_tabViewController, I18n::Message::StatsApp, I18n::Message::StatsAppCapital, ImageStore::StatIcon),
m_store(),
m_calculationController(CalculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, &m_store)),
m_calculationAlternateEmptyViewController(AlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController)),
m_calculationHeader(ButtonRowController(&m_tabViewController, &m_calculationAlternateEmptyViewController, &m_calculationController)),
m_boxController(BoxController(&m_boxAlternateEmptyViewController, &m_boxHeader, &m_store)),
m_boxAlternateEmptyViewController(AlternateEmptyViewController(&m_boxHeader, &m_boxController, &m_boxController)),
m_boxHeader(ButtonRowController(&m_tabViewController, &m_boxAlternateEmptyViewController, &m_boxController)),
m_histogramController(HistogramController(&m_histogramAlternateEmptyViewController, &m_histogramHeader, &m_store)),
m_histogramAlternateEmptyViewController(AlternateEmptyViewController(&m_histogramHeader, &m_histogramController, &m_histogramController)),
m_histogramHeader(ButtonRowController(&m_histogramStackViewController, &m_histogramAlternateEmptyViewController, &m_histogramController)),
m_histogramStackViewController(StackViewController(&m_tabViewController, &m_histogramHeader)),
m_calculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, &m_store),
m_calculationAlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController),
m_calculationHeader(&m_tabViewController, &m_calculationAlternateEmptyViewController, &m_calculationController),
m_boxController(&m_boxAlternateEmptyViewController, &m_boxHeader, &m_store),
m_boxAlternateEmptyViewController(&m_boxHeader, &m_boxController, &m_boxController),
m_boxHeader(&m_tabViewController, &m_boxAlternateEmptyViewController, &m_boxController),
m_histogramController(&m_histogramAlternateEmptyViewController, &m_histogramHeader, &m_store),
m_histogramAlternateEmptyViewController(&m_histogramHeader, &m_histogramController, &m_histogramController),
m_histogramHeader(&m_histogramStackViewController, &m_histogramAlternateEmptyViewController, &m_histogramController),
m_histogramStackViewController(&m_tabViewController, &m_histogramHeader),
m_storeController(&m_storeHeader, &m_store, &m_storeHeader),
m_storeHeader(ButtonRowController(&m_storeStackViewController, &m_storeController, &m_storeController)),
m_storeStackViewController(StackViewController(&m_tabViewController, &m_storeHeader)),
m_storeHeader(&m_storeStackViewController, &m_storeController, &m_storeController),
m_storeStackViewController(&m_tabViewController, &m_storeHeader),
m_tabViewController(&m_modalViewController, &m_storeStackViewController, &m_histogramStackViewController, &m_boxHeader, &m_calculationHeader)
{
}

2
escher/include/escher/app.h
View File

@@ -23,7 +23,7 @@ class App : public Responder {
public:
constexpr static uint8_t Magic = 0xA8;
App(Container * container, ViewController * rootViewController, I18n::Message name = (I18n::Message)0, I18n::Message upperName = (I18n::Message)0, const Image * icon = nullptr, I18n::Message warningMessage = (I18n::Message)0);
virtual ~App();
virtual ~App() = default;
void setFirstResponder(Responder * responder);
Responder * firstResponder();
bool processEvent(Ion::Events::Event event);

4
escher/include/escher/dynamic_view_controller.h
View File

@@ -14,6 +14,10 @@ class DynamicViewController : public ViewController {
public:
DynamicViewController(Responder * parentResponder);
~DynamicViewController();
DynamicViewController(const DynamicViewController& other) = delete;
DynamicViewController(DynamicViewController&& other) = delete;
DynamicViewController& operator=(const DynamicViewController& other) = delete;
DynamicViewController& operator=(DynamicViewController&& other) = delete;
View * view() override;
void viewWillAppear() override;
void viewDidDisappear() override;

2
escher/src/alternate_empty_view_controller.cpp
View File

@@ -6,7 +6,7 @@
/* ContentView */
AlternateEmptyViewController::ContentView::ContentView(ViewController * mainViewController, AlternateEmptyViewDelegate * delegate) :
m_message(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
m_message(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen),
m_mainViewController(mainViewController),
m_delegate(delegate)
{

7
escher/src/app.cpp
View File

@@ -7,19 +7,16 @@ extern "C" {
App::App(Container * container, ViewController * rootViewController, I18n::Message name, I18n::Message upperName, const Image * icon, I18n::Message warningMessage) :
Responder(nullptr),
m_magic(Magic),
m_modalViewController(ModalViewController(this, rootViewController)),
m_modalViewController(this, rootViewController),
m_container(container),
m_firstResponder(nullptr),
m_warningController(WarningController(this, warningMessage)),
m_warningController(this, warningMessage),
m_name(name),
m_upperName(upperName),
m_icon(icon)
{
}
App::~App() {
}
bool App::processEvent(Ion::Events::Event event) {
Responder * responder = m_firstResponder;
bool didHandleEvent = false;

2
escher/src/button.cpp
View File

@@ -5,7 +5,7 @@
Button::Button(Responder * parentResponder, I18n::Message textBody, Invocation invocation, KDText::FontSize size, KDColor textColor) :
HighlightCell(),
Responder(parentResponder),
m_messageTextView(MessageTextView(size, textBody, 0.5f, 0.5f, textColor)),
m_messageTextView(size, textBody, 0.5f, 0.5f, textColor),
m_invocation(invocation)
{
}

2
escher/src/editable_text_cell.cpp
View File

@@ -7,7 +7,7 @@ EditableTextCell::EditableTextCell(Responder * parentResponder, TextFieldDelegat
KDText::FontSize size, float horizontalAlignment, float verticalAlignment, KDColor textColor, KDColor backgroundColor) :
HighlightCell(),
Responder(parentResponder),
m_textField(TextField(this, m_textBody, draftTextBuffer, TextField::maxBufferSize(), delegate, true, size, horizontalAlignment, verticalAlignment, textColor, backgroundColor))
m_textField(this, m_textBody, draftTextBuffer, TextField::maxBufferSize(), delegate, true, size, horizontalAlignment, verticalAlignment, textColor, backgroundColor)
{
}

2
escher/src/message_table_cell_with_chevron.cpp
View File

@@ -2,7 +2,7 @@
MessageTableCellWithChevron::MessageTableCellWithChevron(I18n::Message message, KDText::FontSize size) :
MessageTableCell(message, size),
m_accessoryView(ChevronView())
m_accessoryView()
{
}

2
escher/src/message_table_cell_with_switch.cpp
View File

@@ -3,7 +3,7 @@
MessageTableCellWithSwitch::MessageTableCellWithSwitch(I18n::Message message) :
MessageTableCell(message),
m_accessoryView(SwitchView())
m_accessoryView()
{
}

4
escher/src/scroll_view.cpp
View File

@@ -12,8 +12,8 @@ ScrollView::ScrollView(View * contentView, ScrollViewDelegate * delegate, KDCoor
m_topMargin(topMargin),
m_delegate(delegate),
m_contentView(contentView),
m_verticalScrollIndicator(ScrollViewIndicator(ScrollViewIndicator::Direction::Vertical, indicatorColor, backgroundIndicatorColor, indicatorMargin)),
m_horizontalScrollIndicator(ScrollViewIndicator(ScrollViewIndicator::Direction::Horizontal, indicatorColor, backgroundIndicatorColor, indicatorMargin)),
m_verticalScrollIndicator(ScrollViewIndicator::Direction::Vertical, indicatorColor, backgroundIndicatorColor, indicatorMargin),
m_horizontalScrollIndicator(ScrollViewIndicator::Direction::Horizontal, indicatorColor, backgroundIndicatorColor, indicatorMargin),
m_rightMargin(rightMargin),
m_bottomMargin(bottomMargin),
m_leftMargin(leftMargin),

2
escher/src/table_view.cpp
View File

@@ -13,7 +13,7 @@ TableView::TableView(TableViewDataSource * dataSource, ScrollViewDelegate * scro
KDColor backgroundIndicatorColor, KDCoordinate indicatorMargin) :
ScrollView(&m_contentView, scrollDelegate, topMargin, rightMargin, bottomMargin, leftMargin, showIndicators, colorBackground,
backgroundColor, indicatorThickness, indicatorColor, backgroundIndicatorColor, indicatorMargin),
m_contentView(TableView::ContentView(this, dataSource, horizontalCellOverlapping, verticalCellOverlapping))
m_contentView(this, dataSource, horizontalCellOverlapping, verticalCellOverlapping)
{
}

2
escher/src/warning_controller.cpp
View File

@@ -3,7 +3,7 @@
WarningController::ContentView::ContentView() :
SolidColorView(KDColorBlack),
m_textView(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorWhite, KDColorBlack))
m_textView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorWhite, KDColorBlack)
{
}