PropertiesView and View now follow Settings::units.

This commit is contained in:
Jim Evins
2016-04-14 23:10:38 -04:00
parent 2f7f4b2041
commit 783ede0a03
28 changed files with 559 additions and 258 deletions
+4 -4
View File
@@ -62,22 +62,22 @@ namespace glabels
}
const QString FrameRound::sizeDescription( Distance::Units units ) const
const QString FrameRound::sizeDescription( const Units& units ) const
{
if ( units == Distance::Units::IN )
if ( units.toEnum() == Units::IN )
{
QString dStr = StrUtil::formatFraction( 2 * mR.in() );
return QString().sprintf( "%s %s %s",
qPrintable(dStr),
qPrintable(Distance::toTrName(units)),
qPrintable(units.toTrName()),
qPrintable(tr("diameter")) );
}
else
{
return QString().sprintf( "%.5g %s %s",
2 * mR.inUnits(units),
qPrintable(Distance::toTrName(units)),
qPrintable(units.toTrName()),
qPrintable(tr("diameter")) );
}
}