Fleshed out remainder of XmlUtil. Units cleanup.

This commit is contained in:
Jim Evins
2015-08-27 00:30:54 -04:00
parent 38450ebb2d
commit 000c7f69e5
13 changed files with 113 additions and 139 deletions
+8 -8
View File
@@ -59,24 +59,24 @@ namespace libglabels
}
const QString FrameEllipse::sizeDescription( const Units* units ) const
const QString FrameEllipse::sizeDescription( const Units& units ) const
{
if ( units->id() == "in" )
if ( units.id() == "in" )
{
QString wStr = StrUtil::formatFraction( mW * units->unitsPerPoint() );
QString hStr = StrUtil::formatFraction( mH * units->unitsPerPoint() );
QString wStr = StrUtil::formatFraction( mW * units.unitsPerPoint() );
QString hStr = StrUtil::formatFraction( mH * units.unitsPerPoint() );
return QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
qPrintable(units.name()) );
}
else
{
return QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
mW * units.unitsPerPoint(),
mH * units.unitsPerPoint(),
qPrintable(units.name()) );
}
}