X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=2bdf3d6b785ede1b38549013131cc99152e4c9ce;hb=7d4150d7cba15550753a0a574685de26656c0633;hp=101b5e2782de7d8563f699a120ef3a76b6814af3;hpb=62daa26d28d611c404590c1c92f5ee97f9599cf5;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 101b5e2782..2bdf3d6b78 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -28,116 +28,28 @@ #include "libpspp/str.h" #include "ui/gui/executor.h" #include "ui/gui/helper.h" +#include "ui/gui/var-display.h" +#include "ui/gui/val-labs-dialog.h" +#include "ui/gui/missing-val-dialog.h" +#include "ui/gui/var-type-dialog.h" +#include "ui/gui/psppire-dict.h" #include "ui/gui/psppire-data-store.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-value-entry.h" #include "ui/gui/psppire-conf.h" -#include "ui/gui/psppire-var-sheet-header.h" +#include "ui/gui/psppire-variable-sheet.h" #include "value-variant.h" #include "ui/gui/efficient-sheet/jmd-sheet.h" -#include "ui/gui/efficient-sheet/jmd-sheet-body.h" #include #define _(msgid) gettext (msgid) - -static GtkCellRenderer * -create_spin_renderer (GType type) -{ - GtkCellRenderer *r = gtk_cell_renderer_spin_new (); - - GtkAdjustment *adj = gtk_adjustment_new (0, - 0, G_MAXDOUBLE, - 1, 1, - 0); - g_object_set (r, - "adjustment", adj, - NULL); - - return r; -} - -static GtkCellRenderer * -create_combo_renderer (GType type) -{ - GtkListStore *list_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING); - - GEnumClass *ec = g_type_class_ref (type); - - const GEnumValue *ev ; - for (ev = ec->values; ev->value_name; ++ev) - { - GtkTreeIter iter; - - gtk_list_store_append (list_store, &iter); - - gtk_list_store_set (list_store, &iter, - 0, ev->value, - 1, gettext (ev->value_nick), - -1); - } - - GtkCellRenderer *r = gtk_cell_renderer_combo_new (); - - g_object_set (r, - "model", list_store, - "text-column", 1, - "has-entry", TRUE, - NULL); - - return r; -} - -static GtkCellRenderer *spin_renderer; -static GtkCellRenderer *column_width_renderer; -static GtkCellRenderer *measure_renderer; -static GtkCellRenderer *alignment_renderer; - - - -static GtkCellRenderer * -select_renderer_func (gint col, gint row, GType type) -{ - if (!spin_renderer) - spin_renderer = create_spin_renderer (type); - - if (col == DICT_TVM_COL_ROLE && !column_width_renderer) - column_width_renderer = create_combo_renderer (type); - - if (col == DICT_TVM_COL_MEASURE && !measure_renderer) - measure_renderer = create_combo_renderer (type); - - if (col == DICT_TVM_COL_ALIGNMENT && !alignment_renderer) - alignment_renderer = create_combo_renderer (type); - - switch (col) - { - case DICT_TVM_COL_WIDTH: - case DICT_TVM_COL_DECIMAL: - case DICT_TVM_COL_COLUMNS: - return spin_renderer; - - case DICT_TVM_COL_ALIGNMENT: - return alignment_renderer; - - case DICT_TVM_COL_MEASURE: - return measure_renderer; - - case DICT_TVM_COL_ROLE: - return column_width_renderer; - } - - return NULL; -} - - static void psppire_data_editor_class_init (PsppireDataEditorClass *klass); static void psppire_data_editor_init (PsppireDataEditor *de); -static void disconnect_data_sheets (PsppireDataEditor *); static void refresh_entry (PsppireDataEditor *); GType @@ -174,8 +86,6 @@ psppire_data_editor_dispose (GObject *obj) { PsppireDataEditor *de = (PsppireDataEditor *) obj; - disconnect_data_sheets (de); - if (de->data_store) { g_object_unref (de->data_store); @@ -212,45 +122,6 @@ psppire_data_editor_refresh_model (PsppireDataEditor *de) { } -static void -change_var_property (PsppireDict *dict, gint col, gint row, GValue *value) -{ - /* Return the IDXth variable */ - struct variable *var = psppire_dict_get_variable (dict, row); - - if (NULL == var) - var = psppire_dict_insert_variable (dict, row, NULL); - - switch (col) - { - case DICT_TVM_COL_NAME: - { - const char *name = g_value_get_string (value); - if (psppire_dict_check_name (dict, name, FALSE)) - dict_rename_var (dict->dict, var, g_value_get_string (value)); - } - break; - case DICT_TVM_COL_LABEL: - var_set_label (var, g_value_get_string (value)); - break; - case DICT_TVM_COL_COLUMNS: - var_set_display_width (var, g_value_get_int (value)); - break; - case DICT_TVM_COL_MEASURE: - var_set_measure (var, g_value_get_enum (value)); - break; - case DICT_TVM_COL_ALIGNMENT: - var_set_alignment (var, g_value_get_enum (value)); - break; - case DICT_TVM_COL_ROLE: - var_set_role (var, g_value_get_enum (value)); - break; - default: - g_message ("Changing col %d of var sheet not yet supported", col); - break; - } -} - static void change_data_value (PsppireDataStore *store, gint col, gint row, GValue *value) { @@ -281,7 +152,9 @@ psppire_data_editor_set_property (GObject *object, switch (prop_id) { case PROP_SPLIT_WINDOW: - psppire_data_editor_split_window (de, g_value_get_boolean (value)); + de->split = g_value_get_boolean (value); + g_object_set (de->data_sheet, "split", de->split, NULL); + g_object_set (de->var_sheet, "split", de->split, NULL); break; case PROP_DATA_STORE: if ( de->data_store) @@ -294,11 +167,14 @@ psppire_data_editor_set_property (GObject *object, de->data_store = g_value_get_pointer (value); g_object_ref (de->data_store); - g_print ("NEW STORE\n"); g_object_set (de->data_sheet, "data-model", de->data_store, NULL); psppire_data_editor_refresh_model (de); + g_signal_connect_swapped (de->data_sheet, "selection-changed", + G_CALLBACK (refresh_entry), + de); + g_signal_connect_swapped (de->data_sheet, "value-changed", G_CALLBACK (change_data_value), de->data_store); @@ -314,9 +190,6 @@ psppire_data_editor_set_property (GObject *object, g_object_set (de->data_sheet, "hmodel", de->dict, NULL); g_object_set (de->var_sheet, "data-model", de->dict, NULL); - g_signal_connect_swapped (de->var_sheet, "value-changed", - G_CALLBACK (change_var_property), de->dict); - break; case PROP_VALUE_LABELS: break; @@ -435,7 +308,6 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass) g_object_class_install_property (object_class, PROP_SPLIT_WINDOW, split_window_spec); - } @@ -468,21 +340,25 @@ on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index, static void refresh_entry (PsppireDataEditor *de) { - union value val; gint row, col; - jmd_sheet_get_active_cell (JMD_SHEET (de->data_sheet), &col, &row); + if (jmd_sheet_get_active_cell (JMD_SHEET (de->data_sheet), &col, &row)) + { + union value val; + const struct variable *var = psppire_dict_get_variable (de->dict, col); + if (var == NULL) + return; - const struct variable *var = psppire_dict_get_variable (de->dict, col); - psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), var); + psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), var); - int width = var_get_width (var); - if (! psppire_data_store_get_value (PSPPIRE_DATA_STORE (de->data_store), - row, var, &val)) - return; + int width = var_get_width (var); + if (! psppire_data_store_get_value (PSPPIRE_DATA_STORE (de->data_store), + row, var, &val)) + return; - psppire_value_entry_set_value (PSPPIRE_VALUE_ENTRY (de->datum_entry), - &val, width); - value_destroy (&val, width); + psppire_value_entry_set_value (PSPPIRE_VALUE_ENTRY (de->datum_entry), + &val, width); + value_destroy (&val, width); + } } static void @@ -491,11 +367,6 @@ on_datum_entry_activate (PsppireValueEntry *entry, PsppireDataEditor *de) } -static void -disconnect_data_sheets (PsppireDataEditor *de) -{ -} - /* Called when the active cell or the selection in the data sheet changes */ static void on_data_selection_change (PsppireDataEditor *de, JmdRange *sel) @@ -542,8 +413,8 @@ on_data_selection_change (PsppireDataEditor *de, JmdRange *sel) static void set_font_recursively (GtkWidget *w, gpointer data); -gchar *myconvfunc (GtkTreeModel *m, gint col, gint row, const GValue *v); -void myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in, GValue *out); +gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in, + GValue *out); enum sort_order @@ -614,16 +485,14 @@ delete_cases (PsppireDataEditor *de) static void insert_new_case (PsppireDataEditor *de) { - gint item = GPOINTER_TO_INT (g_object_get_data + gint posn = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (de->data_sheet_cases_row_popup), "item")); - psppire_data_store_insert_new_case (de->data_store, item); - - gtk_widget_queue_draw (GTK_WIDGET (de)); + psppire_data_editor_insert_new_case_at_posn (de, posn); } -static void -data_delete_variables (PsppireDataEditor *de) +void +psppire_data_editor_data_delete_variables (PsppireDataEditor *de) { JmdRange *range = JMD_SHEET(de->data_sheet)->selection; @@ -633,8 +502,8 @@ data_delete_variables (PsppireDataEditor *de) gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet)); } -static void -var_delete_variables (PsppireDataEditor *de) +void +psppire_data_editor_var_delete_variables (PsppireDataEditor *de) { JmdRange *range = JMD_SHEET(de->var_sheet)->selection; @@ -644,61 +513,24 @@ var_delete_variables (PsppireDataEditor *de) gtk_widget_queue_draw (GTK_WIDGET (de->var_sheet)); } - -static void -insert_new_variable_data (PsppireDataEditor *de) +void +psppire_data_editor_insert_new_case_at_posn (PsppireDataEditor *de, gint posn) { - gint item = GPOINTER_TO_INT (g_object_get_data - (G_OBJECT (de->data_sheet_cases_column_popup), - "item")); + psppire_data_store_insert_new_case (de->data_store, posn); - const struct variable *v = psppire_dict_insert_variable (de->dict, item, NULL); - psppire_data_store_insert_value (de->data_store, var_get_width(v), - var_get_case_index (v)); - - gtk_widget_queue_draw (GTK_WIDGET (de)); + gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet)); } -static void -insert_new_variable_var (PsppireDataEditor *de) +void +psppire_data_editor_insert_new_variable_at_posn (PsppireDataEditor *de, gint posn) { - gint item = GPOINTER_TO_INT (g_object_get_data - (G_OBJECT (de->var_sheet_row_popup), - "item")); - - const struct variable *v = psppire_dict_insert_variable (de->dict, item, NULL); + const struct variable *v = psppire_dict_insert_variable (de->dict, posn, NULL); psppire_data_store_insert_value (de->data_store, var_get_width(v), var_get_case_index (v)); gtk_widget_queue_draw (GTK_WIDGET (de)); } - -static GtkWidget * -create_var_row_header_popup_menu (PsppireDataEditor *de) -{ - GtkWidget *menu = gtk_menu_new (); - - GtkWidget *item = - gtk_menu_item_new_with_mnemonic (_("_Insert Variable")); - g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable_var), - de); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - de->var_clear_variables_menu_item = - gtk_menu_item_new_with_mnemonic (_("Cl_ear Variables")); - g_signal_connect_swapped (de->var_clear_variables_menu_item, "activate", - G_CALLBACK (var_delete_variables), de); - gtk_widget_set_sensitive (de->var_clear_variables_menu_item, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->var_clear_variables_menu_item); - - gtk_widget_show_all (menu); - return menu; -} - static GtkWidget * create_data_row_header_popup_menu (PsppireDataEditor *de) { @@ -723,6 +555,16 @@ create_data_row_header_popup_menu (PsppireDataEditor *de) return menu; } +static void +insert_new_variable_data (PsppireDataEditor *de) +{ + gint posn = GPOINTER_TO_INT (g_object_get_data + (G_OBJECT (de->data_sheet_cases_column_popup), + "item")); + + psppire_data_editor_insert_new_variable_at_posn (de, posn); +} + static GtkWidget * create_data_column_header_popup_menu (PsppireDataEditor *de) { @@ -740,7 +582,8 @@ create_data_column_header_popup_menu (PsppireDataEditor *de) de->data_clear_variables_menu_item = gtk_menu_item_new_with_mnemonic (_("Cl_ear Variables")); g_signal_connect_swapped (de->data_clear_variables_menu_item, "activate", - G_CALLBACK (data_delete_variables), de); + G_CALLBACK (psppire_data_editor_data_delete_variables), + de); gtk_widget_set_sensitive (de->data_clear_variables_menu_item, FALSE); gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_clear_variables_menu_item); @@ -765,20 +608,6 @@ create_data_column_header_popup_menu (PsppireDataEditor *de) return menu; } -static void -set_var_popup_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p) -{ - - JmdRange *range = selection; - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - gint width = gtk_tree_model_get_n_columns (sheet->data_model); - - gboolean whole_row_selected = (range->start_x == 0 && - range->end_x == width - 1 - 1); - /* PsppireDict has an "extra" column: TVM_COL_VAR ^^^ */ - gtk_widget_set_sensitive (de->var_clear_variables_menu_item, whole_row_selected); -} - static void set_menu_items_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p) { @@ -802,30 +631,6 @@ set_menu_items_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p) whole_column_selected); } -static void -show_variables_row_popup (JmdSheet *sheet, int row, uint button, - uint state, gpointer p) -{ - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - GListModel *vmodel = NULL; - g_object_get (sheet, "vmodel", &vmodel, NULL); - if (vmodel == NULL) - return; - - guint n_items = g_list_model_get_n_items (vmodel); - - if (row >= n_items) - return; - - if (button != 3) - return; - - g_object_set_data (G_OBJECT (de->var_sheet_row_popup), "item", - GINT_TO_POINTER (row)); - - gtk_menu_popup_at_pointer (GTK_MENU (de->var_sheet_row_popup), NULL); -} - static void show_cases_row_popup (JmdSheet *sheet, int row, uint button, uint state, gpointer p) { @@ -874,6 +679,12 @@ show_cases_column_popup (JmdSheet *sheet, int column, uint button, uint state, } +static gchar * +data_store_value_to_string (JmdSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v) +{ + return psppire_data_store_value_to_string (store, col, row, v); +} + static void psppire_data_editor_init (PsppireDataEditor *de) { @@ -884,7 +695,6 @@ psppire_data_editor_init (PsppireDataEditor *de) gtk_style_context_add_class (context, "psppire-data-editor"); de->font = NULL; - de->old_vbox_widget = NULL; g_object_set (de, "tab-pos", GTK_POS_BOTTOM, NULL); @@ -905,7 +715,6 @@ psppire_data_editor_init (PsppireDataEditor *de) de->data_sheet_cases_column_popup = create_data_column_header_popup_menu (de); de->data_sheet_cases_row_popup = create_data_row_header_popup_menu (de); - de->var_sheet_row_popup = create_var_row_header_popup_menu (de); g_signal_connect (de->data_sheet, "row-header-pressed", G_CALLBACK (show_cases_row_popup), de); @@ -916,9 +725,10 @@ psppire_data_editor_init (PsppireDataEditor *de) g_signal_connect (de->data_sheet, "selection-changed", G_CALLBACK (set_menu_items_sensitivity), de); - jmd_sheet_body_set_conversion_func - (JMD_SHEET_BODY (JMD_SHEET(de->data_sheet)->selected_body), - myconvfunc, myreversefunc); + g_object_set (de->data_sheet, + "forward-conversion", data_store_value_to_string, + "reverse-conversion", myreversefunc, + NULL); GtkWidget *data_button = jmd_sheet_get_button (JMD_SHEET (de->data_sheet)); gtk_button_set_label (GTK_BUTTON (data_button), _("Case")); @@ -935,21 +745,7 @@ psppire_data_editor_init (PsppireDataEditor *de) gtk_widget_show_all (de->vbox); - de->var_sheet = g_object_new (JMD_TYPE_SHEET, NULL); - - PsppireVarSheetHeader *vsh = g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL); - - g_object_set (de->var_sheet, - "hmodel", vsh, - "select-renderer-func", select_renderer_func, - NULL); - - g_signal_connect (de->var_sheet, "row-header-pressed", - G_CALLBACK (show_variables_row_popup), de); - - g_signal_connect (de->var_sheet, "selection-changed", - G_CALLBACK (set_var_popup_sensitivity), de); - + de->var_sheet = psppire_variable_sheet_new (); GtkWidget *var_button = jmd_sheet_get_button (JMD_SHEET (de->var_sheet)); gtk_button_set_label (GTK_BUTTON (var_button), _("Variable")); @@ -1053,20 +849,7 @@ psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_ void psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) { - if (split == de->split) - return; - - disconnect_data_sheets (de); - - psppire_data_editor_refresh_model (de); - - gtk_widget_show_all (de->vbox); - - if (de->font) - set_font_recursively (GTK_WIDGET (de), de->font); - - de->split = split; - g_object_notify (G_OBJECT (de), "split"); + g_object_set (de, "split", split, NULL); } /* Makes the variable with dictionary index DICT_INDEX in DE's dictionary @@ -1074,4 +857,43 @@ psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) void psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index) { + gint page = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + + switch (page) + { + case PSPPIRE_DATA_EDITOR_DATA_VIEW: + jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1); + jmd_sheet_set_active_cell (JMD_SHEET (de->data_sheet), dict_index, -1, NULL); + break; + case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: + jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index); + jmd_sheet_set_active_cell (JMD_SHEET (de->var_sheet), -1, dict_index, NULL); + break; + } +} + +/* Set the datum at COL, ROW, to that contained in VALUE. + */ +static void +store_set_datum (GtkTreeModel *model, gint col, gint row, + const GValue *value) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + GVariant *v = g_value_get_variant (value); + union value uv; + value_variant_get (&uv, v); + const struct variable *var = psppire_dict_get_variable (store->dict, col); + psppire_data_store_set_value (store, row, var, &uv); + value_destroy_from_variant (&uv, v); +} + +void +psppire_data_editor_paste (PsppireDataEditor *de) +{ + JmdSheet *sheet = JMD_SHEET (de->data_sheet); + GtkClipboard *clip = + gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (sheet)), + GDK_SELECTION_CLIPBOARD); + + jmd_sheet_paste (sheet, clip, store_set_datum); }