Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
[pspp-builds.git] / src / ui / gui / psppire-data-editor.c
index 784a731900309e1a4fea2c8d55476c99bb3d2b59..c1908387f7765a834d48ff0d0af184300b540cdb 100644 (file)
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyrigght (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008 Free Software Foundation, Inc.
 
    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
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
+#include <gtksheet/gtkextra-sheet.h>
 #include "psppire-data-editor.h"
 #include "psppire-var-sheet.h"
 
-#include <gtksheet/gsheet-hetero-column.h>
 #include <language/syntax-string-source.h>
 #include "psppire-data-store.h"
+#include <gtksheet/psppire-axis-hetero.h>
+#include <gtksheet/psppire-axis-uniform.h>
 #include "helper.h"
 
 #include <gtksheet/gtkxpaned.h>
@@ -171,14 +172,14 @@ on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data)
    Returns TRUE iff the move should be disallowed */
 static gboolean
 traverse_cell_callback (GtkSheet *sheet,
-                       gint row, gint column,
-                       gint *new_row, gint *new_column,
+                       GtkSheetCell *existing_cell,
+                       GtkSheetCell *new_cell,
                        gpointer data)
 {
   PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
   const PsppireDict *dict = de->data_store->dict;
 
-  if ( *new_column >= psppire_dict_get_var_cnt (dict))
+  if ( new_cell->col >= psppire_dict_get_var_cnt (dict))
     return TRUE;
 
   return FALSE;
@@ -199,6 +200,119 @@ enum
     PROP_SPLIT_WINDOW
   };
 
