Diffstat (limited to 'noncore/apps/opie-sheet/sheet.cpp') (more/less context) (ignore 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 | |||
@@ -906,21 +906,23 @@ double Sheet::functionCountIf(const QString ¶m1, const QString ¶m2, cons | |||
906 | if (ok && (s2==text(row,col)) ) ++divider; | 906 | if (ok && (s2==text(row,col)) ) ++divider; |
907 | } | 907 | } |
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)); |
925 | val1=s1.toDouble(&ok)+s2.toDouble(&ok); | 927 | val1=s1.toDouble(&ok)+s2.toDouble(&ok); |
926 | return QString::number(val1); | 928 | return QString::number(val1); |
@@ -1774,13 +1776,13 @@ QString Sheet::dataParserHelper(const QString &data) | |||
1774 | { | 1776 | { |
1775 | stack1.push(new QString(*s1)); | 1777 | stack1.push(new QString(*s1)); |
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 | } |
1785 | else if(tokentype==STRING_TOKEN) | 1787 | else if(tokentype==STRING_TOKEN) |
1786 | { | 1788 | { |
@@ -1798,13 +1800,13 @@ QString Sheet::dataParserHelper(const QString &data) | |||
1798 | }; | 1800 | }; |
1799 | params=params.mid(1); | 1801 | params=params.mid(1); |
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 |
1809 | if(exp1.CompiledBody.next()!=NULL) s1=exp1.CompiledBody.current(); else break; | 1811 | if(exp1.CompiledBody.next()!=NULL) s1=exp1.CompiledBody.current(); else break; |
1810 | if(exp1.CompiledBodyType.next()!=NULL) i1=exp1.CompiledBodyType.current(); else break; | 1812 | if(exp1.CompiledBodyType.next()!=NULL) i1=exp1.CompiledBodyType.current(); else break; |
@@ -1822,13 +1824,13 @@ QString Sheet::dataParser(const QString &cell, const QString &data) | |||
1822 | QString strippedData(data); | 1824 | QString strippedData(data); |
1823 | strippedData.replace(QRegExp("\\s"), ""); | 1825 | strippedData.replace(QRegExp("\\s"), ""); |
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 |
1833 | { | 1835 | { |
1834 | result+=","+calculateVariable(tempParameter); | 1836 | result+=","+calculateVariable(tempParameter); |