X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=36d1af78b7569fe2527aec97911972e34c80f4df;hb=775941da1289c0c3de3895e61cc6e787c6591686;hp=c7d94cee81dc66270f74ea61176da0b7f96cdb3e;hpb=d908f52b818f4fdf2ab23797756812ec2986bd2b;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index c7d94cee..36d1af78 100644
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -1,11 +1,9 @@
-/* psppire-data-store.c
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2006, 2008  Free Software Foundation
 
-   PSPPIRE --- A Graphical User Interface for PSPP
-   Copyright (C) 2006  Free Software Foundation
-
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <string.h>
@@ -25,62 +21,62 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#include <data/casewriter.h>
 #include <data/datasheet.h>
 #include <data/data-out.h>
 #include <data/variable.h>
 
-#include <gtksheet/gtksheet.h>
 #include <gtksheet/gsheetmodel.h>
-#include <gtksheet/gsheet-column-iface.h>
 
 #include <pango/pango-context.h>
 
 #include "psppire-data-store.h"
-#include "psppire-case-file.h"
 #include "helper.h"
 
 #include <data/dictionary.h>
 #include <data/missing-values.h>
 #include <data/value-labels.h>
 #include <data/data-in.h>
+#include <data/format.h>
 
-#include <data/file-handle-def.h>
-#include <data/sys-file-writer.h>
-
+#include <math/sort.h>
 
+#include "xalloc.h"
+#include "xmalloca.h"
 
 static void psppire_data_store_init            (PsppireDataStore      *data_store);
 static void psppire_data_store_class_init      (PsppireDataStoreClass *class);
 static void psppire_data_store_sheet_model_init (GSheetModelIface *iface);
-static void psppire_data_store_sheet_column_init (GSheetColumnIface *iface);
-static void psppire_data_store_sheet_row_init (GSheetRowIface *iface);
 
 static void psppire_data_store_finalize        (GObject           *object);
+static void psppire_data_store_dispose        (GObject           *object);
 
-static gchar *psppire_data_store_get_string (const GSheetModel *sheet_model, gint row, gint column);
+static gboolean psppire_data_store_clear_datum (GSheetModel *model,
+					  glong row, glong column);
 
-static gboolean psppire_data_store_set_string (GSheetModel *model,
-					  const gchar *text, gint row, gint column);
 
-static gboolean psppire_data_store_clear_datum (GSheetModel *model,
-					  gint row, gint column);
+static gboolean psppire_data_store_insert_case (PsppireDataStore *ds,
+						struct ccase *cc,
+						casenumber posn);
 
 
-#define MIN_COLUMNS 10
+static gboolean psppire_data_store_data_in (PsppireDataStore *ds,
+					    casenumber casenum, gint idx,
+					    struct substring input,
+					    const struct fmt_spec *fmt);
+
 
-#define TRAILING_ROWS 10
 
 static GObjectClass *parent_class = NULL;
 
 
-enum  {FONT_CHANGED,
+enum  {
+       BACKEND_CHANGED,
        n_SIGNALS};
 
 static guint signals [n_SIGNALS];
 
 
-inline GType
+GType
 psppire_data_store_get_type (void)
 {
   static GType data_store_type = 0;
@@ -107,20 +103,6 @@ psppire_data_store_get_type (void)
 	NULL
       };
 
-      static const GInterfaceInfo sheet_column_info =
-      {
-	(GInterfaceInitFunc) psppire_data_store_sheet_column_init,
-	NULL,
-	NULL
-      };
-
-      static const GInterfaceInfo sheet_row_info =
-      {
-	(GInterfaceInitFunc) psppire_data_store_sheet_row_init,
-	NULL,
-	NULL
-      };
-
 
       data_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDataStore",
 						&data_store_info, 0);
@@ -129,13 +111,6 @@ psppire_data_store_get_type (void)
 				   G_TYPE_SHEET_MODEL,
 				   &sheet_model_info);
 
-      g_type_add_interface_static (data_store_type,
-				   G_TYPE_SHEET_COLUMN,
-				   &sheet_column_info);
-
-      g_type_add_interface_static (data_store_type,
-				   G_TYPE_SHEET_ROW,
-				   &sheet_row_info);
     }
 
   return data_store_type;
@@ -151,9 +126,10 @@ psppire_data_store_class_init (PsppireDataStoreClass *class)
   object_class = (GObjectClass*) class;
 
   object_class->finalize = psppire_data_store_finalize;
+  object_class->dispose = psppire_data_store_dispose;
 
-  signals [FONT_CHANGED] =
-    g_signal_new ("font_changed",
+  signals [BACKEND_CHANGED] =
+    g_signal_new ("backend-changed",
 		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
 		  0,
@@ -165,7 +141,24 @@ psppire_data_store_class_init (PsppireDataStoreClass *class)
 
 
 
-static gint
+static gboolean
+psppire_data_store_insert_values (PsppireDataStore *ds,
+				  gint n_values, gint where);
+
+static union value *
+psppire_data_store_get_value (const PsppireDataStore *ds,
+			      casenumber casenum, size_t idx,
+			      union value *value, int width);
+
+
+static gboolean
+psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum,
+			      gint idx, union value *v, gint width);
+
+
+
+
+static glong
 psppire_data_store_get_var_count (const GSheetModel *model)
 {
   const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
@@ -173,59 +166,87 @@ psppire_data_store_get_var_count (const GSheetModel *model)
   return psppire_dict_get_var_cnt (store->dict);
 }
 
-static gint
-psppire_data_store_get_case_count (const GSheetModel *model)
+casenumber
+psppire_data_store_get_case_count (const PsppireDataStore *store)
 {
-  const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+  return datasheet_get_row_cnt (store->datasheet);
+}
 
-  return psppire_case_file_get_case_count (store->case_file);
+size_t
+psppire_data_store_get_value_count (const PsppireDataStore *store)
+{
+  return psppire_dict_get_value_cnt (store->dict);
 }
 
+casenumber
+psppire_data_store_get_case_count_wrapper (const GSheetModel *model)
+{
+  const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+  return psppire_data_store_get_case_count (store);
+}
 
 static void
 psppire_data_store_init (PsppireDataStore *data_store)
 {
   data_store->dict = 0;
-  data_store->case_file = 0;
-  data_store->width_of_m = 10;
+  data_store->datasheet = NULL;
+  data_store->dispose_has_run = FALSE;
 }
 
-const PangoFontDescription *
-psppire_data_store_get_font_desc (const GSheetModel *model,
-			      gint row, gint column)
+static inline gchar *
+psppire_data_store_get_string_wrapper (const GSheetModel *model, glong row,
+				       glong column)
 {
-  PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+  return psppire_data_store_get_string (PSPPIRE_DATA_STORE (model), row, column);
+}
 
-  return store->font_desc;
+
+static inline gboolean
+psppire_data_store_set_string_wrapper (GSheetModel *model,
+				       const gchar *text,
+				       glong row, glong column)
+{
+  return psppire_data_store_set_string (PSPPIRE_DATA_STORE (model), text,
+					row, column);
 }
 
 
+
+static gchar * get_column_subtitle (const GSheetModel *model, gint col);
+static gchar * get_column_button_label (const GSheetModel *model, gint col);
+static gboolean get_column_sensitivity (const GSheetModel *model, gint col);
+static GtkJustification get_column_justification (const GSheetModel *model, gint col);
+
+static gchar * get_row_button_label (const GSheetModel *model, gint row);
+static gboolean get_row_sensitivity (const GSheetModel *model, gint row);
+
+
 static void
 psppire_data_store_sheet_model_init (GSheetModelIface *iface)
 {
   iface->free_strings = TRUE;
-  iface->get_string = psppire_data_store_get_string;
-  iface->set_string = psppire_data_store_set_string;
+  iface->get_string = psppire_data_store_get_string_wrapper;
+  iface->set_string = psppire_data_store_set_string_wrapper;
   iface->clear_datum = psppire_data_store_clear_datum;
   iface->is_editable = NULL;
-  iface->is_visible = NULL;
   iface->get_foreground = NULL;
   iface->get_background = NULL;
-  iface->get_font_desc = psppire_data_store_get_font_desc;
   iface->get_cell_border = NULL;
   iface->get_column_count = psppire_data_store_get_var_count;
-  iface->get_row_count = psppire_data_store_get_case_count;
-}
+  iface->get_row_count = psppire_data_store_get_case_count_wrapper;
 
-static
-gboolean always_true ()
-{
-  return TRUE;
-}
+  iface->get_column_subtitle = get_column_subtitle;
+  iface->get_column_title = get_column_button_label;
+  iface->get_column_sensitivity = get_column_sensitivity;
+  iface->get_column_justification = get_column_justification;
 
+  iface->get_row_title = get_row_button_label;
+  iface->get_row_sensitivity = get_row_sensitivity;
+}
 
 static void
-delete_cases_callback (GtkWidget *w, gint first, gint n_cases, gpointer data)
+delete_cases_callback (GtkWidget *w,
+	 casenumber first, casenumber n_cases, gpointer data)
 {
   PsppireDataStore *store  ;
 
@@ -240,17 +261,17 @@ delete_cases_callback (GtkWidget *w, gint first, gint n_cases, gpointer data)
 
 
 static void
-insert_case_callback (GtkWidget *w, gint casenum, gpointer data)
+insert_case_callback (GtkWidget *w, casenumber casenum, gpointer data)
 {
-  PsppireDataStore *store  ;
+  PsppireDataStore *store  = PSPPIRE_DATA_STORE (data);
 
   g_return_if_fail (data);
 
-  store  = PSPPIRE_DATA_STORE (data);
+  g_print ("%s\n", __FUNCTION__);
 
   g_sheet_model_range_changed (G_SHEET_MODEL (store),
 			       casenum, -1,
-			       psppire_case_file_get_case_count (store->case_file),
+			       psppire_data_store_get_case_count (store),
 			       -1);
 
   g_sheet_model_rows_inserted (G_SHEET_MODEL (store), casenum, 1);
@@ -271,31 +292,31 @@ changed_case_callback (GtkWidget *w, gint casenum, gpointer data)
 }
 
 
+/*
+   A callback which occurs after a variable has been deleted.
+ */
 static void
