Fix label parsing and creation issues.

- Parse rotate attribute of Objects node.
- Create proper page size when creating template.
This commit is contained in:
Jim Evins
2017-04-22 00:14:51 -04:00
parent 42b1744901
commit 02630aec19
3 changed files with 10 additions and 1 deletions
+8
View File
@@ -262,6 +262,7 @@ namespace glabels
} }
else if ( tagName == "Objects" ) else if ( tagName == "Objects" )
{ {
label->setRotate( parseRotateAttr( child.toElement() ) );
QList<LabelModelObject*> list = parseObjectsNode( child.toElement(), data ); QList<LabelModelObject*> list = parseObjectsNode( child.toElement(), data );
foreach ( LabelModelObject* object, list ) foreach ( LabelModelObject* object, list )
{ {
@@ -541,6 +542,13 @@ namespace glabels
} }
bool
XmlLabelParser::parseRotateAttr( const QDomElement &node )
{
return XmlUtil::getBoolAttr( node, "rotate", false );
}
void void
XmlLabelParser::parsePositionAttrs( const QDomElement &node, LabelModelObject* object ) XmlLabelParser::parsePositionAttrs( const QDomElement &node, LabelModelObject* object )
{ {
+1
View File
@@ -64,6 +64,7 @@ namespace glabels
static LabelModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node ); static LabelModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
static LabelModelTextObject* parseObjectTextNode( const QDomElement &node ); static LabelModelTextObject* parseObjectTextNode( const QDomElement &node );
static QString parsePNode( 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 parsePositionAttrs( const QDomElement &node, LabelModelObject* object );
static void parseSizeAttrs( const QDomElement &node, LabelModelObject* object ); static void parseSizeAttrs( const QDomElement &node, LabelModelObject* object );
static void parseLineAttrs( const QDomElement &node, LabelModelObject* object ); static void parseLineAttrs( const QDomElement &node, LabelModelObject* object );
+1 -1
View File
@@ -87,7 +87,7 @@ namespace glabels
if ( tmplate->isSizeOther() ) if ( tmplate->isSizeOther() )
{ {
XmlUtil::setLengthAttr( node, "width", tmplate->pageWidth() ); XmlUtil::setLengthAttr( node, "width", tmplate->pageWidth() );
XmlUtil::setLengthAttr( node, "height", tmplate->pageWidth() ); XmlUtil::setLengthAttr( node, "height", tmplate->pageHeight() );
} }