X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=c0fc42a2f285a87ff32a5da5a9e3d1595990a621;hb=51cf173b5eaaa8c5cc6233f9c8924eb44498e89d;hp=d0322204e413da1bb97de98c48203c6d1d76ad59;hpb=17ca35e4ca8abf4ba0c0ae82920b985fa17648cf;p=pspp

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index d0322204e4..c0fc42a2f2 100644
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -42,7 +42,6 @@
 
 #include <math/sort.h>
 
-#include "xalloc.h"
 #include "xmalloca.h"
 
 #include "value-variant.h"
@@ -130,11 +129,22 @@ __iter_nth_child (GtkTreeModel *tree_model,
   return TRUE;
 }
 
+/* Set the contents of OUT to reflect the information provided by IN, COL, and
+   ROW, for MODEL.  Returns TRUE if successful. */
 gboolean
-myreversefunc (GtkTreeModel *model, gint col, gint row,
-	       const gchar *in, GValue *out)
+psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row,
+				    const gchar *in, GValue *out)
 {
-  PsppireDataStore *store  = PSPPIRE_DATA_STORE (model);
+  PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+
+  while (col >= psppire_dict_get_var_cnt (store->dict))
+    {
+      const struct variable *var =
+	psppire_dict_insert_variable (store->dict,
+				      psppire_dict_get_var_cnt (store->dict),
+				      NULL);
+      g_return_val_if_fail (var, FALSE);
+    }
 
   const struct variable *variable = psppire_dict_get_variable (store->dict, col);
   g_return_val_if_fail (variable, FALSE);
@@ -145,9 +155,20 @@ myreversefunc (GtkTreeModel *model, gint col, gint row,
 
   union value val;
   value_init (&val, width);
-  char *xx =
-    data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
-	     fmt->type, &val, width, "UTF-8");
+  const struct val_labs *value_labels = var_get_value_labels (variable);
+  const union value *vp = NULL;
+  if (value_labels)
+    {
+      vp = val_labs_find_value (value_labels, in);
+      if (vp)
+	value_copy (&val, vp, width);
+    }
+  char *xx = NULL;
+  if (vp == NULL)
+    {
+      xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
+		    fmt->type, &val, width, "UTF-8");
+    }
 
   GVariant *vrnt = value_variant_new (&val, width);
   value_destroy (&val, width);