-delete_variables_callback (GObject *obj, gint var_num, gint n_vars, gpointer data)
+delete_variable_callback (GObject *obj, gint dict_index,
+			  gint case_index, gint val_cnt,
+			  gpointer data)
 {
-  PsppireDataStore *store ;
-
-  g_return_if_fail (data);
-
-  store  = PSPPIRE_DATA_STORE (data);
+  PsppireDataStore *store  = PSPPIRE_DATA_STORE (data);
 
-  g_sheet_model_columns_deleted (G_SHEET_MODEL (store), var_num, n_vars);
+#if AXIS_TRANSITION
+  g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1);
 
   g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
-				   var_num, -1);
+				   dict_index, -1);
+#endif
 }
 
 
 static void
 variable_changed_callback (GObject *obj, gint var_num, gpointer data)
 {
-  PsppireDataStore *store;
-
-  g_return_if_fail (data);
-
-  store  = PSPPIRE_DATA_STORE (data);
+  PsppireDataStore *store  = PSPPIRE_DATA_STORE (data);
 
+#if AXIS_TRANSITION
   g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
 				  var_num, 1);
 
@@ -303,6 +324,7 @@ variable_changed_callback (GObject *obj, gint var_num, gpointer data)
   g_sheet_model_range_changed (G_SHEET_MODEL (store),
 			       -1, var_num,
 			       -1, var_num);
