[Pspp-cvs] pspp/src data/ChangeLog data/sys-file-reader.c ...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/12/16 22:11:08

Modified files:
        src/data       : ChangeLog sys-file-reader.c sys-file-writer.c 
                         variable.h 
        src/ui/gui     : ChangeLog psppire-var-store.c var-sheet.c 

Log message:
        Don't assume that MEASURE_* and ALIGN_* have the same values found in
        system files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-writer.c?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/variable.h?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-var-store.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&r1=1.11&r2=1.12

Patches:
Index: data/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- data/ChangeLog      16 Dec 2006 03:40:41 -0000      1.90
+++ data/ChangeLog      16 Dec 2006 22:11:08 -0000      1.91
@@ -1,3 +1,15 @@
+Sat Dec 16 14:09:25 2006  Ben Pfaff  <address@hidden>
+
+       * sys-file-reader.c (read_display_parameters): Don't assume that
+       MEASURE_* and ALIGN_* have the same values found in system files.
+
+       * sys-file-writer.c (write_variable_display_parameters): Ditto.
+
+       * variable.h: Change MEASURE_NOMINAL, MEASURE_ORDINAL,
+       MEASURE_SCALE to be 0-based instead of 1-based.  This also fixes
+       the value of n_MEASURES, which was off by 1 (at least from my
+       point of view).
+
 Sat Dec 16 12:17:34 WST 2006 John Darrington <address@hidden>
 
        * dictionary.c dictionary.h vardict.h variable.c: Added optional

Index: data/sys-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- data/sys-file-reader.c      15 Dec 2006 00:16:02 -0000      1.30
+++ data/sys-file-reader.c      16 Dec 2006 22:11:08 -0000      1.31
@@ -813,7 +813,7 @@
       int align = read_int32 (r);
       struct variable *v;
 
-      if (!measure_is_valid (measure) || !alignment_is_valid (align))
+      if (measure < 1 || measure > 3 || align < 0 || align > 2)
         {
           if (!warned)
             sys_warn (r, _("Invalid variable display parameters.  "
@@ -823,9 +823,13 @@
         }
 
       v = dict_get_var (dict, i);
-      var_set_measure (v, measure);
+      var_set_measure (v, (measure == 1 ? MEASURE_NOMINAL
+                           : measure == 2 ? MEASURE_ORDINAL
+                           : MEASURE_SCALE));
       var_set_display_width (v, width);
-      var_set_alignment (v, align);
+      var_set_alignment (v, (align == 0 ? ALIGN_LEFT
+                             : align == 1 ? ALIGN_RIGHT
+                             : ALIGN_CENTRE));
     }
 }
 

Index: data/sys-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-writer.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- data/sys-file-writer.c      15 Dec 2006 00:16:02 -0000      1.20
+++ data/sys-file-writer.c      16 Dec 2006 22:11:08 -0000      1.21
@@ -709,9 +709,13 @@
 
       v = dict_get_var(dict, i);
 
-      params.measure = var_get_measure (v);
+      params.measure = (var_get_measure (v) == MEASURE_NOMINAL ? 1
+                        : var_get_measure (v) == MEASURE_ORDINAL ? 2
+                        : 3);
       params.width = var_get_display_width (v);
-      params.align = var_get_alignment (v);
+      params.align = (var_get_alignment (v) == ALIGN_LEFT ? 0
+                      : var_get_alignment (v) == ALIGN_RIGHT ? 1
+                      : 2);
       
       buf_write (w, &params, sizeof(params));
 

Index: data/variable.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/variable.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- data/variable.h     15 Dec 2006 00:16:02 -0000      1.17
+++ data/variable.h     16 Dec 2006 22:11:08 -0000      1.18
@@ -115,9 +115,9 @@
 /* How data is measured. */
 enum measure
   {
-    MEASURE_NOMINAL = 1,
-    MEASURE_ORDINAL = 2,
-    MEASURE_SCALE = 3,
+    MEASURE_NOMINAL = 0,
+    MEASURE_ORDINAL = 1,
+    MEASURE_SCALE = 2,
     n_MEASURES
   };
 

Index: ui/gui/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ui/gui/ChangeLog    16 Dec 2006 03:40:41 -0000      1.27
+++ ui/gui/ChangeLog    16 Dec 2006 22:11:08 -0000      1.28
@@ -1,3 +1,10 @@
+Sat Dec 16 14:10:43 2006  Ben Pfaff  <address@hidden>
+
+       * psppire-var-store.c (text_for_column): Adjust to account for new
+       values of the MEASURE_* enums.
+
+       * var-sheet.c (change_measure): Ditto.
+
 Sat Dec 16 12:24:35 WST 2006 John Darrington <address@hidden>
 
        * psppire-variable.c psppire-variable.h: Deleted.

Index: ui/gui/psppire-var-store.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/psppire-var-store.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ui/gui/psppire-var-store.c  16 Dec 2006 04:26:43 -0000      1.16
+++ ui/gui/psppire-var-store.c  16 Dec 2006 22:11:08 -0000      1.17
@@ -680,8 +680,8 @@
       {
        const gint measure = var_get_measure (pv);
 
-       g_assert (measure - 1 < n_MEASURES);
-       return g_locale_to_utf8 (gettext (measures[measure - 1]),
+       g_assert (measure < n_MEASURES);
+       return g_locale_to_utf8 (gettext (measures[measure]),
                                 -1, 0, 0, err);
       }
       break;

Index: ui/gui/var-sheet.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ui/gui/var-sheet.c  16 Dec 2006 04:26:43 -0000      1.11
+++ ui/gui/var-sheet.c  16 Dec 2006 22:11:08 -0000      1.12
@@ -160,7 +160,7 @@
 
   if ( active_item < 0 ) return ;
 
-  var_set_measure (pv, active_item + 1);
+  var_set_measure (pv, active_item);
 }