[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[sheet prep 5/6] gui: Strip numerics and strings differently in value_to
From: |
Ben Pfaff |
Subject: |
[sheet prep 5/6] gui: Strip numerics and strings differently in value_to_text(). |
Date: |
Wed, 22 Jun 2011 20:33:14 -0700 |
Otherwise a long string value that only contains a few
characters followed by all spaces is hard to read.
---
src/ui/gui/helper.c | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index f5803d9..09bfe7a 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -47,13 +47,26 @@
#include <gettext.h>
-/* Formats a value according to VAR's print format.
- The returned string must be freed when no longer required. */
+/* Formats a value according to VAR's print format and strips white space
+ appropriately for VAR's type. That is, if VAR is numeric, strips leading
+ white space (because numbers are right-justified within their fields), and
+ if VAR is string, strips trailing white space (because spaces pad out string
+ values on the right).
+
+ Returns an allocated string. The returned string must be freed when no
+ longer required. */
gchar *
value_to_text (union value v, const struct variable *var)
{
- gchar *s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
- return g_strchug (s);
+ gchar *s;
+
+ s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
+ if (var_is_numeric (var))
+ g_strchug (s);
+ else
+ g_strchomp (s);
+
+ return s;
}
--
1.7.2.5
- [sheet prep 0/6] preparatory commits for sheet rewrite, Ben Pfaff, 2011/06/22
- [sheet prep 1/6] gui: Drop 'dict' parameter from text_to_value()., Ben Pfaff, 2011/06/22
- [sheet prep 6/6] gui: Move some formatting functions into PSPP core., Ben Pfaff, 2011/06/22
- [sheet prep 4/6] gui: Eliminate some dependencies on the dictionary., Ben Pfaff, 2011/06/22
- [sheet prep 2/6] gui: Consistently use print format instead of write format., Ben Pfaff, 2011/06/22
- [sheet prep 3/6] gui: Simplify value_to_text() parameters., Ben Pfaff, 2011/06/23
- [sheet prep 5/6] gui: Strip numerics and strings differently in value_to_text().,
Ben Pfaff <=
- Re: [sheet prep 0/6] preparatory commits for sheet rewrite, John Darrington, 2011/06/23