+#endif
 }
 
 static void
@@ -329,10 +351,12 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data)
       posn = 0;
     }
 
-  psppire_case_file_insert_values (store->case_file, 1, posn);
+  psppire_data_store_insert_values (store, 1, posn);
 
+#if AXIS_TRANSITION
   g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
 				  var_num, 1);
+#endif
 
   g_sheet_model_columns_inserted (G_SHEET_MODEL (store), var_num, 1);
 }
@@ -342,13 +366,16 @@ static void
 dict_size_change_callback (GObject *obj,
 			  gint posn, gint adjustment, gpointer data)
 {
-  PsppireDataStore *store ;
+  PsppireDataStore *store  = PSPPIRE_DATA_STORE (data);
 
-  g_return_if_fail (data);
+  const struct variable *v = psppire_dict_get_variable (store->dict, posn);
 
-  store  = PSPPIRE_DATA_STORE (data);
+  const gint new_val_width = value_cnt_from_width (var_get_width (v));
 
-  psppire_case_file_insert_values (store->case_file, adjustment, posn);
+  if ( adjustment > 0 )
+    psppire_data_store_insert_values (store, adjustment,
+				     new_val_width - adjustment +
+				     var_get_case_index(v));
 }
 
 
@@ -372,32 +399,55 @@ psppire_data_store_new (PsppireDict *dict)
   return retval;
 }
 
-
 void