+
+#define WIDTH_OF_M 10
+#define DEFAULT_ROW_HEIGHT 25
+
+static void
+new_data_callback (PsppireDataStore *ds, gpointer data)
+{
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+  gint i;
+  for (i = 0 ; i < 4 ; ++i)
+    {
+      PsppireAxisUniform *vaxis;
+      casenumber n_cases =  psppire_case_file_get_case_count (ds->case_file);
+
+      g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL);
+
+      psppire_axis_uniform_set_count (vaxis, n_cases);
+    }
+}
+
+static void
+new_variables_callback (PsppireDict *dict, gpointer data)
+{
+  gint v, i;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+  PsppireAxisHetero *vaxis;
+  g_object_get (de->var_sheet, "vertical-axis", &vaxis, NULL);
+
+  psppire_axis_hetero_clear (vaxis);
+
+  for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
+    psppire_axis_hetero_append (vaxis, DEFAULT_ROW_HEIGHT);
+
+  for (i = 0 ; i < 4 ; ++i)
+    {
+      PsppireAxisHetero *haxis;
+      g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+      psppire_axis_hetero_clear (haxis);
+
+      for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
+       {
+         const struct variable *var = psppire_dict_get_variable (dict, v);
+
+         psppire_axis_hetero_append (haxis, 10 * var_get_display_width (var));
+       }
+    }
+}
+
+static void
+insert_variable_callback (PsppireDict *dict, gint x, gpointer data)
+{
+  gint i;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+  PsppireAxisHetero *var_vaxis;
+  g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
+
+  psppire_axis_hetero_insert (var_vaxis, DEFAULT_ROW_HEIGHT, x);
+
+  for (i = 0 ; i < 4 ; ++i)
+    {
+      const struct variable *var = psppire_dict_get_variable (dict, x);
+      PsppireAxisHetero *haxis;
+      g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+      psppire_axis_hetero_insert (haxis, WIDTH_OF_M * var_get_display_width (var), x);
+    }
+}
+
+
+static void
+delete_variable_callback (PsppireDict *dict, gint posn,
+                         gint x UNUSED, gint y UNUSED, gpointer data)
+{
+  gint i;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+  PsppireAxisHetero *var_vaxis;
+  g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
+
+  psppire_axis_hetero_remove (var_vaxis, posn);
+
+  for (i = 0 ; i < 4 ; ++i)
+    {
+      PsppireAxisHetero *haxis;
+      g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+      psppire_axis_hetero_remove (haxis, posn);
+    }
+}
+
+
+static void
+rewidth_variable_callback (PsppireDict *dict, gint posn, gpointer data)
+{
+  gint i;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+  for (i = 0 ; i < 4 ; ++i)
+    {
+      const struct variable *var = psppire_dict_get_variable (dict, posn);
+      PsppireAxisHetero *haxis;
+      g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+      psppire_axis_hetero_resize_unit (haxis,
+                                      WIDTH_OF_M *
+                                      var_get_display_width (var), posn);
+    }
+}
+
+
 static void
 psppire_data_editor_set_property (GObject         *object,
                                  guint            prop_id,
@@ -220,10 +334,15 @@ psppire_data_editor_set_property (GObject         *object,
 
       for (i = 0 ; i < 4 ; ++i )
        g_object_set (de->data_sheet[i],
-                     "row-geometry", de->data_store,
-                     "column-geometry", de->data_store,
                      "model", de->data_store,
                      NULL);
+
+      g_signal_connect (de->data_store->dict, "backend-changed",   G_CALLBACK (new_variables_callback), de);
+      g_signal_connect (de->data_store->dict, "variable-inserted", G_CALLBACK (insert_variable_callback), de);
+      g_signal_connect (de->data_store->dict, "variable-deleted",  G_CALLBACK (delete_variable_callback), de);
+      g_signal_connect (de->data_store->dict, "variable-display-width-changed",  G_CALLBACK (rewidth_variable_callback), de);
+
+      g_signal_connect (de->data_store, "backend-changed", G_CALLBACK (new_data_callback), de);
       break;
     case PROP_VAR_STORE:
       if ( de->var_store) g_object_unref (de->var_store);
@@ -231,7 +350,6 @@ psppire_data_editor_set_property (GObject         *object,
       g_object_ref (de->var_store);
 
       g_object_set (de->var_sheet,
-                   "row-geometry", de->var_store,
                    "model", de->var_store,
                    NULL);
       break;
@@ -613,6 +731,8 @@ static void
 init_sheet (PsppireDataEditor *de, int i,
            GtkAdjustment *hadj, GtkAdjustment *vadj)
 {
+  PsppireAxisHetero *haxis = psppire_axis_hetero_new ();
+  PsppireAxisUniform *vaxis = psppire_axis_uniform_new ();
   de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj);
 
   de->data_sheet[i] = gtk_sheet_new (NULL, NULL, NULL);
@@ -622,8 +742,15 @@ init_sheet (PsppireDataEditor *de, int i,
                "shadow-type",  GTK_SHADOW_ETCHED_IN,
                NULL);
 
-  gtk_container_add (GTK_CONTAINER (de->sheet_bin[i]), de->data_sheet[i]);
+  g_object_set (haxis, "default-size", 75, NULL);
+  g_object_set (vaxis, "default-size", 25, NULL);
 
+  g_object_set (de->data_sheet[i],
+               "horizontal-axis", haxis,
+               "vertical-axis", vaxis,
+               NULL);
+
+  gtk_container_add (GTK_CONTAINER (de->sheet_bin[i]), de->data_sheet[i]);
 
   g_signal_connect (de->data_sheet[i], "traverse",
                    G_CALLBACK (traverse_cell_callback), de);
@@ -787,16 +914,10 @@ GtkWidget*
 psppire_data_editor_new (PsppireVarStore *var_store,
                         PsppireDataStore *data_store)
 {
-  GtkWidget *widget;
-
-  widget =  g_object_new (PSPPIRE_DATA_EDITOR_TYPE,
-                         "var-store",  var_store,
-                         "data-store",  data_store,
-                         NULL);
-
-
-
-  return widget;
+  return  g_object_new (PSPPIRE_DATA_EDITOR_TYPE,
+                                    "var-store",  var_store,
+                                    "data-store",  data_store,
+                                    NULL);
 }