author | thufir <thufir> | 2002-10-08 16:43:57 (UTC) |
---|---|---|
committer | thufir <thufir> | 2002-10-08 16:43:57 (UTC) |
commit | 9475b63d025c1ca386764784b7dad460935f45b0 (patch) (side-by-side diff) | |
tree | f0b209ab08afb75e94f6d3f2b0ff4bc235774cbd /noncore | |
parent | 76fb8a57bf9fbae3a7073c8b0be1216f34adf99c (diff) | |
download | opie-9475b63d025c1ca386764784b7dad460935f45b0.zip opie-9475b63d025c1ca386764784b7dad460935f45b0.tar.gz opie-9475b63d025c1ca386764784b7dad460935f45b0.tar.bz2 |
fixed bug #250
-rw-r--r-- | noncore/apps/opie-sheet/ChangeLog | 11 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/opie-sheet.control | 2 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.cpp | 32 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.h | 4 |
5 files changed, 36 insertions, 16 deletions
diff --git a/noncore/apps/opie-sheet/ChangeLog b/noncore/apps/opie-sheet/ChangeLog index c12a6db..90060e2 100644 --- a/noncore/apps/opie-sheet/ChangeLog +++ b/noncore/apps/opie-sheet/ChangeLog @@ -1,9 +1,18 @@ +October 08, 2002 + + * Release 1.0.2 (by thufir) + - Fixed bug #250 (exhibiting re-calculation error in multi-level calculation). (by thufir) + +October 06, 2002 + + - Fixed data edit box clear problem. (by thufir) + October 05, 2002 - - Fixed bug #252. (by thufir) + - Fixed bug #252 (starting up in 'mouse button' mode). (by thufir) August 31, 2002 - Fixed and updated opie-sheet.pro file. (by cniehaus) August 01, 2002 diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index 2f07bae..b9f8e57 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp @@ -192,12 +192,13 @@ void MainWindow::selectorFileNew(const DocLnk &lnkDoc) { selectorHide(); if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return; if (currentDoc) delete currentDoc; currentDoc = new DocLnk(lnkDoc); + editData->clear(); listSheets.clear(); comboSheets->clear(); typeSheet *newSheet=createNewSheet(); newSheet->data.setAutoDelete(TRUE); sheet->setName(newSheet->name); @@ -530,13 +531,13 @@ void MainWindow::slotHelpGeneral() void MainWindow::slotHelpAbout() { QDialog dialogAbout(this, 0, TRUE); dialogAbout.resize(width()-40, height()-80); dialogAbout.setCaption(tr("About Opie Sheet")); - QLabel label(tr("Opie Sheet\nSpreadsheet Software for Opie\nQWDC Beta Winner (as Sheet/Qt)\n\nDeveloped by: Serdar Ozler\nRelease 1.0.1\nRelease Date: July 04, 2002\n\nThis product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.\n\nhttp://qtopia.sitebest.com"), &dialogAbout); + QLabel label(tr("Opie Sheet\nSpreadsheet Software for Opie\nQWDC Beta Winner (as Sheet/Qt)\n\nDeveloped by: Serdar Ozler\nRelease 1.0.2\nRelease Date: October 08, 2002\n\nThis product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.\n\nhttp://qtopia.sitebest.com"), &dialogAbout); label.setGeometry(dialogAbout.rect()); label.setAlignment(Qt::AlignCenter | Qt::WordBreak); dialogAbout.exec(); } diff --git a/noncore/apps/opie-sheet/opie-sheet.control b/noncore/apps/opie-sheet/opie-sheet.control index 38f9083..cc322bb 100644 --- a/noncore/apps/opie-sheet/opie-sheet.control +++ b/noncore/apps/opie-sheet/opie-sheet.control @@ -1,10 +1,10 @@ Files: bin/sheetqt apps/Applications/opie-sheet.desktop help/sheetqt.html help/sheetqt/* pics/opie-sheet/sheetqt.png Priority: optional Section: opie/applications Maintainer: Serdar Ozler <sozler@sitebest.com> Architecture: arm -Version: 1.0.1 +Version: 1.0.2 Depends: opie-base ($QPE_VERSION) License: Public Domain Description: Opie Sheet Spreadsheet software for Opie. diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp index be4046b..c2563c2 100644 --- a/noncore/apps/opie-sheet/sheet.cpp +++ b/noncore/apps/opie-sheet/sheet.cpp @@ -85,13 +85,13 @@ typeCellData *Sheet::createCellData(int row, int col) void Sheet::slotCellChanged(int row, int col) { typeCellData *cellData=findCellData(row, col); if (!cellData) cellData=createCellData(row, col); if (cellData) cellData->data=text(row, col); for (cellData=sheetData.first(); cellData; cellData=sheetData.next()) - setText(cellData->row, cellData->col, dataParser(cellData->data)); + setText(cellData->row, cellData->col, dataParser(findCellName(cellData->row, cellData->col), cellData->data)); emit sheetModified(); } void Sheet::swapCells(int row1, int col1, int row2, int col2) { typeCellData *cellData1=findCellData(row1, col1), *cellData2=findCellData(row2, col2); @@ -99,14 +99,14 @@ void Sheet::swapCells(int row1, int col1, int row2, int col2) if (!cellData2) cellData2=createCellData(row2, col2); if (cellData1 && cellData2) { QString tempData(cellData1->data); cellData1->data=cellData2->data; cellData2->data=tempData; - setText(cellData1->row, cellData1->col, dataParser(cellData1->data)); - setText(cellData2->row, cellData2->col, dataParser(cellData2->data)); + setText(cellData1->row, cellData1->col, dataParser(findCellName(cellData1->row, cellData1->col), cellData1->data)); + setText(cellData2->row, cellData2->col, dataParser(findCellName(cellData2->row, cellData2->col), cellData2->data)); emit sheetModified(); } } QString Sheet::getParameter(const QString ¶meters, int paramNo, bool giveError, const QString funcName) { @@ -163,13 +163,13 @@ double Sheet::calculateVariable(const QString &variable) { bool ok; double tempResult=variable.toDouble(&ok); if (ok) return tempResult; int row, col; - return (findRowColumn(variable, &row, &col, TRUE) ? text(row, col).toDouble() : 0); + return (findRowColumn(variable, &row, &col, TRUE) ? dataParser(variable, text(row, col)).toDouble() : 0); } double Sheet::functionSum(const QString ¶m1, const QString ¶m2) { int row1, col1, row2, col2, row, col; if (!findRange(param1, param2, &row1, &col1, &row2, &col2)) return 0; @@ -417,27 +417,30 @@ QString Sheet::dataParserHelper(const QString &data) tempElement=popStringStack(&stackElements); while (!stackElements.isEmpty()) tempElement.prepend(popStringStack(&stackElements)+","); return tempElement; } -QString Sheet::dataParser(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); strippedData=dataParserHelper(strippedData.remove(0, 1).upper().replace(QRegExp(":"), ",")); int i=0; QString tempParameter(getParameter(strippedData, i)), result=""; do { result+=","+QString::number(calculateVariable(tempParameter)); tempParameter=getParameter(strippedData, ++i); } while (!tempParameter.isNull()); + listDataParser.remove(cell); return result.mid(1); } void Sheet::setData(const QString &data) { setText(currentRow(), currentColumn(), data); @@ -536,20 +539,25 @@ void Sheet::viewportMouseReleaseEvent(QMouseEvent *e) { QTableSelection oldSelection(selection(selectionNo)); oldSelection.expandTo(rowAt(ce.pos().y()), columnAt(ce.pos().x())); removeSelection(selectionNo); selectionNo=-1; if (oldSelection.topRow()==oldSelection.bottomRow() && oldSelection.leftCol()==oldSelection.rightCol()) - emit cellClicked(getHeaderString(oldSelection.leftCol()+1)+QString::number(oldSelection.topRow()+1)); + emit cellClicked(findCellName(oldSelection.topRow(), oldSelection.leftCol())); else - emit cellClicked(getHeaderString(oldSelection.leftCol()+1)+QString::number(oldSelection.topRow()+1)+','+getHeaderString(oldSelection.rightCol()+1)+QString::number(oldSelection.bottomRow()+1)); + emit cellClicked(findCellName(oldSelection.topRow(), oldSelection.leftCol())+','+findCellName(oldSelection.bottomRow(), oldSelection.rightCol())); } else QTable::contentsMouseReleaseEvent(&ce); } +QString Sheet::findCellName(int row, int col) +{ + return (getHeaderString(col+1)+QString::number(row+1)); +} + void Sheet::copySheetData(QList<typeCellData> *destSheetData) { typeCellData *tempCellData, *newCellData; destSheetData->clear(); for (tempCellData=sheetData.first(); tempCellData; tempCellData=sheetData.next()) @@ -573,13 +581,13 @@ void Sheet::setSheetData(QList<typeCellData> *srcSheetData) for (tempCellData=srcSheetData->first(); tempCellData; tempCellData=srcSheetData->next()) { newCellData=new typeCellData; *newCellData=*tempCellData; sheetData.append(newCellData); - setText(newCellData->row, newCellData->col, dataParser(newCellData->data)); + setText(newCellData->row, newCellData->col, dataParser(findCellName(newCellData->row, newCellData->col), newCellData->data)); } emit sheetModified(); } void Sheet::setName(const QString &name) { @@ -753,13 +761,13 @@ void Sheet::editPaste(bool onlyContents) else { *cellData=*tempCellData; cellData->row+=row1; cellData->col+=col1; } - setText(cellData->row, cellData->col, dataParser(cellData->data)); + setText(cellData->row, cellData->col, dataParser(findCellName(cellData->row, cellData->col), cellData->data)); emit sheetModified(); } } } void Sheet::insertRows(int no, bool allColumns) @@ -776,13 +784,13 @@ void Sheet::insertRows(int no, bool allColumns) tempCellData->row+=no; } for (tempCellData=sheetData.first(); tempCellData; tempCellData=sheetData.next()) if (tempCellData->row>=row && (allColumns || tempCellData->col==col)) { updateCell(tempCellData->row-no, tempCellData->col); - setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); + setText(tempCellData->row, tempCellData->col, dataParser(findCellName(tempCellData->row, tempCellData->col), tempCellData->data)); } emit sheetModified(); } void Sheet::insertColumns(int no, bool allRows) { @@ -802,13 +810,13 @@ void Sheet::insertColumns(int no, bool allRows) tempCellData->col+=no; } for (tempCellData=sheetData.first(); tempCellData; tempCellData=sheetData.next()) if (tempCellData->col>=col && (allRows || tempCellData->row==row)) { updateCell(tempCellData->row, tempCellData->col-no); - setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); + setText(tempCellData->row, tempCellData->col, dataParser(findCellName(tempCellData->row, tempCellData->col), tempCellData->data)); } emit sheetModified(); } void Sheet::dataFindReplace(const QString &findStr, const QString &replaceStr, bool matchCase, bool allCells, bool entireCell, bool replace, bool replaceAll) { @@ -829,13 +837,13 @@ void Sheet::dataFindReplace(const QString &findStr, const QString &replaceStr, b clearSelection(); } setCurrentCell(tempCellData->row, tempCellData->col); if (replace) { tempCellData->data=cellItem->text().replace(QRegExp(findStr, matchCase), replaceStr); - setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); + setText(tempCellData->row, tempCellData->col, dataParser(findCellName(tempCellData->row, tempCellData->col), tempCellData->data)); } if (!replace || !replaceAll) break; } } if (found) diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h index f78a684..f4e9d38 100644 --- a/noncore/apps/opie-sheet/sheet.h +++ b/noncore/apps/opie-sheet/sheet.h @@ -44,23 +44,25 @@ class Sheet: public QTable typeCellBorders defaultBorders; typeCellData defaultCellData; // QT objects QList<typeCellData> sheetData, clipboardData; QString pressedCell, releasedCell, sheetName; + QStringList listDataParser; // Private functions int getOperatorPriority(char oper); 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); double calculateVariable(const QString &variable); double calculateFunction(const QString &function, const QString ¶meters); QChar popCharStack(QStack<QChar> *stackChars); QString popStringStack(QStack<QString> *stackStrings); QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); - QString dataParser(const QString &data); + 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); void pushCharStack(QStack<QChar> *stackChars, const QChar &character); void pushStringStack(QStack<QString> *stackStrings, const QString &string); |