TianZD/QtXlsxWriter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue 6: row & column No. starts from 1 instead of 0 now

Browse Source
This commit is contained in:
Debao Zhang
2013-11-05 11:15:25 +08:00
parent daeff262bb
commit 470abc6453
11 changed files with 123 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/utility/tst_utilitytest.cpp
+17 -17
View File
@@ -68,18 +68,18 @@ void UtilityTest::test_cell_to_rowcol_data()
QTest::addColumn<int>("row");
QTest::addColumn<int>("col");
QTest::newRow("A1") << "A1" << 0 << 0;
QTest::newRow("B1") << "B1" << 0 << 1;
QTest::newRow("C1") << "C1" << 0 << 2;
QTest::newRow("J1") << "J1" << 0 << 9;
QTest::newRow("A2") << "A2" << 1 << 0;
QTest::newRow("A3") << "A3" << 2 << 0;
QTest::newRow("A10") << "A10" << 9 << 0;
QTest::newRow("Z8") << "Z8" << 7 << 25;
QTest::newRow("AA10") << "AA10" << 9 << 26;
QTest::newRow("IU2") << "IU2" << 1 << 254;
QTest::newRow("XFD1") << "XFD1" << 0 << 16383;
QTest::newRow("XFE1048577") << "XFE1048577" << 1048576 << 16384;
QTest::newRow("A1") << "A1" << 1 << 1;
QTest::newRow("B1") << "B1" << 1 << 2;
QTest::newRow("C1") << "C1" << 1 << 3;
QTest::newRow("J1") << "J1" << 1 << 10;
QTest::newRow("A2") << "A2" << 2 << 1;
QTest::newRow("A3") << "A3" << 3 << 1;
QTest::newRow("A10") << "A10" << 10 << 1;
QTest::newRow("Z8") << "Z8" << 8 << 26;
QTest::newRow("AA10") << "AA10" << 10 << 27;
QTest::newRow("IU2") << "IU2" << 2 << 255;
QTest::newRow("XFD1") << "XFD1" << 1 << 16384;
QTest::newRow("XFE1048577") << "XFE1048577" << 1048577 << 16385;
}
void UtilityTest::test_rowcol_to_cell()
@@ -101,11 +101,11 @@ void UtilityTest::test_rowcol_to_cell_data()
QTest::addColumn<bool>("col_abs");
QTest::addColumn<QString>("cell");
QTest::newRow("simple") << 0 << 0 << false << false << "A1";
QTest::newRow("rowabs") << 0 << 0 << true << false << "A$1";
QTest::newRow("colabs") << 0 << 0 << false << true << "$A1";
QTest::newRow("bothabs") << 0 << 0 << true << true << "$A$1";
QTest::newRow("...") << 1048576 << 16384 << false << false << "XFE1048577";
QTest::newRow("simple") << 1 << 1 << false << false << "A1";
QTest::newRow("rowabs") << 1 << 1 << true << false << "A$1";
QTest::newRow("colabs") << 1 << 1 << false << true << "$A1";
QTest::newRow("bothabs") << 1 << 1 << true << true << "$A$1";
QTest::newRow("...") << 1048577 << 16385 << false << false << "XFE1048577";
}
void UtilityTest::test_datetimeToNumber_data()
tests/auto/worksheet/tst_worksheet.cpp
+12 -10
View File
@@ -55,16 +55,16 @@ void WorksheetTest::testDimension()
sheet.write("C3", "Test");
qDebug()<<sheet.dimension().toString();
QCOMPARE(sheet.dimension(), QXlsx::CellRange(2, 2, 2, 2)); //Single Cell
QCOMPARE(sheet.dimension(), QXlsx::CellRange(3, 3, 3, 3)); //Single Cell
sheet.write("B2", "Second");
QCOMPARE(sheet.dimension(), QXlsx::CellRange(1, 1, 2, 2));
QCOMPARE(sheet.dimension(), QXlsx::CellRange(2, 2, 3, 3));
sheet.write("D4", "Test");
QCOMPARE(sheet.dimension(), QXlsx::CellRange("B2:D4"));
sheet.write(10000, 10000, "For test");
QCOMPARE(sheet.dimension(), QXlsx::CellRange(1, 1, 10000, 10000));
QCOMPARE(sheet.dimension(), QXlsx::CellRange(2, 2, 10000, 10000));
}
void WorksheetTest::testSheetView()
@@ -81,9 +81,10 @@ void WorksheetTest::testSheetView()
void WorksheetTest::testSetColumn()
{
QXlsx::Worksheet sheet("", 1, 0);
sheet.setColumn(0, 10, 20.0); //"A:K"
sheet.setColumn(3, 7, 10.0); //"D:H"
sheet.setColumn(5, 5, 15.0); //"F:F"
sheet.setColumn(1, 11, 20.0); //"A:K"
sheet.setColumn(4, 8, 10.0); //"D:H"
sheet.setColumn(6, 6, 15.0); //"F:F"
sheet.setColumn(1, 9, 8.8); //"A:H"
QByteArray xmldata = sheet.saveToXmlData();
@@ -92,7 +93,8 @@ void WorksheetTest::testSetColumn()
QVERIFY(xmldata.contains("<col min=\"4\" max=\"5\"")); //"D:E"
QVERIFY(xmldata.contains("<col min=\"6\" max=\"6\"")); //"F:F"
QVERIFY(xmldata.contains("<col min=\"7\" max=\"8\"")); //"G:H"
QVERIFY(xmldata.contains("<col min=\"9\" max=\"11\""));//"I:K"
QVERIFY(xmldata.contains("<col min=\"9\" max=\"9\""));//"I:I"
QVERIFY(xmldata.contains("<col min=\"10\" max=\"11\""));//"J:K"
}
void WorksheetTest::testWriteCells()
@@ -100,10 +102,10 @@ void WorksheetTest::testWriteCells()
QXlsx::Worksheet sheet("", 1, 0);
sheet.write("A1", 123);
sheet.write("A2", "Hello");
sheet.writeInlineString(2, 0, "Hello inline"); //A3
sheet.writeInlineString(3, 1, "Hello inline"); //A3
sheet.write("A4", true);
sheet.write("A5", "=44+33");
sheet.writeFormula(4, 1, "44+33", 0, 77);
sheet.writeFormula(5, 2, "44+33", 0, 77);
QByteArray xmldata = sheet.saveToXmlData();
@@ -259,7 +261,7 @@ void WorksheetTest::testReadRowsInfo()
sheet.d_ptr->readSheetData(reader);
QCOMPARE(sheet.d_ptr->rowsInfo.size(), 1);
QCOMPARE(sheet.d_ptr->rowsInfo[2]->height, 40.0);
QCOMPARE(sheet.d_ptr->rowsInfo[3]->height, 40.0);
}
void WorksheetTest::testReadMergeCells()