Added initial selection info to NewLabelDialog.

This commit is contained in:
Jim Evins
2013-11-15 00:54:31 -05:00
parent 9dce9addf1
commit 932ab5b65b
13 changed files with 209 additions and 78 deletions
+9 -9
View File
@@ -29,24 +29,24 @@
namespace libglabels
{
const QString &FrameEllipse::sizeDescription( Units *units )
const QString FrameEllipse::sizeDescription( const Units *units ) const
{
if ( units->id() == "in" )
{
QString wStr = StrUtil::formatFraction( mW * units->unitsPerPoint() );
QString hStr = StrUtil::formatFraction( mH * units->unitsPerPoint() );
mSizeDescription = QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
return QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
}
else
{
mSizeDescription = QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
return QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
}
}