Conform to GNU nomenclature.

[pspp] / src / ui / gui / psppire-data-store.c

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index c0843b1a6729496ee445c954c72b3da3055c4436..b1f23bad2a26ee455e4619a2cae56ed18d440b8a 100644 (file)
--- 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);
@@ -172,6 +182,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 +232,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));
@@ -463,7 +477,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 +487,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 +515,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 +524,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 +547,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 +728,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 +790,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 +815,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)
@@ -810,7 +824,10 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum,
   ok = datasheet_put_value (ds->datasheet, casenum, var_get_case_index (var),
                             v);
   if (ok)
-    g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
+    {
+      g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
+      g_signal_emit (ds, signals [ITEMS_CHANGED], 0, casenum, 1, 1);
+    }
 
   return ok;
 }
@@ -864,7 +881,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);
@@ -885,20 +902,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);