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
+6 -6
View File
@@ -80,22 +80,22 @@ namespace libglabels
}
const QString FrameCd::sizeDescription( const Units* units ) const
const QString FrameCd::sizeDescription( const Units& units ) const
{
if ( units->id() == "in" )
if ( units.id() == "in" )
{
QString dStr = StrUtil::formatFraction( 2 * mR1 * units->unitsPerPoint() );
QString dStr = StrUtil::formatFraction( 2 * mR1 * units.unitsPerPoint() );
return QString().sprintf( "%s %s %s",
qPrintable(dStr),
qPrintable(units->name()),
qPrintable(units.name()),
qPrintable(tr("diameter")) );
}
else
{
return QString().sprintf( "%.5g %s %s",
2 * mR1 * units->unitsPerPoint(),
qPrintable(units->name()),
2 * mR1 * units.unitsPerPoint(),
qPrintable(units.name()),
qPrintable(tr("diameter")) );
}
}