X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=2e1dee8954aa5a59dd7d3707d19c96fcecd04eb9;hb=ddd7c113f3e50c8d87f6a677856799d05a1f40c7;hp=82a835bed044b18f30308502c6f65247f29e6354;hpb=a698937f8a70b90dda232f9dc9b5c6664c4a4a2d;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 82a835bed0..2e1dee8954 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -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 @@ -17,11 +17,10 @@ #include #include #include -#include +#include #include "psppire-data-editor.h" #include "psppire-var-sheet.h" -#include #include #include "psppire-data-store.h" #include "helper.h" @@ -136,6 +135,9 @@ on_data_column_clicked (PsppireDataEditor *de, gint col, gpointer data) } + + + /* Callback which occurs when the var sheet's row title button is double clicked */ static gboolean @@ -164,6 +166,23 @@ on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data) } +/* Moves the focus to a new cell. + Returns TRUE iff the move should be disallowed */ +static gboolean +traverse_cell_callback (GtkSheet *sheet, + GtkSheetCell *existing_cell, + GtkSheetCell *new_cell, + gpointer data) +{ + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); + const PsppireDict *dict = de->data_store->dict; + + if ( new_cell->col >= psppire_dict_get_var_cnt (dict)) + return TRUE; + + return FALSE; +} + enum { @@ -179,6 +198,81 @@ enum PROP_SPLIT_WINDOW }; + +#define WIDTH_OF_M 10 + +static void +new_variables_callback (PsppireDict *dict, gpointer data) +{ + gint v, i; + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); + + for (i = 0 ; i < 4 ; ++i) + { + PsppireAxis *haxis; + g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL); + + psppire_axis_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_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); + + for (i = 0 ; i < 4 ; ++i) + { + const struct variable *var = psppire_dict_get_variable (dict, x); + PsppireAxis *haxis; + g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL); + + psppire_axis_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); + + for (i = 0 ; i < 4 ; ++i) + { + PsppireAxis *haxis; + g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL); + + psppire_axis_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); + PsppireAxis *haxis; + g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL); + + psppire_axis_resize_unit (haxis, WIDTH_OF_M * var_get_display_width (var), posn); + } +} + + static void psppire_data_editor_set_property (GObject *object, guint prop_id, @@ -201,9 +295,14 @@ 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-changed", G_CALLBACK (alter_variable_callback), de); + g_signal_connect (de->data_store->dict, "variable-display-width-changed", G_CALLBACK (rewidth_variable_callback), de); break; case PROP_VAR_STORE: if ( de->var_store) g_object_unref (de->var_store); @@ -493,7 +592,10 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass) /* Update the data_ref_entry with the reference of the active cell */ static gint -update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data) +update_data_ref_entry (const GtkSheet *sheet, + gint row, gint col, + gint old_row, gint old_col, + gpointer data) { PsppireDataEditor *de = data; @@ -567,7 +669,6 @@ datum_entry_activate (GtkEntry *entry, gpointer data) } static void on_activate (PsppireDataEditor *de); -static void on_deactivate (PsppireDataEditor *de); static gboolean on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p, gint pagenum, gpointer data); static void on_select_range (PsppireDataEditor *de); @@ -591,6 +692,7 @@ static void init_sheet (PsppireDataEditor *de, int i, GtkAdjustment *hadj, GtkAdjustment *vadj) { + PsppireAxis *haxis = psppire_axis_new (); de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj); de->data_sheet[i] = gtk_sheet_new (NULL, NULL, NULL); @@ -600,8 +702,15 @@ init_sheet (PsppireDataEditor *de, int i, "shadow-type", GTK_SHADOW_ETCHED_IN, NULL); + g_object_set (de->data_sheet[i], + "horizontal-axis", haxis, + 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); + gtk_widget_show (de->sheet_bin[i]); } @@ -725,10 +834,6 @@ psppire_data_editor_init (PsppireDataEditor *de) G_CALLBACK (on_activate), de); - g_signal_connect_swapped (de->data_sheet[0], "deactivate", - G_CALLBACK (on_deactivate), - de); - g_signal_connect_swapped (de->data_sheet[0], "select-range", G_CALLBACK (on_select_range), de); @@ -765,16 +870,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); } @@ -1145,12 +1244,6 @@ on_activate (PsppireDataEditor *de) } -static void -on_deactivate (PsppireDataEditor *de) -{ - emit_selected_signal (de); -} - static void on_select_range (PsppireDataEditor *de) {