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

Initial parsing of glabels files.

Browse Source
This commit is contained in:
Jim Evins
2014-09-25 22:56:24 -04:00
parent b318efd68e
commit 3d9875545c
15 changed files with 671 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libglabels/XmlCategoryParser.cpp
+2 -2
View File
@@ -92,8 +92,8 @@ namespace libglabels
void XmlCategoryParser::parseCategoryNode( const QDomElement &node )
{
QString id = XmlUtil::getAttr( node, "id", "" );
QString name = XmlUtil::getAttrI18n( node, "name", "" );
QString id = XmlUtil::getStringAttr( node, "id", "" );
QString name = XmlUtil::getI18nAttr( node, "name", "" );
Category *category = new Category( id, name );
if ( category != NULL )
libglabels/XmlPaperParser.cpp
+5 -5
View File
@@ -92,13 +92,13 @@ namespace libglabels
void XmlPaperParser::parsePaperSizeNode( const QDomElement &node )
{
QString id = XmlUtil::getAttr( node, "id", "" );
QString name = XmlUtil::getAttrI18n( node, "name", "" );
QString id = XmlUtil::getStringAttr( node, "id", "" );
QString name = XmlUtil::getI18nAttr( node, "name", "" );
double width = XmlUtil::getAttrLength( node, "width", 0 );
double height = XmlUtil::getAttrLength( node, "height", 0 );
double width = XmlUtil::getLengthAttr( node, "width", 0 );
double height = XmlUtil::getLengthAttr( node, "height", 0 );
QString pwgSize = XmlUtil::getAttr( node, "pwg_size", "" );
QString pwgSize = XmlUtil::getStringAttr( node, "pwg_size", "" );
Paper *paper = new Paper( id, name, width, height, pwgSize );
if ( paper != NULL )
libglabels/XmlTemplateParser.cpp
+53 -53
View File
@@ -106,13 +106,13 @@ namespace libglabels
Template *XmlTemplateParser::parseTemplateNode( const QDomElement &node )
{
QString brand = XmlUtil::getAttr( node, "brand", "" );
QString part = XmlUtil::getAttr( node, "part", "" );
QString brand = XmlUtil::getStringAttr( node, "brand", "" );
QString part = XmlUtil::getStringAttr( node, "part", "" );
if ( (brand == "") || (part == "") )
{
// Try the deprecated "name" attribute.
QString name = XmlUtil::getAttr( node, "name", "" );
QString name = XmlUtil::getStringAttr( node, "name", "" );
if ( name != "" )
{
QStringList fields = name.split( " " );
@@ -129,7 +129,7 @@ namespace libglabels
Template *tmplate = NULL;
QString equivPart = XmlUtil::getAttr( node, "equiv", "" );
QString equivPart = XmlUtil::getStringAttr( node, "equiv", "" );
if ( equivPart != NULL )
{
tmplate = Template::fromEquiv( brand, part, equivPart );
@@ -150,8 +150,8 @@ namespace libglabels
}
else
{
QString description = XmlUtil::getAttrI18n( node, "description", "" );
QString paperId = XmlUtil::getAttr( node, "size", "" );
QString description = XmlUtil::getI18nAttr( node, "description", "" );
QString paperId = XmlUtil::getStringAttr( node, "size", "" );
if ( !Db::isPaperIdOther( paperId ) )
{
@@ -167,8 +167,8 @@ namespace libglabels
}
else
{
double width = XmlUtil::getAttrLength( node, "width", 0 );
double height = XmlUtil::getAttrLength( node, "height", 0 );
double width = XmlUtil::getLengthAttr( node, "width", 0 );
double height = XmlUtil::getLengthAttr( node, "height", 0 );
tmplate = new Template( brand, part, description, paperId, width, height );
}
@@ -210,13 +210,13 @@ namespace libglabels
void XmlTemplateParser::parseMetaNode( const QDomElement &node, Template *tmplate )
{
QString productUrl = XmlUtil::getAttr( node, "product_url", "" );
QString productUrl = XmlUtil::getStringAttr( node, "product_url", "" );
if ( productUrl != "" )
{
tmplate->setProductUrl( productUrl );
}
QString categoryId = XmlUtil::getAttr( node, "category", "" );
QString categoryId = XmlUtil::getStringAttr( node, "category", "" );
if ( categoryId != "" )
{
tmplate->addCategory( categoryId );
@@ -226,15 +226,15 @@ namespace libglabels
void XmlTemplateParser::parseLabelRectangleNode( const QDomElement &node, Template *tmplate )
{
QString id = XmlUtil::getAttr( node, "id", "0" );
QString id = XmlUtil::getStringAttr( node, "id", "0" );
double w = XmlUtil::getAttrLength( node, "width", 0 );
double h = XmlUtil::getAttrLength( node, "height", 0 );
double r = XmlUtil::getAttrLength( node, "round", 0 );
double w = XmlUtil::getLengthAttr( node, "width", 0 );
double h = XmlUtil::getLengthAttr( node, "height", 0 );
double r = XmlUtil::getLengthAttr( node, "round", 0 );
double xWaste, yWaste;
double waste = XmlUtil::getAttrLength( node, "waste", -1 );
double waste = XmlUtil::getLengthAttr( node, "waste", -1 );
if ( waste >= 0 )
{
xWaste = waste;
@@ -242,8 +242,8 @@ namespace libglabels
}
else
{
xWaste = XmlUtil::getAttrLength( node, "x_waste", 0 );
yWaste = XmlUtil::getAttrLength( node, "y_waste", 0 );
xWaste = XmlUtil::getLengthAttr( node, "x_waste", 0 );
yWaste = XmlUtil::getLengthAttr( node, "y_waste", 0 );
}
Frame *frame = new FrameRect( w, h, r, xWaste, yWaste, id );
@@ -256,11 +256,11 @@ namespace libglabels
void XmlTemplateParser::parseLabelEllipseNode( const QDomElement &node, Template *tmplate )
{
QString id = XmlUtil::getAttr( node, "id", "0" );
QString id = XmlUtil::getStringAttr( node, "id", "0" );
double w = XmlUtil::getAttrLength( node, "width", 0 );
double h = XmlUtil::getAttrLength( node, "height", 0 );
double waste = XmlUtil::getAttrLength( node, "waste", -1 );
double w = XmlUtil::getLengthAttr( node, "width", 0 );
double h = XmlUtil::getLengthAttr( node, "height", 0 );
double waste = XmlUtil::getLengthAttr( node, "waste", -1 );
Frame *frame = new FrameEllipse( w, h, waste, id );
@@ -272,10 +272,10 @@ namespace libglabels
void XmlTemplateParser::parseLabelRoundNode( const QDomElement &node, Template *tmplate )
{
QString id = XmlUtil::getAttr( node, "id", "0" );
QString id = XmlUtil::getStringAttr( node, "id", "0" );
double r = XmlUtil::getAttrLength( node, "radius", 0 );
double waste = XmlUtil::getAttrLength( node, "waste", -1 );
double r = XmlUtil::getLengthAttr( node, "radius", 0 );
double waste = XmlUtil::getLengthAttr( node, "waste", -1 );
Frame *frame = new FrameRound( r, waste, id );
@@ -287,13 +287,13 @@ namespace libglabels
void XmlTemplateParser::parseLabelCdNode( const QDomElement &node, Template *tmplate )
{
QString id = XmlUtil::getAttr( node, "id", "0" );
QString id = XmlUtil::getStringAttr( node, "id", "0" );
double r1 = XmlUtil::getAttrLength( node, "radius", 0 );
double r2 = XmlUtil::getAttrLength( node, "hole", 0 );
double w = XmlUtil::getAttrLength( node, "width", 0 );
double h = XmlUtil::getAttrLength( node, "height", 0 );
double waste = XmlUtil::getAttrLength( node, "waste", -1 );
double r1 = XmlUtil::getLengthAttr( node, "radius", 0 );
double r2 = XmlUtil::getLengthAttr( node, "hole", 0 );
double w = XmlUtil::getLengthAttr( node, "width", 0 );
double h = XmlUtil::getLengthAttr( node, "height", 0 );
double waste = XmlUtil::getLengthAttr( node, "waste", -1 );
Frame *frame = new FrameCd( r1, r2, w, h, waste, id );
@@ -343,14 +343,14 @@ namespace libglabels
void XmlTemplateParser::parseLayoutNode( const QDomElement &node, Frame *frame )
{
int nX = XmlUtil::getAttr( node, "nx", 1 );
int nY = XmlUtil::getAttr( node, "ny", 1 );
int nX = XmlUtil::getIntAttr( node, "nx", 1 );
int nY = XmlUtil::getIntAttr( node, "ny", 1 );
double x0 = XmlUtil::getAttrLength( node, "x0", 0 );
double y0 = XmlUtil::getAttrLength( node, "y0", 0 );
double x0 = XmlUtil::getLengthAttr( node, "x0", 0 );
double y0 = XmlUtil::getLengthAttr( node, "y0", 0 );
double dX = XmlUtil::getAttrLength( node, "dx", 0 );
double dY = XmlUtil::getAttrLength( node, "dy", 0 );
double dX = XmlUtil::getLengthAttr( node, "dx", 0 );
double dY = XmlUtil::getLengthAttr( node, "dy", 0 );
frame->addLayout( new Layout( nX, nY, x0, y0, dX, dY ) );
}
@@ -358,7 +358,7 @@ namespace libglabels
void XmlTemplateParser::parseMarkupMarginNode( const QDomElement &node, Frame *frame )
{
double size = XmlUtil::getAttrLength( node, "size", 0 );
double size = XmlUtil::getLengthAttr( node, "size", 0 );
frame->addMarkup( new MarkupMargin( size ) );
}
@@ -366,10 +366,10 @@ namespace libglabels
void XmlTemplateParser::parseMarkupLineNode( const QDomElement &node, Frame *frame )
{
double x1 = XmlUtil::getAttrLength( node, "x1", 0 );
double y1 = XmlUtil::getAttrLength( node, "y1", 0 );
double x2 = XmlUtil::getAttrLength( node, "x2", 0 );
double y2 = XmlUtil::getAttrLength( node, "y2", 0 );
double x1 = XmlUtil::getLengthAttr( node, "x1", 0 );
double y1 = XmlUtil::getLengthAttr( node, "y1", 0 );
double x2 = XmlUtil::getLengthAttr( node, "x2", 0 );
double y2 = XmlUtil::getLengthAttr( node, "y2", 0 );
frame->addMarkup( new MarkupLine( x1, y1, x2, y2 ) );
}
@@ -377,9 +377,9 @@ namespace libglabels
void XmlTemplateParser::parseMarkupCircleNode( const QDomElement &node, Frame *frame )
{
double x0 = XmlUtil::getAttrLength( node, "x0", 0 );
double y0 = XmlUtil::getAttrLength( node, "y0", 0 );
double r = XmlUtil::getAttrLength( node, "radius", 0 );
double x0 = XmlUtil::getLengthAttr( node, "x0", 0 );
double y0 = XmlUtil::getLengthAttr( node, "y0", 0 );
double r = XmlUtil::getLengthAttr( node, "radius", 0 );
frame->addMarkup( new MarkupCircle( x0, y0, r ) );
}
@@ -387,11 +387,11 @@ namespace libglabels
void XmlTemplateParser::parseMarkupRectNode( const QDomElement &node, Frame *frame )
{
double x1 = XmlUtil::getAttrLength( node, "x1", 0 );
double y1 = XmlUtil::getAttrLength( node, "y1", 0 );
double w = XmlUtil::getAttrLength( node, "w", 0 );
double h = XmlUtil::getAttrLength( node, "h", 0 );
double r = XmlUtil::getAttrLength( node, "r", 0 );
double x1 = XmlUtil::getLengthAttr( node, "x1", 0 );
double y1 = XmlUtil::getLengthAttr( node, "y1", 0 );
double w = XmlUtil::getLengthAttr( node, "w", 0 );
double h = XmlUtil::getLengthAttr( node, "h", 0 );
double r = XmlUtil::getLengthAttr( node, "r", 0 );
frame->addMarkup( new MarkupRect( x1, y1, w, h, r ) );
}
@@ -399,10 +399,10 @@ namespace libglabels
void XmlTemplateParser::parseMarkupEllipseNode( const QDomElement &node, Frame *frame )
{
double x1 = XmlUtil::getAttrLength( node, "x1", 0 );
double y1 = XmlUtil::getAttrLength( node, "y1", 0 );
double w = XmlUtil::getAttrLength( node, "w", 0 );
double h = XmlUtil::getAttrLength( node, "h", 0 );
double x1 = XmlUtil::getLengthAttr( node, "x1", 0 );
double y1 = XmlUtil::getLengthAttr( node, "y1", 0 );
double w = XmlUtil::getLengthAttr( node, "w", 0 );
double h = XmlUtil::getLengthAttr( node, "h", 0 );
frame->addMarkup( new MarkupEllipse( x1, y1, w, h ) );
}
libglabels/XmlUtil.cpp
+42 -28
View File
@@ -30,25 +30,23 @@ namespace libglabels
Units *XmlUtil::mDefaultUnits;
QString XmlUtil::getAttr( const QDomElement &node, const QString &name, const char *default_value )
{
return node.attribute( name, QString(default_value) );
}
QString XmlUtil::getAttr( const QDomElement &node, const QString &name, const QString &default_value )
QString XmlUtil::getStringAttr( const QDomElement& node,
const QString& name,
const QString& default_value )
{
return node.attribute( name, default_value );
}
double XmlUtil::getAttr( const QDomElement &node, const QString &name, double default_value )
double XmlUtil::getDoubleAttr( const QDomElement& node,
const QString& name,
double default_value )
{
QString valueString = node.attribute( name, "" );
if ( valueString != "" )
{
bool ok;
double value = valueString.toDouble( &ok );
double value = valueString.toDouble(& ok );
if ( !ok )
{
@@ -66,7 +64,9 @@ namespace libglabels
}
bool XmlUtil::getAttr( const QDomElement &node, const QString &name, bool default_value )
bool XmlUtil::getBoolAttr( const QDomElement& node,
const QString& name,
bool default_value )
{
QString valueString = node.attribute( name, "" );
if ( valueString != "" )
@@ -100,13 +100,15 @@ namespace libglabels
}
int XmlUtil::getAttr( const QDomElement &node, const QString &name, int default_value )
int XmlUtil::getIntAttr( const QDomElement& node,
const QString& name,
int default_value )
{
QString valueString = node.attribute( name, "" );
if ( valueString != "" )
{
bool ok;
int value = valueString.toInt( &ok );
int value = valueString.toInt(& ok );
if ( !ok )
{
@@ -124,14 +126,16 @@ namespace libglabels
}
uint32_t XmlUtil::getAttr( const QDomElement &node, const QString &name, uint32_t default_value )
uint32_t XmlUtil::getUIntAttr( const QDomElement& node,
const QString& name,
uint32_t default_value )
{
QString valueString = node.attribute( name, "" );
if ( valueString != "" )
{
// TODO: Does base-0 do what we want? I.e. use base determined by format e.g. "0xff"
bool ok;
uint32_t value = valueString.toInt( &ok, 0 );
uint32_t value = valueString.toInt(& ok, 0 );
if ( !ok )
{
@@ -149,7 +153,9 @@ namespace libglabels
}
QString XmlUtil::getAttrI18n( const QDomElement &node, const QString &name, const QString &default_value )
QString XmlUtil::getI18nAttr( const QDomElement& node,
const QString& name,
const QString& default_value )
{
// TODO: are translations done in a compatable way, so that we can use "_name" attributes?
QString i18nString = node.attribute( QString("_").append(name), "" );
@@ -163,7 +169,9 @@ namespace libglabels
}
double XmlUtil::getAttrLength( const QDomElement &node, const QString &name, double default_value )
double XmlUtil::getLengthAttr( const QDomElement& node,
const QString& name,
double default_value )
{
QString valueString = node.attribute( name, "" );
if ( valueString != "" )
@@ -192,43 +200,49 @@ namespace libglabels
}
void XmlUtil::setAttr( const QDomElement &node, const QString &name, const char *value )
void XmlUtil::setStringAttr( const QDomElement& node,
const QString& name,
const QString& value )
{
// TODO
}
void XmlUtil::setAttr( const QDomElement &node, const QString &name, const QString &value )
void XmlUtil::setDoubleAttr( const QDomElement& node,
const QString& name,
double value )
{
// TODO
}
void XmlUtil::setAttr( const QDomElement &node, const QString &name, double value )
void XmlUtil::setBoolAttr( const QDomElement& node,
const QString& name,
bool value )
{
// TODO
}
void XmlUtil::setAttr( const QDomElement &node, const QString &name, bool value )
void XmlUtil::setIntAttr( const QDomElement& node,
const QString& name,
int value )
{
// TODO
}
void XmlUtil::setAttr( const QDomElement &node, const QString &name, int value )
void XmlUtil::setUIntAttr( const QDomElement& node,
const QString& name,
uint32_t value )
{
// TODO
}
void XmlUtil::setAttr( const QDomElement &node, const QString &name, uint32_t value )
{
// TODO
}
void XmlUtil::setAttrLength( const QDomElement &node, const QString &name, double value )
void XmlUtil::setLengthAttr( const QDomElement& node,
const QString& name,
double value )
{
// TODO
}
libglabels/XmlUtil.h
+53 -16
View File
@@ -47,26 +47,63 @@ namespace libglabels
}
static const Units *defaultUnits() { return mDefaultUnits; }
static void setDefaultUnits( Units *defaultUnits ) { mDefaultUnits = defaultUnits; }
static QString getAttr( const QDomElement &node, const QString &name, const char *default_value );
static QString getAttr( const QDomElement &node, const QString &name, const QString &default_value );
static double getAttr( const QDomElement &node, const QString &name, double default_value );
static bool getAttr( const QDomElement &node, const QString &name, bool default_value );
static int getAttr( const QDomElement &node, const QString &name, int default_value );
static uint32_t getAttr( const QDomElement &node, const QString &name, uint32_t default_value );
static void setDefaultUnits( Units *defaultUnits )
{
mDefaultUnits = defaultUnits;
}
static QString getAttrI18n( const QDomElement &node, const QString &name, const QString &default_value );
static double getAttrLength( const QDomElement &node, const QString &name, double default_value );
static QString getStringAttr( const QDomElement& node,
const QString& name,
const QString& default_value );
static void setAttr( const QDomElement &node, const QString &name, const char *value );
static void setAttr( const QDomElement &node, const QString &name, const QString &value );
static void setAttr( const QDomElement &node, const QString &name, double value );
static void setAttr( const QDomElement &node, const QString &name, bool value );
static void setAttr( const QDomElement &node, const QString &name, int value );
static void setAttr( const QDomElement &node, const QString &name, uint32_t value );
static double getDoubleAttr( const QDomElement& node,
const QString& name,
double default_value );
static void setAttrLength( const QDomElement &node, const QString &name, double value );
static bool getBoolAttr( const QDomElement& node,
const QString& name,
bool default_value );
static int getIntAttr( const QDomElement& node,
const QString& name,
int default_value );
static uint32_t getUIntAttr( const QDomElement& node,
const QString& name,
uint32_t default_value );
static QString getI18nAttr( const QDomElement& node,
const QString& name,
const QString& default_value );
static double getLengthAttr( const QDomElement& node,
const QString& name,
double default_value );
static void setStringAttr( const QDomElement& node,
const QString& name,
const QString& value );
static void setDoubleAttr( const QDomElement& node,
const QString& name,
double value );
static void setBoolAttr( const QDomElement& node,
const QString& name,
bool value );
static void setIntAttr( const QDomElement& node,
const QString& name,
int value );
static void setUIntAttr( const QDomElement& node,
const QString& name,
uint32_t value );
static void setLengthAttr( const QDomElement& node,
const QString& name,
double value );
private:
static Units *mDefaultUnits;
libglabels/XmlVendorParser.cpp
+2 -2
View File
@@ -92,8 +92,8 @@ namespace libglabels
void XmlVendorParser::parseVendorNode( const QDomElement &node )
{
QString name = XmlUtil::getAttr( node, "name", "" );
QString url = XmlUtil::getAttr( node, "url", "" );
QString name = XmlUtil::getStringAttr( node, "name", "" );
QString url = XmlUtil::getStringAttr( node, "url", "" );
Vendor *vendor = new Vendor( name, url );
if ( vendor != NULL )