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

[poincare] Change Expression::getVariables to get symbols with variable

Browse Source 
sizes
This commit is contained in:
Émilie Feral
2018-09-27 10:04:25 +02:00
parent e1287a20bc
commit 5beafd2bf3
12 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/shared/store_controller.cpp
View File

@@ -264,14 +264,16 @@ int StoreController::maxNumberOfElements() const {
bool StoreController::privateFillColumnWithFormula(Expression formula, ExpressionNode::isVariableTest isVariable) {
int currentColumn = selectedColumn();
// Fetch the series used in the formula to compute the size of the filled in series
char variables[Expression::k_maxNumberOfVariables];
variables[0] = 0;
constexpr static int k_maxSizeOfStoreSymbols = 3; // "V1", "N1", "X1", "Y1"
char variables[Expression::k_maxNumberOfVariables][k_maxSizeOfStoreSymbols];
variables[0][0] = 0;
AppsContainer * appsContainer = ((TextFieldDelegateApp *)app())->container();
formula.getVariables(*(appsContainer->globalContext()), isVariable, variables);
int nbOfVariables = formula.getVariables(*(appsContainer->globalContext()), isVariable, variables, k_maxSizeOfStoreSymbols);
assert(nbOfVariables >= 0);
int numberOfValuesToCompute = -1;
int index = 0;
while (variables[index] != 0) {
const char * seriesName = Symbol::textForSpecialSymbols(variables[index]);
while (variables[index][0] != 0) {
const char * seriesName = variables[index];
assert(strlen(seriesName) == 2);
int series = (int)(seriesName[1] - '0') - 1;
assert(series >= 0 && series < DoublePairStore::k_numberOfSeries);