author | hayzel <hayzel> | 2004-01-08 12:12:30 (UTC) |
---|---|---|
committer | hayzel <hayzel> | 2004-01-08 12:12:30 (UTC) |
commit | 3cb4363abdb17d2898b4792390672375ffcd2493 (patch) (side-by-side diff) | |
tree | a4debe153e781bb76a87b42362215800c81704d4 /noncore/apps | |
parent | b25818faa882c1eb040f74e485cd981b94871a61 (diff) | |
download | opie-3cb4363abdb17d2898b4792390672375ffcd2493.zip opie-3cb4363abdb17d2898b4792390672375ffcd2493.tar.gz opie-3cb4363abdb17d2898b4792390672375ffcd2493.tar.bz2 |
*** empty log message ***
-rw-r--r-- | noncore/apps/opie-sheet/ChangeLog | 4 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.h | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/noncore/apps/opie-sheet/ChangeLog b/noncore/apps/opie-sheet/ChangeLog index 56887c5..e8a31ee 100644 --- a/noncore/apps/opie-sheet/ChangeLog +++ b/noncore/apps/opie-sheet/ChangeLog @@ -1,8 +1,12 @@ +January 8, 2004 + - fixed issue : "-if someone enters directly text as parameter to a string function the text renders as uppercase due to the calculation engine that uppercases all the parsing sentence." + now the text is handled correctly. + January 7, 2004 * Release by hayzel (koppermind@panafonet.gr) This version has many valuable changes, though It may have some annoying bugs. Please if you are interested in opie-sheet try it hard, so I can fix some of them. Also If you want some other functions that must be here and are missing feel free to ask them. (no financial functions please. :) I really hate them ) -Fixed a bug with non closed parenthesis editing&recalculation infinite loop. -Added support for functions that can parse parameters not ONLY as numbers but also as strings. -Added many functions that cover many computational topics rendering opie-sheet a computational tool-spreadsheet at last. (total 90 functions!) -Maintained compatibility with the opie-fileformat. -New icons. 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 @@ -904,25 +904,27 @@ double Sheet::functionCountIf(const QString ¶m1, const QString ¶m2, cons { 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); }; @@ -1772,17 +1774,17 @@ QString Sheet::dataParserHelper(const QString &data) 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()); @@ -1796,17 +1798,17 @@ QString Sheet::dataParserHelper(const QString &data) 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++; }; @@ -1820,17 +1822,17 @@ QString Sheet::dataParserHelper(const QString &data) 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); } diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h index 41f1b86..f705cd0 100644 --- a/noncore/apps/opie-sheet/sheet.h +++ b/noncore/apps/opie-sheet/sheet.h @@ -95,17 +95,17 @@ class Sheet: public QTable QString pressedCell, releasedCell, sheetName; QStringList listDataParser; // Private functions bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); QString findCellName(int row, int col); bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); QString calculateVariable(const QString &variable); - QString calculateFunction(const QString &function, const QString ¶meters, int NumOfParams); + QString calculateFunction(const QString &func, const QString ¶meters, int NumOfParams); QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); QString dataParser(const QString &cell, const QString &data); QString dataParserHelper(const QString &data); typeCellData *createCellData(int row, int col); typeCellData *findCellData(int row, int col); //LOGICAL / INFO |