Diffstat (limited to 'noncore/apps/opie-sheet/sheet.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-sheet/sheet.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp index 103b83b..e1e4744 100644 --- a/noncore/apps/opie-sheet/sheet.cpp +++ b/noncore/apps/opie-sheet/sheet.cpp @@ -900,33 +900,35 @@ double Sheet::functionCountIf(const QString ¶m1, const QString ¶m2, cons bool ok; s2=calculateVariable(param3); for (row=row1; row<=row2; ++row) for (col=col1; col<=col2; ++col) { text(row, col).toDouble(&ok); if (ok && (s2==text(row,col)) ) ++divider; } return divider; } -QString Sheet::calculateFunction(const QString &function, const QString ¶meters, int NumOfParams) +QString Sheet::calculateFunction(const QString &func, const QString ¶meters, int NumOfParams) { bool ok; double val1=0.0,val2=0.0,val3=0.0; long int vali=0; int w1,w2; int row,col; QString s1,s2; //basic functions + QString function; + function=func.upper(); if (function=="+") { s1=calculateVariable(getParameter(parameters, 0)); s2=calculateVariable(getParameter(parameters, 1)); val1=s1.toDouble(&ok)+s2.toDouble(&ok); return QString::number(val1); }; if (function=="-") { s1=calculateVariable(getParameter(parameters, 0)); s2=calculateVariable(getParameter(parameters, 1)); @@ -1768,73 +1770,73 @@ QString Sheet::dataParserHelper(const QString &data) QString tempval; s1=exp1.CompiledBody.first();i1=exp1.CompiledBodyType.first(); while(i<=(int)exp1.CompiledBody.count()-1) { args= ((*i1) & 0xFF00)>>8; tokentype=(*i1) & 0x00FF; if(tokentype==NUMBER_TOKEN) { stack1.push(new QString(*s1)); //printf("Parse:Number=%s\r\n",s1->latin1()); } else if(tokentype==VARIABLE_TOKEN) { - stack1.push(new QString(*s1)); + stack1.push(new QString(QString(*s1).upper())); //printf("Parse:Var=%s\r\n",s1->latin1()); //here to put implementation of other types of variables except cell. //for example names } else if(tokentype==STRING_TOKEN) { stack1.push(new QString(*s1)); //printf("Parse:String=%s\r\n",s1->ascii()); } else if(tokentype==FUNCTION_TOKEN) { QString params=""; for(int w1=1;w1<=args;w1++) { if((int)stack1.count()!=0) s2=stack1.pop(); params=*s2+params;//args in reverse order params=","+params; }; params=params.mid(1); if(params==NULL) params="0"; //printf("Parse:Func=%s, params=%s, stackcount=%d,args=%d\r\n" // ,s1->latin1(),params.latin1(),stack1.count(),args); tempval=calculateFunction(*s1,params,args); - tempval=tempval.upper(); + tempval=tempval; stack1.push(new QString(tempval)); }; //loops to next token if(exp1.CompiledBody.next()!=NULL) s1=exp1.CompiledBody.current(); else break; if(exp1.CompiledBodyType.next()!=NULL) i1=exp1.CompiledBodyType.current(); else break; i++; }; if((int)stack1.count()!=0)s2=stack1.pop(); else s2=new QString("!ERROR"); tempval=*s2; return(tempval); }; QString Sheet::dataParser(const QString &cell, const QString &data) { QString strippedData(data); strippedData.replace(QRegExp("\\s"), ""); if (strippedData.isEmpty() || strippedData[0]!='=') return data; if (listDataParser.find(cell)!=listDataParser.end()) return "0"; listDataParser.append(cell); // printf("DATAPARSER: data=%s, cell=%s\r\n",data.ascii(),cell.ascii()); - strippedData=dataParserHelper(strippedData.remove(0, 1).upper().replace(QRegExp(":"), ",")); + strippedData=dataParserHelper(strippedData.remove(0, 1).replace(QRegExp(":"), ",")); int i=0; QString tempParameter(getParameter(strippedData, i)), result=""; do { result+=","+calculateVariable(tempParameter); tempParameter=getParameter(strippedData, ++i); } while (!tempParameter.isNull()); listDataParser.remove(cell); return result.mid(1); } |