UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Clean Expression and Layout builders

Browse Source 
Before: Opposite(Opposite(Rational(1))) misleadingly created the
expression "-1"; now, Opposite::Builder(Opposite::Builder(Rational(1)))
creates "--1"
This commit is contained in:
Émilie Feral
2019-01-28 17:44:08 +01:00
committed by LeaNumworks
parent b3d15d7e7f
commit ac6f23684d
113 changed files with 779 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/sequence/sequence.cpp
View File

@@ -146,9 +146,9 @@ int Sequence::numberOfElements() {
Poincare::Layout Sequence::nameLayout() {
if (m_nameLayout.isUninitialized()) {
m_nameLayout = HorizontalLayout(
m_nameLayout = HorizontalLayout::Builder(
CharLayout(name()[0], KDFont::SmallFont),
VerticalOffsetLayout(CharLayout('n', KDFont::SmallFont), VerticalOffsetLayoutNode::Type::Subscript)
VerticalOffsetLayout::Builder(CharLayout('n', KDFont::SmallFont), VerticalOffsetLayoutNode::Type::Subscript)
);
}
return m_nameLayout;
@@ -157,18 +157,18 @@ Poincare::Layout Sequence::nameLayout() {
Poincare::Layout Sequence::definitionName() {
if (m_definitionName.isUninitialized()) {
if (m_type == Type::Explicit) {
m_definitionName = HorizontalLayout(
m_definitionName = HorizontalLayout::Builder(
CharLayout(name()[0], k_layoutFont),
VerticalOffsetLayout(LayoutHelper::String("n", 1, k_layoutFont), VerticalOffsetLayoutNode::Type::Subscript));
VerticalOffsetLayout::Builder(LayoutHelper::String("n", 1, k_layoutFont), VerticalOffsetLayoutNode::Type::Subscript));
} else if (m_type == Type::SingleRecurrence) {
m_definitionName = HorizontalLayout(
m_definitionName = HorizontalLayout::Builder(
CharLayout(name()[0], k_layoutFont),
VerticalOffsetLayout(LayoutHelper::String("n+1", 3, k_layoutFont), VerticalOffsetLayoutNode::Type::Subscript));
VerticalOffsetLayout::Builder(LayoutHelper::String("n+1", 3, k_layoutFont), VerticalOffsetLayoutNode::Type::Subscript));
} else {
assert(m_type == Type::DoubleRecurrence);
m_definitionName = HorizontalLayout(
m_definitionName = HorizontalLayout::Builder(
CharLayout(name()[0], k_layoutFont),
VerticalOffsetLayout(LayoutHelper::String("n+2", 3, k_layoutFont), VerticalOffsetLayoutNode::Type::Subscript));
VerticalOffsetLayout::Builder(LayoutHelper::String("n+2", 3, k_layoutFont), VerticalOffsetLayoutNode::Type::Subscript));
}
}
return m_definitionName;
@@ -182,9 +182,9 @@ Poincare::Layout Sequence::firstInitialConditionName() {
|| m_type == Type::DoubleRecurrence))
{
Layout indexLayout = LayoutHelper::String(buffer, strlen(buffer), k_layoutFont);
m_firstInitialConditionName = HorizontalLayout(
m_firstInitialConditionName = HorizontalLayout::Builder(
CharLayout(name()[0], k_layoutFont),
VerticalOffsetLayout(indexLayout, VerticalOffsetLayoutNode::Type::Subscript));
VerticalOffsetLayout::Builder(indexLayout, VerticalOffsetLayoutNode::Type::Subscript));
}
return m_firstInitialConditionName;
}
@@ -195,9 +195,9 @@ Poincare::Layout Sequence::secondInitialConditionName() {
if (m_secondInitialConditionName.isUninitialized()) {
if (m_type == Type::DoubleRecurrence) {
Layout indexLayout = LayoutHelper::String(buffer, strlen(buffer), k_layoutFont);
m_secondInitialConditionName = HorizontalLayout(
m_secondInitialConditionName = HorizontalLayout::Builder(
CharLayout(name()[0], k_layoutFont),
VerticalOffsetLayout(indexLayout, VerticalOffsetLayoutNode::Type::Subscript));
VerticalOffsetLayout::Builder(indexLayout, VerticalOffsetLayoutNode::Type::Subscript));
}
}
return m_secondInitialConditionName;