-psppire_data_store_set_case_file (PsppireDataStore *data_store,
-				  PsppireCaseFile *cf)
+psppire_data_store_set_reader (PsppireDataStore *ds,
+			       struct casereader *reader)
 {
-  if ( data_store->case_file)
-    {
-      g_object_unref (data_store->case_file);
-    }
+  gint i;
 
-  data_store->case_file = cf;
+  ds->datasheet = datasheet_create (reader);
 
-  g_signal_connect (data_store->case_file, "cases-deleted",
-		   G_CALLBACK (delete_cases_callback),
-		   data_store);
+  g_sheet_model_range_changed (G_SHEET_MODEL (ds),
+			       -1, -1, -1, -1);
 
-  g_signal_connect (data_store->case_file, "case-inserted",
-		   G_CALLBACK (insert_case_callback),
-		   data_store);
+#if 0
+  for (i = 0 ; i < n_cf_signals ; ++i )
+    {
+      if ( ds->cf_handler_id [i] > 0 )
+	g_signal_handler_disconnect (ds->case_file,
+				     ds->cf_handler_id[i]);
+    }
+#endif
 
+  if ( ds->dict )
+    for (i = 0 ; i < n_dict_signals; ++i )
+      {
+	if ( ds->dict_handler_id [i] > 0)
+	  {
+	    g_signal_handler_unblock (ds->dict,
+				      ds->dict_handler_id[i]);
+	  }
+      }
 
-  g_signal_connect (data_store->case_file, "case-changed",
-		   G_CALLBACK (changed_case_callback),
-		   data_store);
-}
+#if 0
+  ds->cf_handler_id [CASES_DELETED] =
+    g_signal_connect (ds->case_file, "cases-deleted",
+		      G_CALLBACK (delete_cases_callback),
+		      ds);
+
+  ds->cf_handler_id [CASE_INSERTED] =
+    g_signal_connect (ds->case_file, "case-inserted",
+		      G_CALLBACK (insert_case_callback),
+		      ds);
+
+  ds->cf_handler_id [CASE_CHANGED] =
+    g_signal_connect (ds->case_file, "case-changed",
+		      G_CALLBACK (changed_case_callback),
+		      ds);
+#endif
 
+  g_signal_emit (ds, signals[BACKEND_CHANGED], 0);
+}
 
 
 /**
@@ -411,29 +461,60 @@ psppire_data_store_set_case_file (PsppireDataStore *data_store,
 void
 psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *dict)
 {
-  data_store->dict = dict;
+  int i;
 
-  g_signal_connect (dict, "variable-inserted",
-		   G_CALLBACK (insert_variable_callback),
-		   data_store);
+  /* Disconnect any existing handlers */
+  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]);
+      }
 
-  g_signal_connect (dict, "variables-deleted",
-		   G_CALLBACK (delete_variables_callback),
-		   data_store);
+  data_store->dict = dict;
 
-  g_signal_connect (dict, "variable-changed",
-		   G_CALLBACK (variable_changed_callback),
-		   data_store);
+  if ( dict != NULL)
+    {
+
+      data_store->dict_handler_id [VARIABLE_INSERTED] =
+	g_signal_connect (dict, "variable-inserted",
+			  G_CALLBACK (insert_variable_callback),
+			  data_store);
+
+      data_store->dict_handler_id [VARIABLE_DELETED] =
+	g_signal_connect (dict, "variable-deleted",
+			  G_CALLBACK (delete_variable_callback),
+			  data_store);
+
+      data_store->dict_handler_id [VARIABLE_CHANGED] =
+	g_signal_connect (dict, "variable-changed",
+			  G_CALLBACK (variable_changed_callback),
+			  data_store);
+
+      data_store->dict_handler_id [SIZE_CHANGED] =
+	g_signal_connect (dict, "dict-size-changed",
+			  G_CALLBACK (dict_size_change_callback),
+			  data_store);
+    }
 
 
-  g_signal_connect (dict, "dict-size-changed",
-		    G_CALLBACK (dict_size_change_callback),
-		    data_store);
 
   /* The entire model has changed */
   g_sheet_model_range_changed (G_SHEET_MODEL (data_store), -1, -1, -1, -1);
 
+#if AXIS_TRANSITION
   g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1);
+#endif
+
+  if ( data_store->dict )
+    for (i = 0 ; i < n_dict_signals; ++i )
+      {
+	if ( data_store->dict_handler_id [i] > 0)
+	  {
+	    g_signal_handler_block (data_store->dict,
+				    data_store->dict_handler_id[i]);
+	  }
+      }
 }
 
 static void
@@ -445,19 +526,42 @@ psppire_data_store_finalize (GObject *object)
 }
 
 
+static void
+psppire_data_store_dispose (GObject *object)
+{
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (object);
+
+  if (ds->dispose_has_run)
+    return;
+
+  if (ds->datasheet)
+    {
+      datasheet_destroy (ds->datasheet);
+      ds->datasheet = NULL;
+    }
+
+  /* must chain up */
+  (* parent_class->dispose) (object);
+
+  ds->dispose_has_run = TRUE;
+}
+
+
 
 /* Insert a blank case before POSN */
 gboolean
