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

[apps/escher] Changed setExpression to setExpressionLayout.

Browse Source 
Change-Id: I095a12868fd7eaf8d4eb2408617941a86f43e1ee
This commit is contained in:
Léa Saviot
2017-12-05 17:45:54 +01:00
parent be9cde8ca4
commit 4ad3adaab2
29 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sequence/graph/term_sum_controller.cpp
View File

@@ -201,7 +201,7 @@ void TermSumController::LegendView::setSumSubscript(float start) {
char buffer[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)];
Complex<float>::convertFloatToText(start, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Expression::FloatDisplayMode::Decimal);
m_sumLayout = new CondensedSumLayout(new StringLayout(sigma, sizeof(sigma)), new StringLayout(buffer, strlen(buffer), KDText::FontSize::Small), nullptr);
m_sum.setExpression(m_sumLayout);
m_sum.setExpressionLayout(m_sumLayout);
m_sum.setAlignment(0.0f, 0.5f);
}
@@ -216,7 +216,7 @@ void TermSumController::LegendView::setSumSuperscript(float start, float end) {
char bufferEnd[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)];
Complex<float>::convertFloatToText(end, bufferEnd, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Expression::FloatDisplayMode::Decimal);
m_sumLayout = new CondensedSumLayout(new StringLayout(sigma, sizeof(sigma)), new StringLayout(bufferStart, strlen(bufferStart), KDText::FontSize::Small), new StringLayout(bufferEnd, strlen(bufferEnd), KDText::FontSize::Small));
m_sum.setExpression(m_sumLayout);
m_sum.setExpressionLayout(m_sumLayout);
m_sum.setAlignment(0.0f, 0.5f);
}
@@ -229,7 +229,7 @@ void TermSumController::LegendView::setSumResult(const char * sequenceName, doub
childrenLayouts[1] = new BaselineRelativeLayout(new StringLayout(sequenceName, 1, KDText::FontSize::Small), new StringLayout("n", 1, KDText::FontSize::Small), BaselineRelativeLayout::Type::Subscript);
childrenLayouts[0] = m_sumLayout;
m_sumLayout = new HorizontalLayout(childrenLayouts, 3);
m_sum.setExpression(m_sumLayout);
m_sum.setExpressionLayout(m_sumLayout);
m_sum.setAlignment(0.5f, 0.5f);
}