mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-23 10:57:27 +03:00
Code Activity

New scale method has been added

Browse Source
This commit is contained in:
fralx
2020-04-27 11:52:25 +03:00
parent e623978281
commit 318af3b221
40 changed files with 558 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
limereport/objectinspector/propertyItems/lrmarginpropitem.cpp
View File

@@ -39,7 +39,7 @@ QString MarginPropItem::displayValue() const
return QString("%1 %2").arg(propertyValue().toDouble(), 0, 'f', 2)
.arg(QObject::tr("mm"));
case LimeReport::BaseDesignIntf::Inches:
return QString("%1 %2").arg((propertyValue().toDouble() * Const::mmFACTOR) / (item->unitFactor() * 10), 0, 'f', 2)
return QString("%1 %2").arg((propertyValue().toDouble() * item->ppm()) / (item->unitFactor() * 10), 0, 'f', 2)
.arg(QObject::tr("''"));
}
}
@@ -72,7 +72,7 @@ qreal MarginPropItem::valueInUnits(qreal value) const
case LimeReport::BaseDesignIntf::Millimeters:
return value;
case LimeReport::BaseDesignIntf::Inches:
return (value * Const::mmFACTOR) / (item->unitFactor() * 10);
return (value * item->ppm()) / (item->unitFactor() * 10);
}
}
@@ -83,8 +83,7 @@ qreal MarginPropItem::valueInReportUnits(qreal value) const
case LimeReport::BaseDesignIntf::Millimeters:
return value;
case LimeReport::BaseDesignIntf::Inches:
return (value * (item->unitFactor() * 10)) / Const::mmFACTOR;
return (value * (item->unitFactor() * 10)) / item->ppm();
}
}