-psppire_data_store_insert_new_case (PsppireDataStore *ds, gint posn)
+psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn)
 {
   gboolean result;
   gint val_cnt, v;
   struct ccase cc;
   g_return_val_if_fail (ds, FALSE);
 
+  val_cnt = datasheet_get_column_cnt (ds->datasheet) ;
+
+  g_return_val_if_fail (val_cnt > 0, FALSE);
 
-  /* Opportunity for optimisation exists here when creating a blank case */
-  val_cnt = datasheet_get_column_cnt (ds->case_file->datasheet) ;
+  g_return_val_if_fail (posn <= psppire_data_store_get_case_count (ds), FALSE);
 
   case_create (&cc, val_cnt);
 
@@ -472,7 +576,7 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, gint posn)
       case_data_rw (&cc, pv)->f = SYSMIS;
     }
 
-  result = psppire_case_file_insert_case (ds->case_file, &cc, posn);
+  result = psppire_data_store_insert_case (ds, &cc, posn);
 
   case_destroy (&cc);
 
@@ -480,8 +584,8 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, gint posn)
 }
 
 
-static gchar *
-psppire_data_store_get_string (const GSheetModel *model, gint row, gint column)
+gchar *
+psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column)
 {
   gint idx;
   char *text;
@@ -489,15 +593,14 @@ psppire_data_store_get_string (const GSheetModel *model, gint row, gint column)
   const struct variable *pv ;
   union value *v ;
   GString *s;
-  PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
 
   g_return_val_if_fail (store->dict, NULL);
-  g_return_val_if_fail (store->case_file, NULL);
+  g_return_val_if_fail (store->datasheet, NULL);
 
   if (column >= psppire_dict_get_var_cnt (store->dict))
     return NULL;
 
-  if ( row >= psppire_case_file_get_case_count (store->case_file))
+  if ( row >= psppire_data_store_get_case_count (store))
     return NULL;
 
   pv = psppire_dict_get_variable (store->dict, column);
@@ -508,7 +611,7 @@ psppire_data_store_get_string (const GSheetModel *model, gint row, gint column)
 
   g_assert (idx >= 0);
 
-  v = psppire_case_file_get_value (store->case_file, row, idx, NULL,
+  v = psppire_data_store_get_value (store, row, idx, NULL,
                                    var_get_width (pv));
 
   g_return_val_if_fail (v, NULL);
@@ -549,8 +652,7 @@ psppire_data_store_get_string (const GSheetModel *model, gint row, gint column)
 
 static gboolean
 psppire_data_store_clear_datum (GSheetModel *model,
-					  gint row, gint col)
-
+					  glong row, glong col)
 {
   PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
 
@@ -564,8 +666,8 @@ psppire_data_store_clear_datum (GSheetModel *model,
   else
     memcpy (v.s, "", MAX_SHORT_STRING);
 
-  psppire_case_file_set_value (store->case_file, row, index, &v,
-			      var_get_width (pv));
+  psppire_data_store_set_value (store, row, index, &v,
+				var_get_width (pv));
 
   return TRUE;
 }
@@ -575,51 +677,38 @@ psppire_data_store_clear_datum (GSheetModel *model,
    to ROW, COL with  the value TEXT.
    Returns true if anything was updated, false otherwise.
 */
-static gboolean
-psppire_data_store_set_string (GSheetModel *model,
-			  const gchar *text, gint row, gint col)
+gboolean
+psppire_data_store_set_string (PsppireDataStore *store,
+			       const gchar *text, glong row, glong col)
 {
-  PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
-
+  glong n_cases;
   const struct variable *pv = psppire_dict_get_variable (store->dict, col);
   g_return_val_if_fail (pv, FALSE);
 
-#if 0
-  /* Allow the user to insert a lot of blank cases, simply by skipping rows */
-  for (r = psppire_case_file_get_case_count (store->case_file); r <= row ; ++r)
-    {
+  n_cases = psppire_data_store_get_case_count (store);
 
-      gint c;
+  if ( row > n_cases)
+    return FALSE;
 
-      psppire_case_array_insert_case (store->cases, r, 0, 0);
-
-
-      for (c = 0 ; c < psppire_dict_get_var_cnt (store->dict); ++c )
-	psppire_data_store_clear_datum (model, r, c);
-    }
-#endif
+  if (row == n_cases)
+    psppire_data_store_insert_new_case (store, row);
 
-  psppire_case_file_data_in (store->case_file, row,
-                             var_get_case_index (pv), ss_cstr (text),
-                             var_get_write_format (pv));
+  psppire_data_store_data_in (store, row,
+			      var_get_case_index (pv), ss_cstr (text),
+			      var_get_write_format (pv));
 
   return TRUE;
 }
 
 
+
 void
-psppire_data_store_set_font (PsppireDataStore *store,
-			    const PangoFontDescription *fd)
+psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels)
 {
   g_return_if_fail (store);
   g_return_if_fail (PSPPIRE_IS_DATA_STORE (store));
 
-  store->font_desc = fd;
-#if 0
-  store->width_of_m = calc_m_width (fd);
-#endif
-  g_signal_emit (store, signals [FONT_CHANGED], 0);
-
+  store->show_labels = show_labels;
 
   g_sheet_model_range_changed (G_SHEET_MODEL (store),
 				 -1, -1, -1, -1);
@@ -627,130 +716,137 @@ psppire_data_store_set_font (PsppireDataStore *store,
 
 
 void
-psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels)
+psppire_data_store_clear (PsppireDataStore *ds)
 {
-  g_return_if_fail (store);
-  g_return_if_fail (PSPPIRE_IS_DATA_STORE (store));
+  datasheet_destroy (ds->datasheet);
+  ds->datasheet = NULL;
 
-  store->show_labels = show_labels;
+  psppire_dict_clear (ds->dict);
 
-  g_sheet_model_range_changed (G_SHEET_MODEL (store),
-				 -1, -1, -1, -1);
+  g_signal_emit (ds, signals [CASES_DELETED], 0, 0, -1);
 }
 
 
 
-/* FIXME: There's no reason to actually have this function.
-   It should be done by a procedure */
-void
-psppire_data_store_create_system_file (PsppireDataStore *store,
-			      struct file_handle *handle)
+/* Return a casereader made from this datastore */
+struct casereader *
+psppire_data_store_get_reader (PsppireDataStore *ds)
 {
-  gint i, var_cnt;
-  const struct sfm_write_options wo = {
-    true, /* writeable */
-    false, /* dont compress */
-    3 /* version */
-  };
+  int i;
+  struct casereader *reader ;
 
-  struct casewriter *writer;
+#if 0
+  for (i = 0 ; i < n_cf_signals ; ++i )
+    {
+      g_signal_handler_disconnect (ds->case_file, ds->cf_handler_id[i]);
+      ds->cf_handler_id[i] = 0 ;
+    }
+#endif
 
-  g_assert (handle);
+  if ( ds->dict )
+    for (i = 0 ; i < n_dict_signals; ++i )
+      {
+	g_signal_handler_block (ds->dict,
+				ds->dict_handler_id[i]);
+      }
 
-  writer = sfm_open_writer (handle, store->dict->dict, wo);
+  return  datasheet_make_reader (ds->datasheet);
+}
 
-  if ( ! writer)
-    return;
 
 
-  var_cnt = psppire_data_store_get_var_count (G_SHEET_MODEL (store));
+/* Column related funcs */
 
-  for (i = 0 ; i < psppire_case_file_get_case_count (store->case_file); ++i )
-    {
-      struct ccase c;
-      psppire_case_file_get_case (store->case_file, i, &c);
-      casewriter_write (writer, &c);
-    }
-  casewriter_destroy (writer);
-}
 
+static const gchar null_var_name[]=N_("var");
 
+
 
-void
-psppire_data_store_clear (PsppireDataStore *data_store)
+/* Row related funcs */
+
+static gchar *
+get_row_button_label (const GSheetModel *model, gint unit)
 {
-  psppire_case_file_clear (data_store->case_file);
+  gchar *s = g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER);
 
-  psppire_dict_clear (data_store->dict);
-}
+  gchar *text =  pspp_locale_to_utf8 (s, -1, 0);
+
+  g_free (s);
 
+  return text;
+}
 
 
-/* Return a casereader made from this datastore */
-struct casereader *
-psppire_data_store_get_reader (PsppireDataStore *ds)
+static gboolean
+get_row_sensitivity (const GSheetModel *model, gint unit)
 {
-  struct casereader *reader ;
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
-  reader = psppire_case_file_make_reader (ds->case_file);
-
-  return reader;
+  return (unit < psppire_data_store_get_case_count (ds));
 }
 
 