@@ -161,8 +182,12 @@ myreversefunc (GtkTreeModel *model, gint col, gint row,
 static char *
 unlabeled_value (PsppireDataStore *store, const struct variable *variable, const union value *val)
 {
+  if (var_is_numeric (variable) &&
+      var_is_value_missing (variable, val, MV_SYSTEM))
+    return g_strdup ("");
+
   const struct fmt_spec *fmt = var_get_print_format (variable);
-  return data_out (val, psppire_dict_encoding (store->dict),  fmt);
+  return value_to_text__ (*val, fmt, psppire_dict_encoding (store->dict));
 }
 
 gchar *
@@ -172,6 +197,8 @@ psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gi
   g_return_val_if_fail (variable, g_strdup ("???"));
 
   GVariant *vrnt = g_value_get_variant (v);
+  g_return_val_if_fail (vrnt, g_strdup ("???"));
+
   union value val;
   value_variant_get (&val, vrnt);
 
@@ -220,12 +247,14 @@ __get_value (GtkTreeModel *tree_model,
   if (NULL == variable)
     return;
 
-  g_value_init (value, G_TYPE_VARIANT);
-
   gint row = GPOINTER_TO_INT (iter->user_data);
 
   struct ccase *cc = datasheet_get_row (store->datasheet, row);
 
+  g_return_if_fail (cc);
+
+  g_value_init (value, G_TYPE_VARIANT);
+
   const union value *val = case_data_idx (cc, var_get_case_index (variable));
 
   GVariant *vv = value_variant_new (val, var_get_width (variable));
@@ -363,6 +392,8 @@ static void
 psppire_data_store_delete_value (PsppireDataStore *store, gint case_index)
 {
   g_return_if_fail (store->datasheet);
+  g_return_if_fail (case_index < datasheet_get_n_columns (store->datasheet));
+
   datasheet_delete_columns (store->datasheet, case_index, 1);
   datasheet_insert_column (store->datasheet, NULL, -1, case_index);
 }
@@ -463,7 +494,7 @@ psppire_data_store_set_reader (PsppireDataStore *ds,
 {
   gint i;
   gint old_n = 0;
-  if ( ds->datasheet)
+  if (ds->datasheet)
     {
       old_n = datasheet_get_n_rows (ds->datasheet);
       datasheet_destroy (ds->datasheet);
@@ -473,10 +504,10 @@ psppire_data_store_set_reader (PsppireDataStore *ds,
 
   gint new_n = datasheet_get_n_rows (ds->datasheet);
 
-  if ( ds->dict )
-    for (i = 0 ; i < n_dict_signals; ++i )
+  if (ds->dict)
+    for (i = 0 ; i < n_dict_signals; ++i)
       {
-	if ( ds->dict_handler_id [i] > 0)
+	if (ds->dict_handler_id [i] > 0)
 	  {
 	    g_signal_handler_unblock (ds->dict,
 				      ds->dict_handler_id[i]);
@@ -501,8 +532,8 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di
   int i;
 
   /* Disconnect any existing handlers */
-  if ( data_store->dict )
-    for (i = 0 ; i < n_dict_signals; ++i )
+  if (data_store->dict)
+    for (i = 0 ; i < n_dict_signals; ++i)
       {
 	g_signal_handler_disconnect (data_store->dict,
 				     data_store->dict_handler_id[i]);
@@ -510,7 +541,7 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di
 
   data_store->dict = dict;
 
-  if ( dict != NULL)
+  if (dict != NULL)
     {
 
       data_store->dict_handler_id [VARIABLE_INSERTED] =
@@ -533,10 +564,10 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di
 
   /* The entire model has changed */
 
-  if ( data_store->dict )
-    for (i = 0 ; i < n_dict_signals; ++i )
+  if (data_store->dict)
+    for (i = 0 ; i < n_dict_signals; ++i)
       {
-	if ( data_store->dict_handler_id [i] > 0)
+	if (data_store->dict_handler_id [i] > 0)
 	  {
 	    g_signal_handler_block (data_store->dict,
 				    data_store->dict_handler_id[i]);
@@ -714,8 +745,8 @@ psppire_data_store_get_reader (PsppireDataStore *ds)
   int i;
   struct casereader *reader ;
 
-  if ( ds->dict )
-    for (i = 0 ; i < n_dict_signals; ++i )
+  if (ds->dict)
+    for (i = 0 ; i < n_dict_signals; ++i)
       {
 	g_signal_handler_block (ds->dict,
 				ds->dict_handler_id[i]);
@@ -776,7 +807,7 @@ psppire_data_store_insert_case (PsppireDataStore *ds,
   cc = case_ref (cc);
   result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
 
-  if ( result )
+  if (result)
     {
       g_signal_emit (ds, signals[ITEMS_CHANGED], 0, posn, 0, 1);
     }
@@ -801,7 +832,7 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum,
   g_return_val_if_fail (ds->datasheet, FALSE);
 
   n_cases = psppire_data_store_get_case_count (ds);
-  if ( casenum > n_cases)
+  if (casenum > n_cases)
     return FALSE;
 
   if (casenum == n_cases)
@@ -867,7 +898,7 @@ psppire_data_store_insert_value (PsppireDataStore *ds,
 
   g_assert (width >= 0);
 
-  if ( ! ds->datasheet )
+  if (! ds->datasheet)
     ds->datasheet = datasheet_create (NULL);
 
   value_init (&value, width);
@@ -888,20 +919,20 @@ psppire_data_store_filtered (PsppireDataStore *ds,
   const struct dictionary *dict;
   const struct variable *filter;
 
-  if ( row < 0 || row >= datasheet_get_n_rows (ds->datasheet))
+  if (row < 0 || row >= datasheet_get_n_rows (ds->datasheet))
     return FALSE;
 
   dict = ds->dict->dict;
   g_return_val_if_fail (dict, FALSE);
   filter = dict_get_filter (dict);
-  if ( ! filter)
+  if (! filter)
     return FALSE;
 
   g_return_val_if_fail (var_is_numeric (filter), FALSE);
   value_init (&val, 0);
-  if ( ! datasheet_get_value (ds->datasheet, row,
+  if (! datasheet_get_value (ds->datasheet, row,
                               var_get_case_index (filter),
-                              &val) )
+                              &val))
     return FALSE;
 
   return (val.f == 0.0);