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=02130f699f994b64926bcbf8aa7164be37471d31;hb=7378b253719947ef1713e2c9e42316b2da612109;hp=505cf4a11ebbc67c31bbfa50f71fac71a2737f61;hpb=e35dcfae42bfcb56df35038c6acf42d3bc5a6e62;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 505cf4a11e..02130f699f 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -23,6 +23,8 @@ #include #include "psppire-data-store.h" +#include +#include #include "helper.h" #include @@ -121,22 +123,27 @@ static void popup_cases_menu (GtkSheet *sheet, gint row, static gboolean on_data_column_clicked (PsppireDataEditor *de, gint col, gpointer data) { - + GtkSheetRange visible_range; gint current_row, current_column; - gtk_notebook_set_current_page (GTK_NOTEBOOK (de), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); + gtk_notebook_set_current_page (GTK_NOTEBOOK (de), + PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); gtk_sheet_get_active_cell (GTK_SHEET (de->var_sheet), ¤t_row, ¤t_column); gtk_sheet_set_active_cell (GTK_SHEET (de->var_sheet), col, current_column); - return FALSE; -} + gtk_sheet_get_visible_range (GTK_SHEET (de->var_sheet), &visible_range); + if ( col < visible_range.row0 || col > visible_range.rowi) + gtk_sheet_moveto (GTK_SHEET (de->var_sheet), col, current_column, 0.5, 0.5); + return FALSE; +} + /* Callback which occurs when the var sheet's row title button is double clicked */ @@ -157,10 +164,7 @@ on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data) gtk_sheet_get_visible_range (GTK_SHEET (de->data_sheet[0]), &visible_range); if ( row < visible_range.col0 || row > visible_range.coli) - { - gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), - -1, row, 0, 0); - } + gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), -1, row, 0.5, 0.5); return FALSE; } @@ -200,6 +204,23 @@ enum #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) @@ -207,18 +228,26 @@ 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) { - PsppireAxis *haxis; + PsppireAxisHetero *haxis; g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL); - psppire_axis_clear (haxis); + 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_append (haxis, 10 * var_get_display_width (var)); + psppire_axis_hetero_append (haxis, 10 * var_get_display_width (var)); } } } @@ -229,29 +258,40 @@ 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); - PsppireAxis *haxis; + PsppireAxisHetero *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); + 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) +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) { - PsppireAxis *haxis; + PsppireAxisHetero *haxis; g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL); - psppire_axis_remove (haxis, posn); + psppire_axis_hetero_remove (haxis, posn); } } @@ -265,10 +305,12 @@ rewidth_variable_callback (PsppireDict *dict, gint posn, gpointer data) for (i = 0 ; i < 4 ; ++i) { const struct variable *var = psppire_dict_get_variable (dict, posn); - PsppireAxis *haxis; + PsppireAxisHetero *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); + psppire_axis_hetero_resize_unit (haxis, + WIDTH_OF_M * + var_get_display_width (var), posn); } } @@ -294,7 +336,6 @@ 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, "model", de->data_store, NULL); @@ -302,6 +343,8 @@ psppire_data_editor_set_property (GObject *object, 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); @@ -309,7 +352,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; @@ -691,18 +733,23 @@ static void init_sheet (PsppireDataEditor *de, int i, GtkAdjustment *hadj, GtkAdjustment *vadj) { - PsppireAxis *haxis = psppire_axis_new (); + 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); + de->data_sheet[i] = gtk_sheet_new (NULL); g_object_set (de->sheet_bin[i], "border-width", 3, "shadow-type", GTK_SHADOW_ETCHED_IN, NULL); + 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]); @@ -1128,14 +1175,26 @@ psppire_data_editor_sort_descending (PsppireDataEditor *de) void psppire_data_editor_insert_variable (PsppireDataEditor *de) { - glong posn = -1; + glong posn = 0; - if ( de->data_sheet[0]->state == GTK_SHEET_COLUMN_SELECTED ) - posn = GTK_SHEET (de->data_sheet[0])->range.col0; - else - posn = GTK_SHEET (de->data_sheet[0])->active_cell.col; - - if ( posn == -1 ) posn = 0; + switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de))) + { + case PSPPIRE_DATA_EDITOR_DATA_VIEW: + if ( de->data_sheet[0]->state == GTK_SHEET_COLUMN_SELECTED ) + posn = GTK_SHEET (de->data_sheet[0])->range.col0; + else + posn = GTK_SHEET (de->data_sheet[0])->active_cell.col; + break; + case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: + if ( de->var_sheet->state == GTK_SHEET_ROW_SELECTED ) + posn = GTK_SHEET (de->var_sheet)->range.row0; + else + posn = GTK_SHEET (de->var_sheet)->active_cell.row; + break; + default: + g_assert_not_reached (); + break; + }; psppire_dict_insert_variable (de->data_store->dict, posn, NULL); } @@ -1204,11 +1263,27 @@ psppire_data_editor_show_grid (PsppireDataEditor *de, gboolean grid_visible) gtk_sheet_show_grid (GTK_SHEET (de->data_sheet[0]), grid_visible); } + +static void +set_font (GtkWidget *w, gpointer data) +{ + PangoFontDescription *font_desc = data; + GtkRcStyle *style = gtk_widget_get_modifier_style (w); + + pango_font_description_free (style->font_desc); + style->font_desc = pango_font_description_copy (font_desc); + + gtk_widget_modify_style (w, style); + + if ( GTK_IS_CONTAINER (w)) + gtk_container_foreach (w, set_font, font_desc); +} + void psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_desc) { - psppire_data_store_set_font (de->data_store, font_desc); - psppire_var_store_set_font (de->var_store, font_desc); + set_font (de, font_desc); + gtk_container_foreach (GTK_CONTAINER (de), set_font, font_desc); }