+
 
-/* Column related funcs */
+/* Column related stuff */
 
-static gint
-geometry_get_column_count (const GSheetColumn *geom)
+static gchar *
+get_column_subtitle (const GSheetModel *model, gint col)
 {
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  gchar *text;
+  const struct variable *v ;
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
-  return MAX (MIN_COLUMNS, psppire_dict_get_var_cnt (ds->dict));
-}
+  if ( col >= psppire_dict_get_var_cnt (ds->dict) )
+    return NULL;
 
+  v = psppire_dict_get_variable (ds->dict, col);
 
+  if ( ! var_has_label (v))
+    return NULL;
 
-static gint
-geometry_get_width (const GSheetColumn *geom, gint unit)
+  text =  pspp_locale_to_utf8 (var_get_label (v), -1, 0);
+
+  return text;
+}
+
+static gchar *
+get_column_button_label (const GSheetModel *model, gint col)
 {
-  const struct variable *pv ;
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  gchar *text;
+  struct variable *pv ;
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
-  if ( unit >= psppire_dict_get_var_cnt (ds->dict) )
-    return ds->width_of_m * 8 ;
+  if ( col >= psppire_dict_get_var_cnt (ds->dict) )
+    return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0);
 
-  pv = psppire_dict_get_variable (ds->dict, unit);
+  pv = psppire_dict_get_variable (ds->dict, col);
 
