author | hayzel <hayzel> | 2004-01-08 12:12:30 (UTC) |
---|---|---|
committer | hayzel <hayzel> | 2004-01-08 12:12:30 (UTC) |
commit | 3cb4363abdb17d2898b4792390672375ffcd2493 (patch) (unidiff) | |
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,4 +1,8 @@ | |||
1 | January 8, 2004 | ||
2 | - 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." | ||
3 | now the text is handled correctly. | ||
4 | |||
1 | January 7, 2004 | 5 | January 7, 2004 |
2 | * Release by hayzel (koppermind@panafonet.gr) | 6 | * Release by hayzel (koppermind@panafonet.gr) |
3 | 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 ) | 7 | 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 ) |
4 | -Fixed a bug with non closed parenthesis editing&recalculation infinite loop. | 8 | -Fixed a bug with non closed parenthesis editing&recalculation infinite loop. |
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 | |||
@@ -908,17 +908,19 @@ double Sheet::functionCountIf(const QString ¶m1, const QString ¶m2, cons | |||
908 | return divider; | 908 | return divider; |
909 | } | 909 | } |
910 | 910 | ||
911 | 911 | ||
912 | QString Sheet::calculateFunction(const QString &function, const QString ¶meters, int NumOfParams) | 912 | QString Sheet::calculateFunction(const QString &func, const QString ¶meters, int NumOfParams) |
913 | { | 913 | { |
914 | bool ok; | 914 | bool ok; |
915 | double val1=0.0,val2=0.0,val3=0.0; | 915 | double val1=0.0,val2=0.0,val3=0.0; |
916 | long int vali=0; | 916 | long int vali=0; |
917 | int w1,w2; | 917 | int w1,w2; |
918 | int row,col; | 918 | int row,col; |
919 | QString s1,s2; | 919 | QString s1,s2; |
920 | //basic functions | 920 | //basic functions |
921 | QString function; | ||
922 | function=func.upper(); | ||
921 | if (function=="+") | 923 | if (function=="+") |
922 | { | 924 | { |
923 | s1=calculateVariable(getParameter(parameters, 0)); | 925 | s1=calculateVariable(getParameter(parameters, 0)); |
924 | s2=calculateVariable(getParameter(parameters, 1)); | 926 | s2=calculateVariable(getParameter(parameters, 1)); |
@@ -1776,9 +1778,9 @@ QString Sheet::dataParserHelper(const QString &data) | |||
1776 | //printf("Parse:Number=%s\r\n",s1->latin1()); | 1778 | //printf("Parse:Number=%s\r\n",s1->latin1()); |
1777 | } | 1779 | } |
1778 | else if(tokentype==VARIABLE_TOKEN) | 1780 | else if(tokentype==VARIABLE_TOKEN) |
1779 | { | 1781 | { |
1780 | stack1.push(new QString(*s1)); | 1782 | stack1.push(new QString(QString(*s1).upper())); |
1781 | //printf("Parse:Var=%s\r\n",s1->latin1()); | 1783 | //printf("Parse:Var=%s\r\n",s1->latin1()); |
1782 | //here to put implementation of other types of variables except cell. | 1784 | //here to put implementation of other types of variables except cell. |
1783 | //for example names | 1785 | //for example names |
1784 | } | 1786 | } |
@@ -1800,9 +1802,9 @@ QString Sheet::dataParserHelper(const QString &data) | |||
1800 | if(params==NULL) params="0"; | 1802 | if(params==NULL) params="0"; |
1801 | //printf("Parse:Func=%s, params=%s, stackcount=%d,args=%d\r\n" | 1803 | //printf("Parse:Func=%s, params=%s, stackcount=%d,args=%d\r\n" |
1802 | //,s1->latin1(),params.latin1(),stack1.count(),args); | 1804 | //,s1->latin1(),params.latin1(),stack1.count(),args); |
1803 | tempval=calculateFunction(*s1,params,args); | 1805 | tempval=calculateFunction(*s1,params,args); |
1804 | tempval=tempval.upper(); | 1806 | tempval=tempval; |
1805 | stack1.push(new QString(tempval)); | 1807 | stack1.push(new QString(tempval)); |
1806 | }; | 1808 | }; |
1807 | 1809 | ||
1808 | //loops to next token | 1810 | //loops to next token |
@@ -1824,9 +1826,9 @@ QString Sheet::dataParser(const QString &cell, const QString &data) | |||
1824 | if (strippedData.isEmpty() || strippedData[0]!='=') return data; | 1826 | if (strippedData.isEmpty() || strippedData[0]!='=') return data; |
1825 | if (listDataParser.find(cell)!=listDataParser.end()) return "0"; | 1827 | if (listDataParser.find(cell)!=listDataParser.end()) return "0"; |
1826 | listDataParser.append(cell); | 1828 | listDataParser.append(cell); |
1827 | // printf("DATAPARSER: data=%s, cell=%s\r\n",data.ascii(),cell.ascii()); | 1829 | // printf("DATAPARSER: data=%s, cell=%s\r\n",data.ascii(),cell.ascii()); |
1828 | strippedData=dataParserHelper(strippedData.remove(0, 1).upper().replace(QRegExp(":"), ",")); | 1830 | strippedData=dataParserHelper(strippedData.remove(0, 1).replace(QRegExp(":"), ",")); |
1829 | 1831 | ||
1830 | int i=0; | 1832 | int i=0; |
1831 | QString tempParameter(getParameter(strippedData, i)), result=""; | 1833 | QString tempParameter(getParameter(strippedData, i)), result=""; |
1832 | do | 1834 | do |
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 | |||
@@ -99,9 +99,9 @@ class Sheet: public QTable | |||
99 | bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); | 99 | bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); |
100 | QString findCellName(int row, int col); | 100 | QString findCellName(int row, int col); |
101 | bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); | 101 | bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); |
102 | QString calculateVariable(const QString &variable); | 102 | QString calculateVariable(const QString &variable); |
103 | QString calculateFunction(const QString &function, const QString ¶meters, int NumOfParams); | 103 | QString calculateFunction(const QString &func, const QString ¶meters, int NumOfParams); |
104 | QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); | 104 | QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); |
105 | QString dataParser(const QString &cell, const QString &data); | 105 | QString dataParser(const QString &cell, const QString &data); |
106 | QString dataParserHelper(const QString &data); | 106 | QString dataParserHelper(const QString &data); |
107 | typeCellData *createCellData(int row, int col); | 107 | typeCellData *createCellData(int row, int col); |