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

Refactor Cell::Number ==> Cell::Numeric

Browse Source
This commit is contained in:
Debao Zhang
2013-10-24 09:40:30 +08:00
parent 9abf395332
commit 98b6e83004
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxcell.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
enum DataType { enum DataType {
Blank, Blank,
String, String,
Number, Numeric,
Formula, Formula,
Boolean, Boolean,
Error Error
src/xlsx/xlsxworksheet.cpp
+6 -6
View File
@@ -303,7 +303,7 @@ int Worksheet::write(int row, int column, const QVariant &value, Format *format)
//Don't convert string to number if the flag not enabled. //Don't convert string to number if the flag not enabled.
ret = writeString(row, column, value.toString(), format); ret = writeString(row, column, value.toString(), format);
} else { } else {
ret = writeNumber(row, column, value.toDouble(), format); ret = writeNumeric(row, column, value.toDouble(), format);
} }
} else if (value.type() == QMetaType::QUrl) { //url } else if (value.type() == QMetaType::QUrl) { //url
ret = writeUrl(row, column, value.toUrl(), format); ret = writeUrl(row, column, value.toUrl(), format);
@@ -378,13 +378,13 @@ int Worksheet::writeString(int row, int column, const QString &value, Format *fo
return error; return error;
} }
int Worksheet::writeNumber(int row, int column, double value, Format *format) int Worksheet::writeNumeric(int row, int column, double value, Format *format)
{ {
Q_D(Worksheet); Q_D(Worksheet);
if (d->checkDimensions(row, column)) if (d->checkDimensions(row, column))
return -1; return -1;
d->cellTable[row][column] = QSharedPointer<Cell>(new Cell(value, Cell::Number, format)); d->cellTable[row][column] = QSharedPointer<Cell>(new Cell(value, Cell::Numeric, format));
d->workbook->styles()->addFormat(format); d->workbook->styles()->addFormat(format);
return 0; return 0;
} }
@@ -446,7 +446,7 @@ int Worksheet::writeDateTime(int row, int column, const QDateTime &dt, Format *f
double value = datetimeToNumber(dt, d->workbook->isDate1904()); double value = datetimeToNumber(dt, d->workbook->isDate1904());
d->cellTable[row][column] = QSharedPointer<Cell>(new Cell(value, Cell::Number, format)); d->cellTable[row][column] = QSharedPointer<Cell>(new Cell(value, Cell::Numeric, format));
d->workbook->styles()->addFormat(format); d->workbook->styles()->addFormat(format);
return 0; return 0;
@@ -742,7 +742,7 @@ void WorksheetPrivate::writeCellData(XmlStreamWriter &writer, int row, int col,
//cell->data: Index of the string in sharedStringTable //cell->data: Index of the string in sharedStringTable
writer.writeAttribute(QStringLiteral("t"), QStringLiteral("s")); writer.writeAttribute(QStringLiteral("t"), QStringLiteral("s"));
writer.writeTextElement(QStringLiteral("v"), cell->value().toString()); writer.writeTextElement(QStringLiteral("v"), cell->value().toString());
} else if (cell->dataType() == Cell::Number){ } else if (cell->dataType() == Cell::Numeric){
double value = cell->value().toDouble(); double value = cell->value().toDouble();
writer.writeTextElement(QStringLiteral("v"), QString::number(value, 'g', 15)); writer.writeTextElement(QStringLiteral("v"), QString::number(value, 'g', 15));
} else if (cell->dataType() == Cell::Formula) { } else if (cell->dataType() == Cell::Formula) {
@@ -1145,7 +1145,7 @@ void WorksheetPrivate::readSheetData(XmlStreamReader &reader)
reader.readNextStartElement(); reader.readNextStartElement();
if (reader.name() == QLatin1String("v")) { if (reader.name() == QLatin1String("v")) {
QString value = reader.readElementText(); QString value = reader.readElementText();
Cell *data = new Cell(value ,Cell::Number, format); Cell *data = new Cell(value ,Cell::Numeric, format);
cellTable[pos.x()][pos.y()] = QSharedPointer<Cell>(data); cellTable[pos.x()][pos.y()] = QSharedPointer<Cell>(data);
} }
} }
src/xlsx/xlsxworksheet.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
int write(const QString row_column, const QVariant &value, Format *format=0); int write(const QString row_column, const QVariant &value, Format *format=0);
int write(int row, int column, const QVariant &value, Format *format=0); int write(int row, int column, const QVariant &value, Format *format=0);
int writeString(int row, int column, const QString &value, Format *format=0); int writeString(int row, int column, const QString &value, Format *format=0);
int writeNumber(int row, int column, double value, Format *format=0); int writeNumeric(int row, int column, double value, Format *format=0);
int writeFormula(int row, int column, const QString &formula, Format *format=0, double result=0); int writeFormula(int row, int column, const QString &formula, Format *format=0, double result=0);
int writeBlank(int row, int column, Format *format=0); int writeBlank(int row, int column, Format *format=0);
int writeBool(int row, int column, bool value, Format *format=0); int writeBool(int row, int column, bool value, Format *format=0);