-  if ( pv == NULL )
-    return ds->width_of_m * 8 ;
+  text =  pspp_locale_to_utf8 (var_get_name (pv), -1, 0);
 
-  return ds->width_of_m * var_get_display_width (pv);
+  return text;
 }
 
-static void
-geometry_set_width (GSheetColumn *geom, gint unit, gint width)
+static gboolean
+get_column_sensitivity (const GSheetModel *model, gint col)
 {
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
-
-  struct variable *pv = psppire_dict_get_variable (ds->dict, unit);
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
-  var_set_display_width (pv, width / ds->width_of_m );
+  return (col < psppire_dict_get_var_cnt (ds->dict));
 }
 
 
 
 static GtkJustification
-geometry_get_justification (const GSheetColumn *geom, gint unit)
+get_column_justification (const GSheetModel *model, gint col)
 {
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
   const struct variable *pv ;
 
-
-  if ( unit >= psppire_dict_get_var_cnt (ds->dict) )
+  if ( col >= psppire_dict_get_var_cnt (ds->dict) )
     return GTK_JUSTIFY_LEFT;
 
-  pv = psppire_dict_get_variable (ds->dict, unit);
+  pv = psppire_dict_get_variable (ds->dict, col);
 
   return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT
           : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT
@@ -758,109 +854,173 @@ geometry_get_justification (const GSheetColumn *geom, gint unit)
 }
 
 
-static const gchar null_var_name[]=N_("var");
-
-static gchar *
-geometry_get_column_button_label (const GSheetColumn *geom, gint unit)
-{
-  gchar *text;
-  struct variable *pv ;
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
 
-  if ( unit >= psppire_dict_get_var_cnt (ds->dict) )
-    return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0);
+
 
-  pv = psppire_dict_get_variable (ds->dict, unit);
 
-  text =  pspp_locale_to_utf8 (var_get_name (pv), -1, 0);
+/* Fills C with the CASENUMth case.
+   Returns true on success, false otherwise.
+ */
+gboolean
+psppire_data_store_get_case (const PsppireDataStore *ds,
+			     casenumber casenum,
+			     struct ccase *c)
+{
+  g_return_val_if_fail (ds, FALSE);
+  g_return_val_if_fail (ds->datasheet, FALSE);
 
-  return text;
+  return datasheet_get_row (ds->datasheet, casenum, c);
 }
 
 
-static gboolean
-geometry_get_sensitivity (const GSheetColumn *geom, gint unit)
+gboolean
+psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber n_cases,
+				 casenumber first)
 {
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  g_return_val_if_fail (ds, FALSE);
+  g_return_val_if_fail (ds->datasheet, FALSE);
 
-  return (unit < psppire_dict_get_var_cnt (ds->dict));
-}
+  g_return_val_if_fail (first + n_cases <=
+			psppire_data_store_get_case_count (ds), FALSE);
 
+  datasheet_delete_rows (ds->datasheet, first, n_cases);
 
-static void
-psppire_data_store_sheet_column_init (GSheetColumnIface *iface)
-{
-  iface->get_column_count = geometry_get_column_count;
-  iface->get_width = geometry_get_width;
-  iface->set_width = geometry_set_width;
-  iface->get_visibility = always_true;
-  iface->get_sensitivity = geometry_get_sensitivity;
-  iface->get_justification = geometry_get_justification;
-  iface->get_button_label = geometry_get_column_button_label;
+  g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases);
+
+  return TRUE;
 }
 
 
-/* Row related funcs */
 
-static gint
-geometry_get_row_count (const GSheetRow *geom, gpointer data)
+/* Insert case CC into the case file before POSN */
+static gboolean
+psppire_data_store_insert_case (PsppireDataStore *ds,
+				struct ccase *cc,
+				casenumber posn)
 {
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  struct ccase tmp;
+  bool result ;
+
+  g_return_val_if_fail (ds, FALSE);
+  g_return_val_if_fail (ds->datasheet, FALSE);
+
+  case_clone (&tmp, cc);
+  result = datasheet_insert_rows (ds->datasheet, posn, &tmp, 1);
 
-  return TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file);
+  if ( result )
+    g_signal_emit (ds, signals [CASE_INSERTED], 0, posn);
+  else
+    g_warning ("Cannot insert case at position %ld\n", posn);
+
+  return result;
 }
 
 
