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

[apps/probability] Add a pointer to the data model in the histogram

Browse Source 
controller

Change-Id: I1297e10f1e30133d93e96becfb4bc49eb7a8a28d
This commit is contained in:
Émilie Feral
2016-12-20 10:14:51 +01:00
parent ef9b47555b
commit bd8ecf73db
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/statistics/app.cpp
View File

@@ -12,7 +12,7 @@ App::App(Container * container) :
m_boxController(BoxController(&m_boxAlternateEmptyViewController)),
m_boxAlternateEmptyViewController(AlternateEmptyViewController(nullptr, &m_boxController, &m_boxController)),
m_boxStackViewController(StackViewController(&m_tabViewController, &m_boxAlternateEmptyViewController)),
m_histogramController(HistogramController(&m_histogramHeader, &m_histogramHeader)),
m_histogramController(HistogramController(&m_histogramHeader, &m_histogramHeader, &m_data)),
m_histogramHeader(HeaderViewController(&m_histogramAlternateEmptyViewController, &m_histogramController, &m_histogramController)),
m_histogramAlternateEmptyViewController(AlternateEmptyViewController(nullptr, &m_histogramHeader, &m_histogramController)),
m_histogramStackViewController(StackViewController(&m_tabViewController, &m_histogramAlternateEmptyViewController)),

10
apps/statistics/histogram_controller.cpp
View File

@@ -2,12 +2,13 @@
namespace Statistics {
HistogramController::HistogramController(Responder * parentResponder, HeaderViewController * headerViewController) :
HistogramController::HistogramController(Responder * parentResponder, HeaderViewController * headerViewController, Data * data) :
ViewController(parentResponder),
HeaderViewDelegate(headerViewController),
m_view(SolidColorView(KDColorGreen)),
m_settingButton(Button(this, "Reglages de l'histogramme",Invocation([](void * context, void * sender) {}, this))),
m_selectedBin(0)
m_selectedBin(0),
m_data(data)
{
}
@@ -49,11 +50,14 @@ Button * HistogramController::buttonAtIndex(int index) {
}
bool HistogramController::isEmpty() {
if (m_data->numberOfPairs() == 0) {
return true;
}
return false;
}
const char * HistogramController::emptyMessage() {
return "Aucune donnée à tracer";
return "Aucune donnee à tracer";
}
Responder * HistogramController::defaultController() {

4
apps/statistics/histogram_controller.h
View File

@@ -2,13 +2,14 @@
#define STATISTICS_HISTOGRAM_CONTROLLER_H
#include <escher.h>
#include "data.h"
namespace Statistics {
class HistogramController : public ViewController, public HeaderViewDelegate, public AlternateEmptyViewDelegate {
public:
HistogramController(Responder * parentResponder, HeaderViewController * headerViewController);
HistogramController(Responder * parentResponder, HeaderViewController * headerViewController, Data * m_data);
const char * title() const override;
View * view() override;
bool handleEvent(Ion::Events::Event event) override;
@@ -24,6 +25,7 @@ private:
SolidColorView m_view;
Button m_settingButton;
int m_selectedBin;
Data * m_data;
};
}