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

[poincare] improve the sum layout

Browse Source 
Change-Id: I59149dfd618b3882a906aac3a0497e62c8eb7d91
This commit is contained in:
Émilie Feral
2017-01-14 08:37:22 +01:00
parent 1336d7fb7c
commit 66d2713162
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
poincare/include/poincare/sum.h
View File

@@ -11,6 +11,7 @@ public:
Type type() const override;
Expression * cloneWithDifferentOperands(Expression ** newOperands,
int numberOfOperands, bool cloneOperands = true) const override;
ExpressionLayout * createLayout() const override;
};
#endif

12
poincare/src/sum.cpp
View File

@@ -1,9 +1,12 @@
#include <poincare/sum.h>
#include <poincare/symbol.h>
#include <poincare/float.h>
#include "layout/sum_layout.h"
#include "layout/string_layout.h"
#include "layout/horizontal_layout.h"
extern "C" {
#include <assert.h>
#include <stdlib.h>
}
Sum::Sum() :
@@ -37,3 +40,10 @@ float Sum::approximate(Context& context) const {
}
return result;
}
ExpressionLayout * Sum::createLayout() const {
ExpressionLayout ** childrenLayouts = (ExpressionLayout **)malloc(2*sizeof(ExpressionLayout *));
childrenLayouts[0] = new StringLayout("n=", 2);
childrenLayouts[1] = m_args[1]->createLayout();
return new SumLayout(new HorizontalLayout(childrenLayouts, 2), m_args[2]->createLayout(), m_args[0]->createLayout());
}