X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=52f7ddfd579e52cc27456852ef67a75fcd9a6648;hb=3015887c05c52fbb85ecc016339fe66cf4f75ba1;hp=57a08009db9b7aeca78f5a17968b7371663a7bce;hpb=775941da1289c0c3de3895e61cc6e787c6591686;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 57a08009db..52f7ddfd57 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -23,8 +23,7 @@ #include #include "psppire-data-store.h" -#include -#include +#include #include "helper.h" #include @@ -214,19 +213,41 @@ enum 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_data_store_get_case_count (ds); + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); - g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL); + casenumber n_cases = psppire_data_store_get_case_count (ds); - psppire_axis_uniform_set_count (vaxis, n_cases); + for (i = 0; i < 2; ++i) + { + psppire_axis_impl_clear (de->vaxis[i]); + psppire_axis_impl_append_n (de->vaxis[i], n_cases, DEFAULT_ROW_HEIGHT); } } +static void +case_inserted_callback (PsppireDataStore *ds, gint before, gpointer data) +{ + gint i; + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); + + for (i = 0; i < 2; ++i) + psppire_axis_impl_insert (de->vaxis[i], before, DEFAULT_ROW_HEIGHT); +} + + +static void +cases_deleted_callback (PsppireDataStore *ds, gint first, gint n_cases, gpointer data) +{ + gint i; + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); + + for (i = 0; i < 2; ++i) + psppire_axis_impl_delete (de->vaxis[0], first, n_cases); +} + + + /* Return the width (in pixels) of an upper case M when rendered in the current font of W */ @@ -243,59 +264,63 @@ width_of_m (GtkWidget *w) return rect.width; } +/* Callback for the axis' resize signal. + Changes the variable's display width */ +static void +rewidth_variable (GtkWidget *w, gint unit, glong size) +{ + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (w); + + const PsppireDict *dict = de->data_store->dict; + struct variable *var = psppire_dict_get_variable (dict, unit); + + var_set_display_width (var, size / (float) width_of_m (w)); +} + + static void new_variables_callback (PsppireDict *dict, gpointer data) { - gint v, i; + gint v; PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); gint m_width = width_of_m (GTK_WIDGET (de)); - PsppireAxisHetero *vaxis; + PsppireAxisImpl *vaxis; g_object_get (de->var_sheet, "vertical-axis", &vaxis, NULL); - psppire_axis_hetero_clear (vaxis); + psppire_axis_impl_clear (vaxis); + psppire_axis_impl_append_n (vaxis, 1 + psppire_dict_get_var_cnt (dict), DEFAULT_ROW_HEIGHT); - 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); + g_signal_connect_swapped (de->haxis, "resize-unit", + G_CALLBACK (rewidth_variable), de); - psppire_axis_hetero_clear (haxis); + psppire_axis_impl_clear (de->haxis); - for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v) - { - const struct variable *var = psppire_dict_get_variable (dict, v); + 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, m_width * var_get_display_width (var)); - } + psppire_axis_impl_append (de->haxis, m_width * var_get_display_width (var)); } } static void insert_variable_callback (PsppireDict *dict, gint x, gpointer data) { - gint i; - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); gint m_width = width_of_m (GTK_WIDGET (de)); - PsppireAxisHetero *var_vaxis; + PsppireAxisImpl *var_vaxis; + + const struct variable *var = psppire_dict_get_variable (dict, x); + g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL); - psppire_axis_hetero_insert (var_vaxis, DEFAULT_ROW_HEIGHT, x); + psppire_axis_impl_insert (var_vaxis, x, DEFAULT_ROW_HEIGHT); - 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, m_width * var_get_display_width (var), x); - } + psppire_axis_impl_insert (de->haxis, x, m_width * var_get_display_width (var)); } @@ -303,41 +328,27 @@ 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; + PsppireAxisImpl *var_vaxis; g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL); - psppire_axis_hetero_remove (var_vaxis, posn); + psppire_axis_impl_delete (var_vaxis, posn, 1); - 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); - } + psppire_axis_impl_delete (de->haxis, posn, 1); } static void rewidth_variable_callback (PsppireDict *dict, gint posn, gpointer data) { - gint i; PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data); gint m_width = width_of_m (GTK_WIDGET (de)); - 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); + const struct variable *var = psppire_dict_get_variable (dict, posn); - psppire_axis_hetero_resize_unit (haxis, - m_width * - var_get_display_width (var), posn); - } + psppire_axis_impl_resize (de->haxis, posn, m_width * + var_get_display_width (var)); } @@ -365,12 +376,27 @@ psppire_data_editor_set_property (GObject *object, "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->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); + + g_signal_connect (de->data_store, "case-inserted", + G_CALLBACK (case_inserted_callback), de); + + g_signal_connect (de->data_store, "cases-deleted", + G_CALLBACK (cases_deleted_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); @@ -779,10 +805,11 @@ on_map (GtkWidget *w) static void init_sheet (PsppireDataEditor *de, int i, - GtkAdjustment *hadj, GtkAdjustment *vadj) + GtkAdjustment *hadj, GtkAdjustment *vadj, + PsppireAxisImpl *vaxis, + PsppireAxisImpl *haxis + ) { - 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); @@ -812,38 +839,46 @@ init_sheet (PsppireDataEditor *de, int i, static void init_data_sheet (PsppireDataEditor *de) { - GtkAdjustment *va0, *ha0; - GtkAdjustment *va1, *ha1; + GtkAdjustment *vadj0, *hadj0; + GtkAdjustment *vadj1, *hadj1; GtkWidget *sheet ; + de->vaxis[0] = psppire_axis_impl_new (); + de->vaxis[1] = psppire_axis_impl_new (); + + /* Txoxovhere's only one horizontal axis, since the + column widths are parameters of the variables */ + de->haxis = psppire_axis_impl_new (); + + de->split = TRUE; de->paned = gtk_xpaned_new (); - init_sheet (de, 0, NULL, NULL); + init_sheet (de, 0, NULL, NULL, de->vaxis[0], de->haxis); gtk_widget_show (de->sheet_bin[0]); - va0 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0])); - ha0 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0])); + vadj0 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0])); + hadj0 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0])); g_object_set (de->sheet_bin[0], "vscrollbar-policy", GTK_POLICY_NEVER, NULL); g_object_set (de->sheet_bin[0], "hscrollbar-policy", GTK_POLICY_NEVER, NULL); - init_sheet (de, 1, NULL, va0); + init_sheet (de, 1, NULL, vadj0, de->vaxis[0], de->haxis); gtk_widget_show (de->sheet_bin[1]); sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[1])); gtk_sheet_hide_row_titles (GTK_SHEET (sheet)); - ha1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1])); + hadj1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1])); g_object_set (de->sheet_bin[1], "vscrollbar-policy", GTK_POLICY_ALWAYS, NULL); g_object_set (de->sheet_bin[1], "hscrollbar-policy", GTK_POLICY_NEVER, NULL); - init_sheet (de, 2, ha0, NULL); + init_sheet (de, 2, hadj0, NULL, de->vaxis[1], de->haxis); gtk_widget_show (de->sheet_bin[2]); sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[2])); gtk_sheet_hide_column_titles (GTK_SHEET (sheet)); g_object_set (de->sheet_bin[2], "vscrollbar-policy", GTK_POLICY_NEVER, NULL); g_object_set (de->sheet_bin[2], "hscrollbar-policy", GTK_POLICY_ALWAYS, NULL); - va1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2])); + vadj1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2])); - init_sheet (de, 3, ha1, va1); + init_sheet (de, 3, hadj1, vadj1, de->vaxis[1], de->haxis); gtk_widget_show (de->sheet_bin[3]); sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[3])); gtk_sheet_hide_column_titles (GTK_SHEET (sheet));