IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-08-08 12:08:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't round values that will be displayed as expressions. Save some space in fractional displays by, for example, showing "1 + 1/8" instead of "1 + 1 / 8". Simplify fractional display of values less than 1 by, for example, showing "1/3" instead of "0 + 1 / 3".

Browse Source 
BP


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17457 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Charles Day
2008-08-07 19:40:15 +00:00
parent eb29fc8e6d
commit 5dd0c682ed
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app-utils/gnc-ui-util.c
+20 -14
View File
@@ -1260,6 +1260,7 @@ PrintAmountInternal(char *buf, gnc_numeric val, const GNCPrintAmountInfo *info)
char temp_buf[128];
gnc_numeric whole, rounding;
int min_dp, max_dp;
gboolean value_is_decimal;
g_return_val_if_fail (info != NULL, 0);
@@ -1273,6 +1274,9 @@ PrintAmountInternal(char *buf, gnc_numeric val, const GNCPrintAmountInfo *info)
/* print the absolute value */
val = gnc_numeric_abs (val);
/* Try to print as decimal. */
value_is_decimal = gnc_numeric_to_decimal(&val, NULL);
/* Force at least auto_decimal_places zeros */
if (auto_decimal_enabled) {
min_dp = MAX(auto_decimal_places, info->min_decimal_places);
@@ -1288,7 +1292,7 @@ PrintAmountInternal(char *buf, gnc_numeric val, const GNCPrintAmountInfo *info)
max_dp = 99;
/* rounding? -- can only ROUND if force_fit is also true */
if (info->round && info->force_fit) {
if (value_is_decimal && info->round && info->force_fit) {
rounding.num = 5; /* Limit the denom to 10^13 ~= 2^44, leaving max at ~524288 */
rounding.denom = pow(10, max_dp + 1);
val = gnc_numeric_add(val, rounding, GNC_DENOM_AUTO, GNC_DENOM_LCD);
@@ -1382,22 +1386,24 @@ PrintAmountInternal(char *buf, gnc_numeric val, const GNCPrintAmountInfo *info)
/* at this point, buf contains the whole part of the number */
/* If it's not decimal, print the fraction as an expression */
if (!gnc_numeric_to_decimal(&val, NULL))
/* If it's not decimal, print the fraction as an expression. */
if (!value_is_decimal)
{
if (!gnc_numeric_zero_p (val))
{
val = gnc_numeric_reduce (val);
val = gnc_numeric_reduce (val);
if (val.denom > 0)
sprintf (temp_buf, " + %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT,
val.num, val.denom);
else
sprintf (temp_buf, " + %" G_GINT64_FORMAT " * %" G_GINT64_FORMAT,
val.num, -val.denom);
if (val.denom > 0)
sprintf (temp_buf, "%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
val.num, val.denom);
else
sprintf (temp_buf, "%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT,
val.num, -val.denom);
strcat (buf, temp_buf);
}
if (whole.num == 0)
*buf = '\0';
else
strcat(buf, " + ");
strcat (buf, temp_buf);
}
else
{