X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=9a3470ae4df8e90fea20069019d638ae3d95b39c;hb=a9b46fb9e208c694e39d6f173bfa6fe631a30129;hp=4a64cac3de0d184a15a957d915dbd8dfc85051a2;hpb=a69b63413accf01fefaac113d86c9f9c0a6c10b2;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 4a64cac3..9a3470ae 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation 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 @@ -21,10 +21,12 @@ #include #include "data/any-reader.h" -#include "data/procedure.h" -#include "language/syntax-string-source.h" +#include "data/dataset.h" +#include "language/lexer/lexer.h" #include "libpspp/message.h" -#include "ui/gui/help-menu.h" +#include "ui/gui/aggregate-dialog.h" +#include "ui/gui/binomial-dialog.h" +#include "ui/gui/chi-square-dialog.h" #include "ui/gui/comments-dialog.h" #include "ui/gui/compute-dialog.h" #include "ui/gui/correlation-dialog.h" @@ -36,7 +38,9 @@ #include "ui/gui/find-dialog.h" #include "ui/gui/frequencies-dialog.h" #include "ui/gui/goto-case-dialog.h" +#include "ui/gui/help-menu.h" #include "ui/gui/helper.h" +#include "ui/gui/k-related-dialog.h" #include "ui/gui/oneway-anova-dialog.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-syntax-window.h" @@ -183,9 +187,7 @@ set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) static void execute (void) { - struct getl_interface *sss = create_syntax_string_source ("EXECUTE."); - - execute_syntax (sss); + execute_const_syntax_string ("EXECUTE."); } static void @@ -350,8 +352,9 @@ static gboolean load_file (PsppireWindow *de, const gchar *file_name) { gchar *native_file_name; - struct getl_interface *sss; struct string filename; + gchar *syntax; + bool ok; ds_init_empty (&filename); @@ -362,15 +365,12 @@ load_file (PsppireWindow *de, const gchar *file_name) g_free (native_file_name); - sss = create_syntax_string_source ("GET FILE=%s.", - ds_cstr (&filename)); - + syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename)); ds_destroy (&filename); - if (execute_syntax (sss) ) - return TRUE; - - return FALSE; + ok = execute_syntax (lex_reader_for_string (syntax)); + g_free (syntax); + return ok; } static GtkWidget * @@ -457,11 +457,14 @@ open_window (PsppireWindow *de) gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (any_reader_may_open (name)) + gchar *sysname = convert_glib_filename_to_system_filename (name, NULL); + + if (any_reader_may_open (sysname)) psppire_window_load (de, name); else open_syntax_window (name); + g_free (sysname); g_free (name); } break; @@ -496,9 +499,9 @@ save_file (PsppireWindow *w) gchar *native_file_name = NULL; gchar *file_name = NULL; GString *fnx; - struct getl_interface *sss; struct string filename ; PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w); + gchar *syntax; g_object_get (w, "filename", &file_name, NULL); @@ -522,20 +525,13 @@ save_file (PsppireWindow *w) syntax_gen_string (&filename, ss_cstr (native_file_name)); g_free (native_file_name); - if ( de->save_as_portable ) - { - sss = create_syntax_string_source ("EXPORT OUTFILE=%s.", - ds_cstr (&filename)); - } - else - { - sss = create_syntax_string_source ("SAVE OUTFILE=%s.", - ds_cstr (&filename)); - } + syntax = g_strdup_printf ("%s OUTFILE=%s.", + de->save_as_portable ? "EXPORT" : "SAVE", + ds_cstr (&filename)); ds_destroy (&filename); - execute_syntax (sss); + g_free (execute_syntax_string (syntax)); } @@ -555,11 +551,7 @@ on_insert_variable (PsppireDataWindow *dw) static void display_dict (PsppireDataWindow *de) { - - struct getl_interface *sss = - create_syntax_string_source ("DISPLAY DICTIONARY."); - - execute_syntax (sss); + execute_const_syntax_string ("DISPLAY DICTIONARY."); } static void @@ -570,22 +562,22 @@ sysfile_info (PsppireDataWindow *de) if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) { struct string filename; - struct getl_interface *sss; gchar *file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); gchar *native_file_name = convert_glib_filename_to_system_filename (file_name, NULL); + gchar *syntax; + ds_init_empty (&filename); syntax_gen_string (&filename, ss_cstr (native_file_name)); g_free (native_file_name); - sss = create_syntax_string_source ("SYSFILE INFO %s.", - ds_cstr (&filename)); - execute_syntax (sss); + syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename)); + g_free (execute_syntax_string (syntax)); } gtk_widget_destroy (dialog); @@ -696,11 +688,7 @@ data_save (PsppireWindow *de) static void new_file (PsppireDataWindow *de) { - struct getl_interface *sss = - create_syntax_string_source ("NEW FILE."); - - execute_syntax (sss); - + execute_const_syntax_string ("NEW FILE."); psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL); } @@ -934,9 +922,30 @@ set_unsaved (gpointer w) psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); } + +/* Connects the action called ACTION_NAME to HANDLER passing DW as the auxilliary data. + Returns a pointer to the action +*/ +static GtkAction * +connect_action (PsppireDataWindow *dw, const char *action_name, + GCallback handler) +{ + GtkAction *action = get_action_assert (dw->builder, action_name); + + g_signal_connect_swapped (action, "activate", handler, dw); + + return action; +} + static void psppire_data_window_init (PsppireDataWindow *de) { + static const struct dataset_callbacks cbs = + { + set_unsaved, /* changed */ + transformation_change_callback, /* transformations_changed */ + }; + PsppireVarStore *vs; PsppireDict *dict = NULL; @@ -963,7 +972,7 @@ psppire_data_window_init (PsppireDataWindow *de) g_signal_connect_swapped (the_data_store, "cases-deleted", G_CALLBACK (set_unsaved), de); - dataset_set_callback (the_dataset, set_unsaved, de); + dataset_set_callbacks (the_dataset, &cbs, de); connect_help (de->builder); @@ -985,11 +994,6 @@ psppire_data_window_init (PsppireDataWindow *de) g_signal_connect_swapped (de->data_editor, "data-available-changed", G_CALLBACK (set_paste_menuitem_sensitivity), de); - dataset_add_transform_change_callback (the_dataset, - transformation_change_callback, - de); - - vs = the_var_store; g_assert(vs); /* Traps a possible bug in w32 build */ @@ -1009,40 +1013,31 @@ psppire_data_window_init (PsppireDataWindow *de) de); - g_signal_connect_swapped (get_action_assert (de->builder, "edit_copy"), "activate", G_CALLBACK (on_edit_copy), de); + connect_action (de, "edit_copy", G_CALLBACK (on_edit_copy)); - g_signal_connect_swapped (get_action_assert (de->builder, "edit_cut"), "activate", G_CALLBACK (on_edit_cut), de); + connect_action (de, "edit_cut", G_CALLBACK (on_edit_cut)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_new_data"),"activate", G_CALLBACK (new_file), de); + connect_action (de, "file_new_data", G_CALLBACK (new_file)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_import-text"), "activate", G_CALLBACK (text_data_import_assistant), de); + connect_action (de, "file_import-text", G_CALLBACK (text_data_import_assistant)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_save"),"activate", G_CALLBACK (data_save), de); + connect_action (de, "file_save", G_CALLBACK (data_save)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_open"), "activate", G_CALLBACK (open_window), de); + connect_action (de, "file_open", G_CALLBACK (open_window)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_save_as"), "activate", G_CALLBACK (data_save_as_dialog), de); + connect_action (de, "file_save_as", G_CALLBACK (data_save_as_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_information_working-file"), "activate", G_CALLBACK (display_dict), de); + connect_action (de, "file_information_working-file", G_CALLBACK (display_dict)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_information_external-file"), "activate", G_CALLBACK (sysfile_info), de); + connect_action (de, "file_information_external-file", G_CALLBACK (sysfile_info)); - g_signal_connect_swapped (get_action_assert (de->builder, "edit_paste"), "activate", G_CALLBACK (on_edit_paste), de); + connect_action (de, "edit_paste", G_CALLBACK (on_edit_paste)); - { - de->insert_case = get_action_assert (de->builder, "edit_insert-case"); - g_signal_connect_swapped (de->insert_case, "activate", G_CALLBACK (insert_case), de); - } + de->insert_case = connect_action (de, "edit_insert-case", G_CALLBACK (insert_case)); - { - de->insert_variable = get_action_assert (de->builder, "action_insert-variable"); - g_signal_connect_swapped (de->insert_variable, "activate", G_CALLBACK (on_insert_variable), de); - } + de->insert_variable = connect_action (de, "action_insert-variable", G_CALLBACK (on_insert_variable)); - { - de->invoke_goto_dialog = get_action_assert (de->builder, "edit_goto-case"); - g_signal_connect_swapped (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de); - } + de->invoke_goto_dialog = connect_action (de, "edit_goto-case", G_CALLBACK (goto_case_dialog)); g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), de); @@ -1064,53 +1059,64 @@ psppire_data_window_init (PsppireDataWindow *de) } - g_signal_connect_swapped (get_action_assert (de->builder, "data_transpose"), "activate", G_CALLBACK (transpose_dialog), de); + connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog)); + + connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); + + connect_action (de, "data_sort-cases", G_CALLBACK (sort_cases_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "data_sort-cases"), "activate", G_CALLBACK (sort_cases_dialog), de); + connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "transform_compute"), "activate", G_CALLBACK (compute_dialog), de); + connect_action (de, "transform_compute", G_CALLBACK (compute_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "edit_find"), "activate", G_CALLBACK (find_dialog), de); + connect_action (de, "edit_find", G_CALLBACK (find_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "data_split-file"), "activate", G_CALLBACK (split_file_dialog), de); + connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "data_weight-cases"), "activate", G_CALLBACK (weight_cases_dialog), de); + connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "utilities_variables"), "activate", G_CALLBACK (variable_info_dialog), de); + + connect_action (de, "utilities_variables", G_CALLBACK (variable_info_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "oneway-anova"), "activate", G_CALLBACK (oneway_anova_dialog), de); + connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "indep-t-test"), "activate", G_CALLBACK (t_test_independent_samples_dialog), de); + connect_action (de, "indep-t-test", G_CALLBACK (t_test_independent_samples_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "paired-t-test"), "activate", G_CALLBACK (t_test_paired_samples_dialog), de); + connect_action (de, "paired-t-test", G_CALLBACK (t_test_paired_samples_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "one-sample-t-test"), "activate", G_CALLBACK (t_test_one_sample_dialog), de); + connect_action (de, "one-sample-t-test", G_CALLBACK (t_test_one_sample_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "utilities_comments"), "activate", G_CALLBACK (comments_dialog), de); + connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "transform_rank"), "activate", G_CALLBACK (rank_dialog), de); + connect_action (de, "transform_rank", G_CALLBACK (rank_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "transform_recode-same"), "activate", G_CALLBACK (recode_same_dialog), de); + connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "transform_recode-different"), "activate", G_CALLBACK (recode_different_dialog), de); + connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "analyze_descriptives"), "activate", G_CALLBACK (descriptives_dialog), de); - - g_signal_connect_swapped (get_action_assert (de->builder, "analyze_frequencies"), "activate", G_CALLBACK (frequencies_dialog), de); + connect_action (de, "analyze_descriptives", G_CALLBACK (descriptives_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "crosstabs"), "activate", G_CALLBACK (crosstabs_dialog), de); + connect_action (de, "analyze_frequencies", G_CALLBACK (frequencies_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "analyze_explore"), "activate", G_CALLBACK (examine_dialog), de); + connect_action (de, "crosstabs", G_CALLBACK (crosstabs_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "linear-regression"), "activate", G_CALLBACK (regression_dialog), de); + connect_action (de, "analyze_explore", G_CALLBACK (examine_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "reliability"), "activate", G_CALLBACK (reliability_dialog), de); + connect_action (de, "linear-regression", G_CALLBACK (regression_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "roc-curve"), "activate", G_CALLBACK (roc_dialog), de); + connect_action (de, "reliability", G_CALLBACK (reliability_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "correlation"), "activate", G_CALLBACK (correlation_dialog), de); + connect_action (de, "roc-curve", G_CALLBACK (roc_dialog)); + + connect_action (de, "correlation", G_CALLBACK (correlation_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "factor-analysis"), "activate", G_CALLBACK (factor_dialog), de); + connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog)); + + connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog)); + + connect_action (de, "binomial", G_CALLBACK (binomial_dialog)); + + connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog)); { @@ -1164,8 +1170,7 @@ psppire_data_window_init (PsppireDataWindow *de) } - g_signal_connect_swapped (get_action_assert (de->builder,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL); - + connect_action (de, "file_new_syntax", G_CALLBACK (create_syntax_window)); g_signal_connect (de->data_editor, @@ -1186,21 +1191,21 @@ psppire_data_window_init (PsppireDataWindow *de) gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); - g_signal_connect_swapped (get_action_assert (de->builder, "view_statusbar"), "activate", G_CALLBACK (status_bar_activate), de); + connect_action (de, "view_statusbar", G_CALLBACK (status_bar_activate)); - g_signal_connect_swapped (get_action_assert (de->builder, "view_gridlines"), "activate", G_CALLBACK (grid_lines_activate), de); + connect_action (de, "view_gridlines", G_CALLBACK (grid_lines_activate)); - g_signal_connect_swapped (get_action_assert (de->builder, "view_data"), "activate", G_CALLBACK (data_view_activate), de); + connect_action (de, "view_data", G_CALLBACK (data_view_activate)); - g_signal_connect_swapped (get_action_assert (de->builder, "view_variables"), "activate", G_CALLBACK (variable_view_activate), de); + connect_action (de, "view_variables", G_CALLBACK (variable_view_activate)); - g_signal_connect_swapped (get_action_assert (de->builder, "view_fonts"), "activate", G_CALLBACK (fonts_activate), de); + connect_action (de, "view_fonts", G_CALLBACK (fonts_activate)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_quit"), "activate", G_CALLBACK (file_quit), de); + connect_action (de, "file_quit", G_CALLBACK (file_quit)); - g_signal_connect_swapped (get_action_assert (de->builder, "transform_run-pending"), "activate", G_CALLBACK (execute), de); + connect_action (de, "transform_run-pending", G_CALLBACK (execute)); - g_signal_connect_swapped (get_action_assert (de->builder, "windows_minimise_all"), "activate", G_CALLBACK (psppire_window_minimise_all), de); + connect_action (de, "windows_minimise_all", G_CALLBACK (psppire_window_minimise_all)); g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de); @@ -1247,6 +1252,8 @@ GtkWidget* psppire_data_window_new (void) { return GTK_WIDGET (g_object_new (psppire_data_window_get_type (), + /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ + "filename", _("PSPP-data"), "description", _("Data Editor"), NULL)); }