From 6dff4b9a076f630f687a41a641fdd95b40adf65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 19 Dec 2016 11:36:26 +0100 Subject: [PATCH] [apps] add the stat apps in the container Change-Id: I89338a609a80cc376a5bdfbe47dadbd3c0ae9f59 --- apps/Makefile | 1 + apps/apps_container.cpp | 2 ++ apps/apps_container.h | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/Makefile b/apps/Makefile index 586c4bbe5..ab0856de0 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -2,6 +2,7 @@ include apps/home/Makefile include apps/graph/Makefile include apps/probability/Makefile include apps/calculation/Makefile +include apps/statistics/Makefile #include apps/picview/Makefile app_objs += $(addprefix apps/,\ diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index 9e11115b0..f8454546a 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -9,6 +9,7 @@ AppsContainer::AppsContainer() : m_graphApp(this, &m_globalContext), m_probabilityApp(this, &m_globalContext), m_calculationApp(this, &m_globalContext), + m_statisticsApp(this, &m_globalContext), m_globalContext(GlobalContext()), m_variableBoxController(&m_globalContext) { @@ -24,6 +25,7 @@ App * AppsContainer::appAtIndex(int index) { &m_graphApp, &m_probabilityApp, &m_calculationApp, + &m_statisticsApp }; assert(sizeof(apps)/sizeof(apps[0]) == k_numberOfApps); assert(index >= 0 && index < k_numberOfApps); diff --git a/apps/apps_container.h b/apps/apps_container.h index 54758bf41..f7c042c3d 100644 --- a/apps/apps_container.h +++ b/apps/apps_container.h @@ -5,6 +5,7 @@ #include "graph/app.h" #include "probability/app.h" #include "calculation/app.h" +#include "statistics/app.h" #include "toolbox_controller.h" #include "variable_box_controller.h" @@ -24,11 +25,12 @@ public: VariableBoxController * variableBoxController(); bool handleEvent(Ion::Events::Event event) override; private: - static constexpr int k_numberOfApps = 4; + static constexpr int k_numberOfApps = 5; Home::App m_homeApp; Graph::App m_graphApp; Probability::App m_probabilityApp; Calculation::App m_calculationApp; + Statistics::App m_statisticsApp; #if USE_PIC_VIEW_APP PicViewApp m_picViewApp; #endif