-static gint
-geometry_get_height (const GSheetRow *geom, gint unit, gpointer data)
+/* Copies the IDXth value from case CASENUM into VALUE.
+   If VALUE is null, then memory is allocated is allocated with
+   malloc.  Returns the value if successful, NULL on failure. */
+static union value *
+psppire_data_store_get_value (const PsppireDataStore *ds,
+			      casenumber casenum, size_t idx,
+			      union value *value, int width)
 {
-  return 25;
+  bool allocated;
+
+  g_return_val_if_fail (ds, false);
+  g_return_val_if_fail (ds->datasheet, false);
+
+  g_return_val_if_fail (idx < datasheet_get_column_cnt (ds->datasheet), false);
+
+  if (value == NULL)
+    {
+      value = xnmalloc (value_cnt_from_width (width), sizeof *value);
+      allocated = true;
+    }
+  else
+    allocated = false;
+  if (!datasheet_get_value (ds->datasheet, casenum, idx, value, width))
+    {
+      if (allocated)
+        free (value);
+      value = NULL;
+    }
+  return value;
 }
 
 
+
+/* Set the IDXth value of case C to V.
+   Returns true if successful, false on I/O error. */
 static gboolean
-geometry_get_row_sensitivity (const GSheetRow *geom, gint unit, gpointer data)
+psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum,
+			      gint idx, union value *v, gint width)
 {
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  bool ok;
+
+  g_return_val_if_fail (ds, FALSE);
+  g_return_val_if_fail (ds->datasheet, FALSE);
 
+  g_return_val_if_fail (idx < datasheet_get_column_cnt (ds->datasheet), FALSE);
 
-  return (unit < psppire_case_file_get_case_count (ds->case_file));
+  ok = datasheet_put_value (ds->datasheet, casenum, idx, v, width);
+  if (ok)
+    g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
+  return ok;
 }
 
 
-static gchar *
-geometry_get_row_button_label (const GSheetRow *geom, gint unit, gpointer data)
+
+
+/* Set the IDXth value of case C using D_IN */
+static gboolean
+psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx,
+			    struct substring input, const struct fmt_spec *fmt)
 {
-  gchar *text;
-  gchar *s;
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
+  union value *value = NULL;
+  int width;
+  bool ok;
 
-  if ( unit >
-       TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file))
-    return 0;
+  g_return_val_if_fail (ds, FALSE);
+  g_return_val_if_fail (ds->datasheet, FALSE);
 
-  s = g_strdup_printf (_("%d"), unit);
+  g_return_val_if_fail (idx < datasheet_get_column_cnt (ds->datasheet), FALSE);
 
-  text =  pspp_locale_to_utf8 (s, -1, 0);
+  width = fmt_var_width (fmt);
+  value = xmalloca (value_cnt_from_width (width) * sizeof *value);
+  ok = (datasheet_get_value (ds->datasheet, casenum, idx, value, width)
+        && data_in (input, LEGACY_NATIVE, fmt->type, 0, 0, 0, value, width)
+        && datasheet_put_value (ds->datasheet, casenum, idx, value, width));
 
-  g_free (s);
+  if (ok)
+    g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
 
-  return text;
-}
+  freea (value);
 
+  return TRUE;
+}
 
-static void
-psppire_data_store_sheet_row_init (GSheetRowIface *iface)
+/* Resize the cases in the casefile, by inserting N_VALUES into every
+   one of them at the position immediately preceeding WHERE.
+*/
+static gboolean
+psppire_data_store_insert_values (PsppireDataStore *ds,
+				  gint n_values, gint where)
 {
-  iface->get_row_count = geometry_get_row_count;
+  g_return_val_if_fail (ds, FALSE);
 
-  iface->get_height = geometry_get_height;
-  iface->set_height = 0;
-  iface->get_visibility = always_true;
-  iface->get_sensitivity = geometry_get_row_sensitivity;
+  if ( n_values == 0 )
+    return FALSE;
 
-  iface->get_button_label = geometry_get_row_button_label;
-}
+  g_assert (n_values > 0);
 
+  if ( ! ds->datasheet )
+    ds->datasheet = datasheet_create (NULL);
 
+  {
+    union value *values = xcalloc (n_values, sizeof *values);
+    datasheet_insert_columns (ds->datasheet, values, n_values, where);
+    free (values);
+  }
 
+  return TRUE;
+}