[Pspp-cvs] pspp/src/language/dictionary ChangeLog sys-file...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/08/13 04:36:47

Modified files:
        src/language/dictionary: ChangeLog sys-file-info.c 

Log message:
        Output variable measurement level, alignment, and display width as
        part of DISPLAY DICTIONARY and SYSFILE INFO output.  Bug #13019.
        Reviewed by John Darrington.
        * sys-file-info.c (cmd_sysfile_info): Allow space for new rows of
        info in output.
        (display_variables): Ditto.
        (describe_variable): Output variable measurement level, alignment,
        and display width as part of DISPLAY DICTIONARY and SYSFILE INFO
        output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/ChangeLog?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/sys-file-info.c?cvsroot=pspp&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ChangeLog   7 Jun 2007 06:42:02 -0000       1.11
+++ ChangeLog   13 Aug 2007 04:36:47 -0000      1.12
@@ -1,3 +1,15 @@
+2007-08-12  Ben Pfaff  <address@hidden>
+
+       Output variable measurement level, alignment, and display width as
+       part of DISPLAY DICTIONARY and SYSFILE INFO output.  Bug #13019.
+       Reviewed by John Darrington.
+       * sys-file-info.c (cmd_sysfile_info): Allow space for new rows of
+       info in output.
+       (display_variables): Ditto.
+       (describe_variable): Output variable measurement level, alignment,
+       and display width as part of DISPLAY DICTIONARY and SYSFILE INFO
+       output.
+
 2007-06-06  Ben Pfaff  <address@hidden>
 
        Adapt case sources, sinks, and clients of procedure code to the

Index: sys-file-info.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/sys-file-info.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- sys-file-info.c     24 Jul 2007 05:33:43 -0000      1.28
+++ sys-file-info.c     13 Aug 2007 04:36:47 -0000      1.29
@@ -166,7 +166,7 @@
       struct variable *v = dict_get_var (d, i);
       const int nvl = val_labs_count (var_get_value_labels (v));
 
-      if (r + 10 + nvl > nr)
+      if (r + 13 + nvl > nr)
        {
          nr = MAX (nr * dict_get_var_cnt (d) / (i + 1), nr);
          nr += 10 + nvl;
@@ -407,7 +407,7 @@
        {
          int nvl = val_labs_count (var_get_value_labels (v));
 
-         if (r + 10 + nvl > nr)
+         if (r + 13 + nvl > nr)
            {
              nr = MAX (nr * n / (i + 1), nr);
              nr += 10 + nvl;
@@ -455,6 +455,8 @@
 {
   const struct fmt_spec *print = var_get_print_format (v);
   const struct fmt_spec *write = var_get_write_format (v);
+  enum measure m = var_get_measure (v);
+  enum alignment a = var_get_alignment (v);
 
   /* Put the name, var label, and position into the first row. */
   tab_text (t, 0, r, TAB_LEFT, var_get_name (v));
@@ -485,6 +487,23 @@
       r++;
     }
 
+  /* Measurement level, display width, alignment. */
+  tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
+                  _("Measure: %s"),
+                  m == MEASURE_NOMINAL ? _("Nominal")
+                  : m == MEASURE_ORDINAL ? _("Ordinal")
+                  : _("Scale"));
+  r++;
+  tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
+                  _("Display Alignment: %s"),
+                  a == ALIGN_LEFT ? _("Left")
+                  : a == ALIGN_CENTRE ? _("Centre")
+                  : _("Right"));
+  r++;
+  tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
+                  _("Display Width: %d"), var_get_display_width (v));
+  r++;
+
   /* Missing values if any. */
   if (var_has_missing_values (v))
     {