Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Include variables in glabels project file.

Browse Source
This commit is contained in:
Jim Evins
2019-03-17 22:38:45 -04:00
parent 879092deaa
commit 3a425f932a
8 changed files with 150 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/XmlLabelParser.cpp
+40 -7
View File
@@ -286,6 +286,10 @@ namespace glabels
{
parseMergeNode( child.toElement(), label );
}
else if ( tagName == "Variables" )
{
parseVariablesNode( child.toElement(), label );
}
else if ( tagName == "Data" )
{
/* Handled in pass 1. */
@@ -719,6 +723,42 @@ namespace glabels
}
void
XmlLabelParser::parseVariablesNode( const QDomElement &node, Model* label )
{
for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
{
QString tagName = child.toElement().tagName();
if ( tagName == "Variable" )
{
parseVariableNode( child.toElement(), label );
}
else if ( !child.isComment() )
{
qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
}
}
}
void
XmlLabelParser::parseVariableNode( const QDomElement &node, Model* label )
{
QString typeString = XmlUtil::getStringAttr( node, "type", "string" );
QString name = XmlUtil::getStringAttr( node, "name", "unknown" );
QString value = XmlUtil::getStringAttr( node, "value", "0" );
QString incrementString = XmlUtil::getStringAttr( node, "increment", "never" );
QString stepSize = XmlUtil::getStringAttr( node, "stepSize", "0" );
auto type = Variable::idStringToType( typeString );
auto increment = Variable::idStringToIncrement( incrementString );
Variable v( type, name, value, increment, stepSize );
label->variables()->addVariable( v );
}
void
XmlLabelParser::parseDataNode( const QDomElement &node, DataCache& data )
{
@@ -738,13 +778,6 @@ namespace glabels
}
void
XmlLabelParser::parsePixdataNode( const QDomElement& node, DataCache& data )
{
// TODO, compatibility with glabels-3
}
void
XmlLabelParser::parseFileNode( const QDomElement& node, DataCache& data )
{