python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-01-11 12:28:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex 2016-06-29 21:38:32 +03:00
commit 826e62abe0
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/lrvariablesholder.cpp
View File

@ -59,7 +59,7 @@ void VariablesHolder::addVariable(const QString& name, const QVariant& value, Va
varValue->setVarType(type); varValue->setVarType(type);
varValue->setRenderPass(pass); varValue->setRenderPass(pass);
m_varNames.insert(name,varValue); m_varNames.insert(name,varValue);
if (type==VarDesc::User) if (type==VarDesc::Report)
m_userVariables.append(varValue); m_userVariables.append(varValue);
} else { } else {
throw ReportError(tr("variable with name ")+name+tr(" already exists !!")); throw ReportError(tr("variable with name ")+name+tr(" already exists !!"));

20
limereport/serializators/lrxmlbasetypesserializators.cpp
View File

@ -76,6 +76,10 @@ LimeReport::SerializatorIntf* createQByteArraySerializator(QDomDocument *doc, QD
return new LimeReport::XmlQByteArraySerializator(doc,node); return new LimeReport::XmlQByteArraySerializator(doc,node);
} }
LimeReport::SerializatorIntf* createQVariantSerializator(QDomDocument *doc, QDomElement *node){
return new LimeReport::XmlQVariantSerializator(doc,node);
}
bool registredQString = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QString", createQStringSerializator); bool registredQString = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QString", createQStringSerializator);
bool registredInt = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("int", createIntSerializator); bool registredInt = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("int", createIntSerializator);
bool registredEnumAndFlags = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("enumAndFlags",createEnumAndFlagsSerializator); bool registredEnumAndFlags = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("enumAndFlags",createEnumAndFlagsSerializator);
@ -87,6 +91,7 @@ bool registredQReal = LimeReport::XMLAbstractSerializatorFactory::instance().reg
bool registerDouble = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("double", createQRealSerializator); bool registerDouble = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("double", createQRealSerializator);
bool registerQColor = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QColor", createQColorSerializator); bool registerQColor = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QColor", createQColorSerializator);
bool registerQByteArray = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QByteArray", createQByteArraySerializator); bool registerQByteArray = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QByteArray", createQByteArraySerializator);
bool registerQVariant = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QVariant", createQVariantSerializator);
} }
@ -275,6 +280,21 @@ QVariant XmlQByteArraySerializator::loadValue()
return QByteArray::fromBase64(ba); return QByteArray::fromBase64(ba);
} }
void XmlQVariantSerializator::save(const QVariant &value, QString name)
{
QDomElement _node = doc()->createElement(name);
_node.setAttribute("Type","QVariant");
_node.setAttribute("Value",QString(value.toByteArray().toBase64()));
node()->appendChild(_node);
}
QVariant XmlQVariantSerializator::loadValue()
{
QByteArray ba;
ba.append(node()->attribute("Value").toLatin1());
return QByteArray::fromBase64(ba);
}
} }

9
limereport/serializators/lrxmlbasetypesserializators.h
View File

@ -137,5 +137,14 @@ private:
virtual QVariant loadValue(); virtual QVariant loadValue();
}; };
class XmlQVariantSerializator : public XmlBaseSerializator
{
public:
XmlQVariantSerializator(QDomDocument *doc, QDomElement *node):XmlBaseSerializator(doc,node){}
private:
virtual void save(const QVariant &value, QString name);
virtual QVariant loadValue();
};
} }
#endif // LRXMLBASETYPESSERIALIZATORS_H #endif // LRXMLBASETYPESSERIALIZATORS_H

13
limereport/serializators/lrxmlwriter.cpp
View File

@ -125,8 +125,13 @@ QDomElement XMLWriter::putQObjectItem(QString name, QObject *item)
void XMLWriter::saveProperty(QString name, QObject* item, QDomElement *node) void XMLWriter::saveProperty(QString name, QObject* item, QDomElement *node)
{ {
CreateSerializator creator=0; QString typeName;
if (name.compare("itemIndexMethod")==0)
typeName = item->metaObject()->property(item->metaObject()->indexOfProperty(name.toLatin1())).typeName();
else
typeName = item->property(name.toLatin1()).typeName();
CreateSerializator creator=0;
if (isCollection(name,item)) { saveCollection(name,item,node); return;} if (isCollection(name,item)) { saveCollection(name,item,node); return;}
if (isQObject(name,item)) { if (isQObject(name,item)) {
if (qvariant_cast<QObject *>(item->property(name.toLatin1()))) if (qvariant_cast<QObject *>(item->property(name.toLatin1())))
@ -143,12 +148,10 @@ void XMLWriter::saveProperty(QString name, QObject* item, QDomElement *node)
); );
else else
try { try {
creator=XMLAbstractSerializatorFactory::instance().objectCreator( creator=XMLAbstractSerializatorFactory::instance().objectCreator(typeName);
item->metaObject()->property(item->metaObject()->indexOfProperty(name.toLatin1())).typeName()
);
} catch (LimeReport::ReportError &exception){ } catch (LimeReport::ReportError &exception){
qDebug()<<"class name ="<<item->metaObject()->className() qDebug()<<"class name ="<<item->metaObject()->className()
<<"property name="<<name<<" property type="<<item->property(name.toLatin1()).typeName() <<"property name="<<name<<" property type="<<typeName
<<exception.what(); <<exception.what();
} }