From 7a5547e3085d53d9726c6d7a11833ecad308feea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 19 Dec 2017 14:46:52 +0100 Subject: [PATCH] [expression_editor] Changed example. TO REMOVE? Change-Id: Ibf1eb52eeeb9e4386c8c608115ac1ea88fbd715a --- apps/expression_editor/controller.cpp | 2 +- apps/expression_editor/expression_and_layout.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/expression_editor/controller.cpp b/apps/expression_editor/controller.cpp index 632310443..5337e432c 100644 --- a/apps/expression_editor/controller.cpp +++ b/apps/expression_editor/controller.cpp @@ -6,7 +6,7 @@ Controller::Controller(Responder * parentResponder, Poincare::ExpressionLayout * ViewController(parentResponder), m_view(parentResponder, expressionLayout, &m_cursor) { - m_cursor.setPointedExpressionLayout(expressionLayout); + m_cursor.setPointedExpressionLayout(expressionLayout->editableChild(0)); } void Controller::didBecomeFirstResponder() { diff --git a/apps/expression_editor/expression_and_layout.cpp b/apps/expression_editor/expression_and_layout.cpp index 1f36461be..0f777e586 100644 --- a/apps/expression_editor/expression_and_layout.cpp +++ b/apps/expression_editor/expression_and_layout.cpp @@ -1,9 +1,11 @@ #include "expression_and_layout.h" +#include +#include namespace ExpressionEditor { ExpressionAndLayout::ExpressionAndLayout() { - //const char * expression = "2/3"; + const char * expression = "1"; //const char * expression = "1+2/(3+4)"; //const char * expression = "1+2/3+5+8"; //const char * expression = "[[1+5,2,3][4,5,6]]"; @@ -33,10 +35,11 @@ ExpressionAndLayout::ExpressionAndLayout() { //const char * expression = "abs(1+conj(conj(4))+(23)+conj(42))+abs(1+2)"; //const char * expression = "13+(23)"; //const char * expression = "1+sum(12,3,4)+product(12,3,4)+2"; - const char * expression = "(1+2^3)-385658/(7/78+int(5/46*7/8,3,45))+sum(12,3,4)+[[1+5,2,3][4/2,5,6]]/123+ln(36)+root(542,52)+sum(12,3,4)+int(22,3,4)+conj(988+2)+abs(conj(345))+conj(conj(conj(3)))+floor(48)+binomial(6,88)+product(23,46,123)"; + //const char * expression = "(1+2^3)-385658/(7/78+int(5/46*7/8,3,45))+sum(12,3,4)+[[1+5,2,3][4/2,5,6]]/123+ln(36)+root(542,52)+sum(12,3,4)+int(22,3,4)+conj(988+2)+abs(conj(345))+conj(conj(conj(3)))+floor(48)+binomial(6,88)+product(23,46,123)+log(10,565)-0.03"; m_expression = Poincare::Expression::parse(expression); - m_expressionLayout = m_expression->createLayout(); + m_expressionLayout = new Poincare::HorizontalLayout(); + m_expressionLayout->addChildAtIndex(new Poincare::EditableStringLayout("1", 1), 0); } ExpressionAndLayout::~ExpressionAndLayout() { if (m_expressionLayout) {