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,9 +62,9 @@ namespace glabels
}
const QString FrameEllipse::sizeDescription( Distance::Units units ) const
const QString FrameEllipse::sizeDescription( const Units& units ) const
{
if ( units == Distance::Units::IN )
if ( units.toEnum() == Units::IN )
{
QString wStr = StrUtil::formatFraction( mW.in() );
QString hStr = StrUtil::formatFraction( mH.in() );
@@ -72,14 +72,14 @@ namespace glabels
return QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(Distance::toTrName(units)) );
qPrintable(units.toTrName()) );
}
else
{
return QString().sprintf( "%.5g x %.5g %s",
mW.inUnits(units),
mH.inUnits(units),
qPrintable(Distance::toTrName(units)) );
qPrintable(units.toTrName()) );
}
}