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

[poincare] Engine-->Helper and break LayoutHelper into LayoutHelper and

Browse Source 
SerializationHelper
This commit is contained in:
Émilie Feral
2018-08-08 13:22:35 +02:00
parent ba5d80f09b
commit cb4bb4f8f0
135 changed files with 660 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/sequence/sequence.cpp
View File

@@ -1,7 +1,7 @@
#include "sequence.h"
#include "sequence_store.h"
#include "cache_context.h"
#include <poincare/layout_engine.h>
#include <poincare/layout_helper.h>
#include "../../poincare/src/layout/char_layout.h"
#include "../../poincare/src/layout/horizontal_layout.h"
#include "../../poincare/src/layout/vertical_offset_layout.h"
@@ -233,19 +233,19 @@ Poincare::ExpressionLayout * Sequence::definitionName() {
if (m_type == Type::Explicit) {
m_definitionName = new HorizontalLayout(
new CharLayout(name()[0], KDText::FontSize::Large),
new VerticalOffsetLayout(LayoutEngine::createStringLayout("n", 1, KDText::FontSize::Large), VerticalOffsetLayout::Type::Subscript, false),
new VerticalOffsetLayout(LayoutHelper::String("n", 1, KDText::FontSize::Large), VerticalOffsetLayout::Type::Subscript, false),
false);
}
if (m_type == Type::SingleRecurrence) {
m_definitionName = new HorizontalLayout(
new CharLayout(name()[0], KDText::FontSize::Large),
new VerticalOffsetLayout(LayoutEngine::createStringLayout("n+1", 3, KDText::FontSize::Large), VerticalOffsetLayout::Type::Subscript, false),
new VerticalOffsetLayout(LayoutHelper::String("n+1", 3, KDText::FontSize::Large), VerticalOffsetLayout::Type::Subscript, false),
false);
}
if (m_type == Type::DoubleRecurrence) {
m_definitionName = new HorizontalLayout(
new CharLayout(name()[0], KDText::FontSize::Large),
new VerticalOffsetLayout(LayoutEngine::createStringLayout("n+2", 3, KDText::FontSize::Large), VerticalOffsetLayout::Type::Subscript, false),
new VerticalOffsetLayout(LayoutHelper::String("n+2", 3, KDText::FontSize::Large), VerticalOffsetLayout::Type::Subscript, false),
false);
}
}
@@ -259,7 +259,7 @@ Poincare::ExpressionLayout * Sequence::firstInitialConditionName() {
&& (m_type == Type::SingleRecurrence
|| m_type == Type::DoubleRecurrence))
{
ExpressionLayout * indexLayout = LayoutEngine::createStringLayout(buffer, strlen(buffer), KDText::FontSize::Large);
ExpressionLayout * indexLayout = LayoutHelper::String(buffer, strlen(buffer), KDText::FontSize::Large);
m_firstInitialConditionName = new HorizontalLayout(
new CharLayout(name()[0], KDText::FontSize::Large),
new VerticalOffsetLayout(indexLayout, VerticalOffsetLayout::Type::Subscript, false),
@@ -273,7 +273,7 @@ Poincare::ExpressionLayout * Sequence::secondInitialConditionName() {
Integer(m_initialRank+1).writeTextInBuffer(buffer, k_initialRankNumberOfDigits+1);
if (m_secondInitialConditionName == nullptr) {
if (m_type == Type::DoubleRecurrence) {
ExpressionLayout * indexLayout = LayoutEngine::createStringLayout(buffer, strlen(buffer), KDText::FontSize::Large);
ExpressionLayout * indexLayout = LayoutHelper::String(buffer, strlen(buffer), KDText::FontSize::Large);
m_secondInitialConditionName = new HorizontalLayout(
new CharLayout(name()[0], KDText::FontSize::Large),
new VerticalOffsetLayout(indexLayout, VerticalOffsetLayout::Type::Subscript, false),