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

Code refactoring: rename private members of Worksheet

master
Debao Zhang 11 years ago
parent
fd7e8d84f7
commit
d3cfd3a6c6
3 changed files with 43 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      src/xlsx/xlsxworksheet.cpp
  2. 24
      src/xlsx/xlsxworksheet_p.h
  3. 10
      tests/auto/worksheet/tst_worksheet.cpp

52
src/xlsx/xlsxworksheet.cpp
View File

@ -1211,21 +1211,21 @@ void Worksheet::saveToXmlFile(QIODevice *device) const
writer.writeStartElement(QStringLiteral("sheetData")); writer.writeStartElement(QStringLiteral("sheetData"));
if (d->dimension.isValid()) if (d->dimension.isValid())
d->writeSheetData(writer); d->saveXmlSheetData(writer);
writer.writeEndElement();//sheetData writer.writeEndElement();//sheetData
d->writeMergeCells(writer); d->saveXmlMergeCells(writer);
foreach (const ConditionalFormatting cf, d->conditionalFormattingList) foreach (const ConditionalFormatting cf, d->conditionalFormattingList)
cf.saveToXml(writer); cf.saveToXml(writer);
d->writeDataValidations(writer); d->saveXmlDataValidations(writer);
d->writeHyperlinks(writer); d->saveXmlHyperlinks(writer);
d->writeDrawings(writer); d->saveXmlDrawings(writer);
writer.writeEndElement();//worksheet writer.writeEndElement();//worksheet
writer.writeEndDocument(); writer.writeEndDocument();
} }
void WorksheetPrivate::writeSheetData(QXmlStreamWriter &writer) const void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
{ {
calculateSpans(); calculateSpans();
for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) { for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) {
@ -1266,7 +1266,7 @@ void WorksheetPrivate::writeSheetData(QXmlStreamWriter &writer) const
for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) { for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
if (cellTable[row_num].contains(col_num)) { if (cellTable[row_num].contains(col_num)) {
writeCellData(writer, row_num, col_num, cellTable[row_num][col_num]); saveXmlCellData(writer, row_num, col_num, cellTable[row_num][col_num]);
} }
} }
writer.writeEndElement(); //row writer.writeEndElement(); //row
@ -1278,7 +1278,7 @@ void WorksheetPrivate::writeSheetData(QXmlStreamWriter &writer) const
} }
} }
void WorksheetPrivate::writeCellData(QXmlStreamWriter &writer, int row, int col, QSharedPointer<Cell> cell) const void WorksheetPrivate::saveXmlCellData(QXmlStreamWriter &writer, int row, int col, QSharedPointer<Cell> cell) const
{ {
//This is the innermost loop so efficiency is important. //This is the innermost loop so efficiency is important.
QString cell_pos = xl_rowcol_to_cell_fast(row, col); QString cell_pos = xl_rowcol_to_cell_fast(row, col);
@ -1352,7 +1352,7 @@ void WorksheetPrivate::writeCellData(QXmlStreamWriter &writer, int row, int col,
writer.writeEndElement(); //c writer.writeEndElement(); //c
} }
void WorksheetPrivate::writeMergeCells(QXmlStreamWriter &writer) const void WorksheetPrivate::saveXmlMergeCells(QXmlStreamWriter &writer) const
{ {
if (merges.isEmpty()) if (merges.isEmpty())
return; return;
@ -1370,7 +1370,7 @@ void WorksheetPrivate::writeMergeCells(QXmlStreamWriter &writer) const
writer.writeEndElement(); //mergeCells writer.writeEndElement(); //mergeCells
} }
void WorksheetPrivate::writeDataValidations(QXmlStreamWriter &writer) const void WorksheetPrivate::saveXmlDataValidations(QXmlStreamWriter &writer) const
{ {
if (dataValidationsList.isEmpty()) if (dataValidationsList.isEmpty())
return; return;
@ -1384,7 +1384,7 @@ void WorksheetPrivate::writeDataValidations(QXmlStreamWriter &writer) const
writer.writeEndElement(); //dataValidations writer.writeEndElement(); //dataValidations
} }
void WorksheetPrivate::writeHyperlinks(QXmlStreamWriter &writer) const void WorksheetPrivate::saveXmlHyperlinks(QXmlStreamWriter &writer) const
{ {
if (urlTable.isEmpty()) if (urlTable.isEmpty())
return; return;
@ -1426,7 +1426,7 @@ void WorksheetPrivate::writeHyperlinks(QXmlStreamWriter &writer) const
writer.writeEndElement();//hyperlinks writer.writeEndElement();//hyperlinks
} }
void WorksheetPrivate::writeDrawings(QXmlStreamWriter &writer) const void WorksheetPrivate::saveXmlDrawings(QXmlStreamWriter &writer) const
{ {
if (!drawing) if (!drawing)
return; return;
@ -1869,7 +1869,7 @@ QByteArray Worksheet::saveToXmlData() const
return data; return data;
} }
QSharedPointer<Cell> WorksheetPrivate::readNumericCellData(QXmlStreamReader &reader) QSharedPointer<Cell> WorksheetPrivate::loadXmlNumericCellData(QXmlStreamReader &reader)
{ {
Q_ASSERT(reader.name() == QLatin1String("c")); Q_ASSERT(reader.name() == QLatin1String("c"));
@ -1909,7 +1909,7 @@ QSharedPointer<Cell> WorksheetPrivate::readNumericCellData(QXmlStreamReader &rea
return cell; return cell;
} }
void WorksheetPrivate::readSheetData(QXmlStreamReader &reader) void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
{ {
Q_Q(Worksheet); Q_Q(Worksheet);
Q_ASSERT(reader.name() == QLatin1String("sheetData")); Q_ASSERT(reader.name() == QLatin1String("sheetData"));
@ -2002,7 +2002,7 @@ void WorksheetPrivate::readSheetData(QXmlStreamReader &reader)
} }
} else if (type == QLatin1String("str")) { } else if (type == QLatin1String("str")) {
//formula type //formula type
QSharedPointer<Cell> data = readNumericCellData(reader); QSharedPointer<Cell> data = loadXmlNumericCellData(reader);
data->d_ptr->format = format; data->d_ptr->format = format;
data->d_ptr->parent = q; data->d_ptr->parent = q;
cellTable[pos.x()][pos.y()] = data; cellTable[pos.x()][pos.y()] = data;
@ -2023,14 +2023,14 @@ void WorksheetPrivate::readSheetData(QXmlStreamReader &reader)
data->d_ptr->formula = f_str; data->d_ptr->formula = f_str;
cellTable[pos.x()][pos.y()] = data; cellTable[pos.x()][pos.y()] = data;
} else if (type == QLatin1String("n")) { } else if (type == QLatin1String("n")) {
QSharedPointer<Cell> data = readNumericCellData(reader); QSharedPointer<Cell> data = loadXmlNumericCellData(reader);
data->d_ptr->format = format; data->d_ptr->format = format;
data->d_ptr->parent = q; data->d_ptr->parent = q;
cellTable[pos.x()][pos.y()] = data; cellTable[pos.x()][pos.y()] = data;
} }
} else { } else {
//default is "n" //default is "n"
QSharedPointer<Cell> data = readNumericCellData(reader); QSharedPointer<Cell> data = loadXmlNumericCellData(reader);
data->d_ptr->format = format; data->d_ptr->format = format;
data->d_ptr->parent = q; data->d_ptr->parent = q;
cellTable[pos.x()][pos.y()] = data; cellTable[pos.x()][pos.y()] = data;
@ -2040,7 +2040,7 @@ void WorksheetPrivate::readSheetData(QXmlStreamReader &reader)
} }
} }
void WorksheetPrivate::readColumnsInfo(QXmlStreamReader &reader) void WorksheetPrivate::loadXmlColumnsInfo(QXmlStreamReader &reader)
{ {
Q_ASSERT(reader.name() == QLatin1String("cols")); Q_ASSERT(reader.name() == QLatin1String("cols"));
@ -2081,7 +2081,7 @@ void WorksheetPrivate::readColumnsInfo(QXmlStreamReader &reader)
} }
} }
void WorksheetPrivate::readMergeCells(QXmlStreamReader &reader) void WorksheetPrivate::loadXmlMergeCells(QXmlStreamReader &reader)
{ {
Q_ASSERT(reader.name() == QLatin1String("mergeCells")); Q_ASSERT(reader.name() == QLatin1String("mergeCells"));
@ -2111,7 +2111,7 @@ void WorksheetPrivate::readMergeCells(QXmlStreamReader &reader)
qDebug("read merge cells error"); qDebug("read merge cells error");
} }
void WorksheetPrivate::readDataValidations(QXmlStreamReader &reader) void WorksheetPrivate::loadXmlDataValidations(QXmlStreamReader &reader)
{ {
Q_ASSERT(reader.name() == QLatin1String("dataValidations")); Q_ASSERT(reader.name() == QLatin1String("dataValidations"));
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
@ -2130,7 +2130,7 @@ void WorksheetPrivate::readDataValidations(QXmlStreamReader &reader)
qDebug("read data validation error"); qDebug("read data validation error");
} }
void WorksheetPrivate::readSheetViews(QXmlStreamReader &reader) void WorksheetPrivate::loadXmlSheetViews(QXmlStreamReader &reader)
{ {
Q_ASSERT(reader.name() == QLatin1String("sheetViews")); Q_ASSERT(reader.name() == QLatin1String("sheetViews"));
@ -2168,17 +2168,17 @@ bool Worksheet::loadFromXmlFile(QIODevice *device)
QString range = attributes.value(QLatin1String("ref")).toString(); QString range = attributes.value(QLatin1String("ref")).toString();
d->dimension = CellRange(range); d->dimension = CellRange(range);
} else if (reader.name() == QLatin1String("sheetViews")) { } else if (reader.name() == QLatin1String("sheetViews")) {
d->readSheetViews(reader); d->loadXmlSheetViews(reader);
} else if (reader.name() == QLatin1String("sheetFormatPr")) { } else if (reader.name() == QLatin1String("sheetFormatPr")) {
} else if (reader.name() == QLatin1String("cols")) { } else if (reader.name() == QLatin1String("cols")) {
d->readColumnsInfo(reader); d->loadXmlColumnsInfo(reader);
} else if (reader.name() == QLatin1String("sheetData")) { } else if (reader.name() == QLatin1String("sheetData")) {
d->readSheetData(reader); d->loadXmlSheetData(reader);
} else if (reader.name() == QLatin1String("mergeCells")) { } else if (reader.name() == QLatin1String("mergeCells")) {
d->readMergeCells(reader); d->loadXmlMergeCells(reader);
} else if (reader.name() == QLatin1String("dataValidations")) { } else if (reader.name() == QLatin1String("dataValidations")) {
d->readDataValidations(reader); d->loadXmlDataValidations(reader);
} else if (reader.name() == QLatin1String("conditionalFormatting")) { } else if (reader.name() == QLatin1String("conditionalFormatting")) {
ConditionalFormatting cf; ConditionalFormatting cf;
cf.loadFromXml(reader, workbook()->styles()); cf.loadFromXml(reader, workbook()->styles());

24
src/xlsx/xlsxworksheet_p.h
View File

@ -184,23 +184,23 @@ public:
void calculateSpans() const; void calculateSpans() const;
void splitColsInfo(int colFirst, int colLast); void splitColsInfo(int colFirst, int colLast);
void writeSheetData(QXmlStreamWriter &writer) const; void saveXmlSheetData(QXmlStreamWriter &writer) const;
void writeCellData(QXmlStreamWriter &writer, int row, int col, QSharedPointer<Cell> cell) const; void saveXmlCellData(QXmlStreamWriter &writer, int row, int col, QSharedPointer<Cell> cell) const;
void writeMergeCells(QXmlStreamWriter &writer) const; void saveXmlMergeCells(QXmlStreamWriter &writer) const;
void writeHyperlinks(QXmlStreamWriter &writer) const; void saveXmlHyperlinks(QXmlStreamWriter &writer) const;
void writeDrawings(QXmlStreamWriter &writer) const; void saveXmlDrawings(QXmlStreamWriter &writer) const;
void writeDataValidations(QXmlStreamWriter &writer) const; void saveXmlDataValidations(QXmlStreamWriter &writer) const;
int rowPixelsSize(int row) const; int rowPixelsSize(int row) const;
int colPixelsSize(int col) const; int colPixelsSize(int col) const;
XlsxObjectPositionData objectPixelsPosition(int col_start, int row_start, double x1, double y1, double width, double height) const; XlsxObjectPositionData objectPixelsPosition(int col_start, int row_start, double x1, double y1, double width, double height) const;
XlsxObjectPositionData pixelsToEMUs(const XlsxObjectPositionData &data) const; XlsxObjectPositionData pixelsToEMUs(const XlsxObjectPositionData &data) const;
QSharedPointer<Cell> readNumericCellData(QXmlStreamReader &reader); QSharedPointer<Cell> loadXmlNumericCellData(QXmlStreamReader &reader);
void readSheetData(QXmlStreamReader &reader); void loadXmlSheetData(QXmlStreamReader &reader);
void readColumnsInfo(QXmlStreamReader &reader); void loadXmlColumnsInfo(QXmlStreamReader &reader);
void readMergeCells(QXmlStreamReader &reader); void loadXmlMergeCells(QXmlStreamReader &reader);
void readDataValidations(QXmlStreamReader &reader); void loadXmlDataValidations(QXmlStreamReader &reader);
void readSheetViews(QXmlStreamReader &reader); void loadXmlSheetViews(QXmlStreamReader &reader);
SharedStrings *sharedStrings() const; SharedStrings *sharedStrings() const;

10
tests/auto/worksheet/tst_worksheet.cpp
View File

@ -199,7 +199,7 @@ void WorksheetTest::testReadSheetData()
QXlsx::Worksheet sheet("", 1, 0); QXlsx::Worksheet sheet("", 1, 0);
sheet.d_ptr->sharedStrings()->addSharedString("Hello"); sheet.d_ptr->sharedStrings()->addSharedString("Hello");
sheet.d_ptr->readSheetData(reader); sheet.d_ptr->loadXmlSheetData(reader);
QCOMPARE(sheet.d_ptr->cellTable.size(), 2); QCOMPARE(sheet.d_ptr->cellTable.size(), 2);
@ -239,7 +239,7 @@ void WorksheetTest::testReadColsInfo()
reader.readNextStartElement();//current node is cols reader.readNextStartElement();//current node is cols
QXlsx::Worksheet sheet("", 1, 0); QXlsx::Worksheet sheet("", 1, 0);
sheet.d_ptr->readColumnsInfo(reader); sheet.d_ptr->loadXmlColumnsInfo(reader);
QCOMPARE(sheet.d_ptr->colsInfo.size(), 1); QCOMPARE(sheet.d_ptr->colsInfo.size(), 1);
QCOMPARE(sheet.d_ptr->colsInfo[9]->width, 5.0); QCOMPARE(sheet.d_ptr->colsInfo[9]->width, 5.0);
@ -259,7 +259,7 @@ void WorksheetTest::testReadRowsInfo()
reader.readNextStartElement();//current node is sheetData reader.readNextStartElement();//current node is sheetData
QXlsx::Worksheet sheet("", 1, 0); QXlsx::Worksheet sheet("", 1, 0);
sheet.d_ptr->readSheetData(reader); sheet.d_ptr->loadXmlSheetData(reader);
QCOMPARE(sheet.d_ptr->rowsInfo.size(), 1); QCOMPARE(sheet.d_ptr->rowsInfo.size(), 1);
QCOMPARE(sheet.d_ptr->rowsInfo[3]->height, 40.0); QCOMPARE(sheet.d_ptr->rowsInfo[3]->height, 40.0);
@ -273,7 +273,7 @@ void WorksheetTest::testReadMergeCells()
reader.readNextStartElement();//current node is mergeCells reader.readNextStartElement();//current node is mergeCells
QXlsx::Worksheet sheet("", 1, 0); QXlsx::Worksheet sheet("", 1, 0);
sheet.d_ptr->readMergeCells(reader); sheet.d_ptr->loadXmlMergeCells(reader);
QCOMPARE(sheet.d_ptr->merges.size(), 2); QCOMPARE(sheet.d_ptr->merges.size(), 2);
QCOMPARE(sheet.d_ptr->merges[0].toString(), QStringLiteral("B1:B5")); QCOMPARE(sheet.d_ptr->merges[0].toString(), QStringLiteral("B1:B5"));
@ -290,7 +290,7 @@ void WorksheetTest::testReadDataValidations()
reader.readNextStartElement();//current node is dataValidations reader.readNextStartElement();//current node is dataValidations
QXlsx::Worksheet sheet("", 1, 0); QXlsx::Worksheet sheet("", 1, 0);
sheet.d_ptr->readDataValidations(reader); sheet.d_ptr->loadXmlDataValidations(reader);
QCOMPARE(sheet.d_ptr->dataValidationsList.size(), 2); QCOMPARE(sheet.d_ptr->dataValidationsList.size(), 2);
QCOMPARE(sheet.d_ptr->dataValidationsList[0].validationType(), QXlsx::DataValidation::Whole); QCOMPARE(sheet.d_ptr->dataValidationsList[0].validationType(), QXlsx::DataValidation::Whole);

Write Preview
Loading…
Cancel
Save