mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-03-18 21:30:38 +01:00
[apps/shared] Move apps/graph/list/new_function_cell to shared folder to
be used by sequence Change-Id: Ie42a8b6cc60e652ab49379dd72b00f2efdc6ebda
This commit is contained in:
@@ -9,7 +9,6 @@ app_objs += $(addprefix apps/graph/,\
|
||||
graph/graph_controller.o\
|
||||
graph/graph_view.o\
|
||||
graph/initialisation_parameter_controller.o\
|
||||
list/new_function_cell.o\
|
||||
list/list_controller.o\
|
||||
values/abscissa_parameter_controller.o\
|
||||
values/derivative_parameter_controller.o\
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "../function_store.h"
|
||||
#include "../function_title_cell.h"
|
||||
#include "../../shared/function_expression_cell.h"
|
||||
#include "new_function_cell.h"
|
||||
#include "../../shared/new_function_cell.h"
|
||||
#include "../../shared/list_parameter_controller.h"
|
||||
|
||||
namespace Graph {
|
||||
@@ -45,7 +45,7 @@ private:
|
||||
FunctionTitleCell m_functionTitleCells[k_maxNumberOfRows];
|
||||
Shared::FunctionExpressionCell m_expressionCells[k_maxNumberOfRows];
|
||||
EvenOddCell m_emptyCell;
|
||||
NewFunctionCell m_addNewFunction;
|
||||
Shared::NewFunctionCell m_addNewFunction;
|
||||
SelectableTableView m_selectableTableView;
|
||||
FunctionStore * m_functionStore;
|
||||
Shared::ListParameterController m_parameterController;
|
||||
|
||||
@@ -15,6 +15,7 @@ app_objs += $(addprefix apps/shared/,\
|
||||
interactive_curve_view_range.o\
|
||||
list_parameter_controller.o\
|
||||
memoized_curve_view_range.o\
|
||||
new_function_cell.o\
|
||||
range_parameter_controller.o\
|
||||
store_controller.o\
|
||||
store_parameter_controller.o\
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
#include "new_function_cell.h"
|
||||
#include "assert.h"
|
||||
|
||||
namespace Graph {
|
||||
namespace Shared {
|
||||
|
||||
NewFunctionCell::NewFunctionCell() :
|
||||
EvenOddCell(),
|
||||
m_pointerTextView(PointerTextView(KDText::FontSize::Large, "Ajouter une fonction", 0.5f, 0.5f))
|
||||
m_pointerTextView(PointerTextView(KDText::FontSize::Large, nullptr, 0.5f, 0.5f))
|
||||
{
|
||||
m_pointerTextView.setText(text());
|
||||
}
|
||||
|
||||
void NewFunctionCell::reloadCell() {
|
||||
@@ -27,4 +28,8 @@ void NewFunctionCell::layoutSubviews() {
|
||||
m_pointerTextView.setFrame(bounds());
|
||||
}
|
||||
|
||||
const char * NewFunctionCell::text() {
|
||||
return "Ajouter une fonction";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
#ifndef GRAPH_NEW_FUNCTION_CELL_H
|
||||
#define GRAPH_NEW_FUNCTION_CELL_H
|
||||
#ifndef SHARED_NEW_FUNCTION_CELL_H
|
||||
#define SHARED_NEW_FUNCTION_CELL_H
|
||||
|
||||
#include <escher.h>
|
||||
|
||||
namespace Graph {
|
||||
namespace Shared {
|
||||
|
||||
class NewFunctionCell : public EvenOddCell {
|
||||
public:
|
||||
NewFunctionCell();
|
||||
@@ -11,8 +12,8 @@ public:
|
||||
int numberOfSubviews() const override;
|
||||
View * subviewAtIndex(int index) override;
|
||||
void layoutSubviews() override;
|
||||
|
||||
protected:
|
||||
virtual const char * text();
|
||||
PointerTextView m_pointerTextView;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user