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

Make use of XlsxColor for ConditionalFormatting

Browse Source
This commit is contained in:
Debao Zhang
2013-11-28 23:58:55 +08:00
parent 88aaad9e02
commit b375444368
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxconditionalformatting.cpp
+10 -26
View File
@@ -69,22 +69,6 @@ void ConditionalFormattingPrivate::writeCfVo(const XlsxCfVoData &cfvo, QXmlStrea
writer.writeAttribute(QStringLiteral("gte"), QStringLiteral("0")); writer.writeAttribute(QStringLiteral("gte"), QStringLiteral("0"));
} }
void ConditionalFormattingPrivate::writeColor(const QColor &color, QXmlStreamWriter &writer) const
{
writer.writeStartElement(QStringLiteral("color"));
if (color.isValid()) {
writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+color.name().mid(1)); //remove #
// } else if (!themeColor.isEmpty()) {
// QStringList themes = themeColor.split(QLatin1Char(':'));
// writer.writeAttribute(QStringLiteral("theme"), themes[0]);
// if (!themes[1].isEmpty())
// writer.writeAttribute(QStringLiteral("tint"), themes[1]);
} else {
writer.writeAttribute(QStringLiteral("auto"), QStringLiteral("1"));
}
writer.writeEndElement();//color
}
/*! /*!
* \class ConditionalFormatting * \class ConditionalFormatting
* \brief Conditional formatting for single cell or ranges * \brief Conditional formatting for single cell or ranges
@@ -323,7 +307,7 @@ bool ConditionalFormatting::addDataBarRule(const QColor &color, ValueObjectType
QSharedPointer<XlsxCfRuleData> cfRule(new XlsxCfRuleData); QSharedPointer<XlsxCfRuleData> cfRule(new XlsxCfRuleData);
cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("dataBar"); cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("dataBar");
cfRule->attrs[XlsxCfRuleData::A_color1] = color; cfRule->attrs[XlsxCfRuleData::A_color1] = XlsxColor(color);
if (stopIfTrue) if (stopIfTrue)
cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true; cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true;
if (!showData) if (!showData)
@@ -360,8 +344,8 @@ bool ConditionalFormatting::add2ColorScaleRule(const QColor &minColor, const QCo
QSharedPointer<XlsxCfRuleData> cfRule(new XlsxCfRuleData); QSharedPointer<XlsxCfRuleData> cfRule(new XlsxCfRuleData);
cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("colorScale"); cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("colorScale");
cfRule->attrs[XlsxCfRuleData::A_color1] = minColor; cfRule->attrs[XlsxCfRuleData::A_color1] = XlsxColor(minColor);
cfRule->attrs[XlsxCfRuleData::A_color2] = maxColor; cfRule->attrs[XlsxCfRuleData::A_color2] = XlsxColor(maxColor);
if (stopIfTrue) if (stopIfTrue)
cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true; cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true;
@@ -389,9 +373,9 @@ bool ConditionalFormatting::add3ColorScaleRule(const QColor &minColor, const QCo
QSharedPointer<XlsxCfRuleData> cfRule(new XlsxCfRuleData); QSharedPointer<XlsxCfRuleData> cfRule(new XlsxCfRuleData);
cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("colorScale"); cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("colorScale");
cfRule->attrs[XlsxCfRuleData::A_color1] = minColor; cfRule->attrs[XlsxCfRuleData::A_color1] = XlsxColor(minColor);
cfRule->attrs[XlsxCfRuleData::A_color2] = midColor; cfRule->attrs[XlsxCfRuleData::A_color2] = XlsxColor(midColor);
cfRule->attrs[XlsxCfRuleData::A_color3] = maxColor; cfRule->attrs[XlsxCfRuleData::A_color3] = XlsxColor(maxColor);
if (stopIfTrue) if (stopIfTrue)
cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true; cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true;
@@ -508,7 +492,7 @@ bool ConditionalFormatting::saveToXml(QXmlStreamWriter &writer) const
writer.writeAttribute(QStringLiteral("showValue"), QStringLiteral("0")); writer.writeAttribute(QStringLiteral("showValue"), QStringLiteral("0"));
d->writeCfVo(rule->attrs[XlsxCfRuleData::A_cfvo1].value<XlsxCfVoData>(), writer); d->writeCfVo(rule->attrs[XlsxCfRuleData::A_cfvo1].value<XlsxCfVoData>(), writer);
d->writeCfVo(rule->attrs[XlsxCfRuleData::A_cfvo2].value<XlsxCfVoData>(), writer); d->writeCfVo(rule->attrs[XlsxCfRuleData::A_cfvo2].value<XlsxCfVoData>(), writer);
d->writeColor(rule->attrs[XlsxCfRuleData::A_color1].value<QColor>(), writer); rule->attrs[XlsxCfRuleData::A_color1].value<XlsxColor>().saveToXml(writer);
writer.writeEndElement();//dataBar writer.writeEndElement();//dataBar
} else if (rule->attrs[XlsxCfRuleData::A_type] == QLatin1String("colorScale")) { } else if (rule->attrs[XlsxCfRuleData::A_type] == QLatin1String("colorScale")) {
writer.writeStartElement(QStringLiteral("colorScale")); writer.writeStartElement(QStringLiteral("colorScale"));
@@ -517,10 +501,10 @@ bool ConditionalFormatting::saveToXml(QXmlStreamWriter &writer) const
if (rule->attrs.contains(XlsxCfRuleData::A_cfvo3)) if (rule->attrs.contains(XlsxCfRuleData::A_cfvo3))
d->writeCfVo(rule->attrs[XlsxCfRuleData::A_cfvo3].value<XlsxCfVoData>(), writer); d->writeCfVo(rule->attrs[XlsxCfRuleData::A_cfvo3].value<XlsxCfVoData>(), writer);
d->writeColor(rule->attrs[XlsxCfRuleData::A_color1].value<QColor>(), writer); rule->attrs[XlsxCfRuleData::A_color1].value<XlsxColor>().saveToXml(writer);
d->writeColor(rule->attrs[XlsxCfRuleData::A_color2].value<QColor>(), writer); rule->attrs[XlsxCfRuleData::A_color2].value<XlsxColor>().saveToXml(writer);
if (rule->attrs.contains(XlsxCfRuleData::A_color3)) if (rule->attrs.contains(XlsxCfRuleData::A_color3))
d->writeColor(rule->attrs[XlsxCfRuleData::A_color3].value<QColor>(), writer); rule->attrs[XlsxCfRuleData::A_color3].value<XlsxColor>().saveToXml(writer);
writer.writeEndElement();//colorScale writer.writeEndElement();//colorScale
} }
src/xlsx/xlsxconditionalformatting_p.h
+1 -1
View File
@@ -39,6 +39,7 @@
#include "xlsxConditionalFormatting.h" #include "xlsxConditionalFormatting.h"
#include "xlsxformat.h" #include "xlsxformat.h"
#include "xlsxcolor_p.h"
#include <QSharedData> #include <QSharedData>
#include <QSharedPointer> #include <QSharedPointer>
#include <QMap> #include <QMap>
@@ -115,7 +116,6 @@ public:
~ConditionalFormattingPrivate(); ~ConditionalFormattingPrivate();
void writeCfVo(const XlsxCfVoData& cfvo, QXmlStreamWriter &writer) const; void writeCfVo(const XlsxCfVoData& cfvo, QXmlStreamWriter &writer) const;
void writeColor(const QColor &color, QXmlStreamWriter &writer) const;
QList<QSharedPointer<XlsxCfRuleData> >cfRules; QList<QSharedPointer<XlsxCfRuleData> >cfRules;
QList<CellRange> ranges; QList<CellRange> ranges;