diff --git a/glabels/XmlLabelParser.cpp b/glabels/XmlLabelParser.cpp index abca531..00c7162 100644 --- a/glabels/XmlLabelParser.cpp +++ b/glabels/XmlLabelParser.cpp @@ -262,6 +262,7 @@ namespace glabels } else if ( tagName == "Objects" ) { + label->setRotate( parseRotateAttr( child.toElement() ) ); QList list = parseObjectsNode( child.toElement(), data ); foreach ( LabelModelObject* object, list ) { @@ -541,6 +542,13 @@ namespace glabels } + bool + XmlLabelParser::parseRotateAttr( const QDomElement &node ) + { + return XmlUtil::getBoolAttr( node, "rotate", false ); + } + + void XmlLabelParser::parsePositionAttrs( const QDomElement &node, LabelModelObject* object ) { diff --git a/glabels/XmlLabelParser.h b/glabels/XmlLabelParser.h index 3de2c25..7a18c00 100644 --- a/glabels/XmlLabelParser.h +++ b/glabels/XmlLabelParser.h @@ -64,6 +64,7 @@ namespace glabels static LabelModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node ); static LabelModelTextObject* parseObjectTextNode( const QDomElement &node ); static QString parsePNode( const QDomElement &node ); + static bool parseRotateAttr( const QDomElement &node ); static void parsePositionAttrs( const QDomElement &node, LabelModelObject* object ); static void parseSizeAttrs( const QDomElement &node, LabelModelObject* object ); static void parseLineAttrs( const QDomElement &node, LabelModelObject* object ); diff --git a/glabels/XmlTemplateCreator.cpp b/glabels/XmlTemplateCreator.cpp index 7d312a0..1ec23aa 100644 --- a/glabels/XmlTemplateCreator.cpp +++ b/glabels/XmlTemplateCreator.cpp @@ -87,7 +87,7 @@ namespace glabels if ( tmplate->isSizeOther() ) { XmlUtil::setLengthAttr( node, "width", tmplate->pageWidth() ); - XmlUtil::setLengthAttr( node, "height", tmplate->pageWidth() ); + XmlUtil::setLengthAttr( node, "height", tmplate->pageHeight() ); }