/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010 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
#include <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
-#include "helper.h"
-
-#include "text-data-import-dialog.h"
-
-
-#include <ui/syntax-gen.h>
-#include <language/syntax-string-source.h>
-#include <libpspp/message.h>
#include <stdlib.h>
-#include <data/procedure.h>
-
-#include "psppire.h"
-#include "psppire-window.h"
-#include "psppire-data-window.h"
-#include "psppire-syntax-window.h"
-
-#include "about.h"
-
-#include "goto-case-dialog.h"
-#include "weight-cases-dialog.h"
-#include "split-file-dialog.h"
-#include "transpose-dialog.h"
-#include "sort-cases-dialog.h"
-#include "select-cases-dialog.h"
-#include "compute-dialog.h"
-#include "find-dialog.h"
-#include "rank-dialog.h"
-#include "recode-dialog.h"
-#include "comments-dialog.h"
-#include "variable-info-dialog.h"
-#include "descriptives-dialog.h"
-#include "crosstabs-dialog.h"
-#include "frequencies-dialog.h"
-#include "examine-dialog.h"
-#include "regression-dialog.h"
-#include "reliability-dialog.h"
-#include "oneway-anova-dialog.h"
-#include "t-test-independent-samples-dialog.h"
-#include "t-test-one-sample.h"
-#include "t-test-paired-samples.h"
-
+#include "data/any-reader.h"
+#include "data/procedure.h"
+#include "language/syntax-string-source.h"
+#include "libpspp/message.h"
+#include "ui/gui/about.h"
+#include "ui/gui/comments-dialog.h"
+#include "ui/gui/compute-dialog.h"
+#include "ui/gui/correlation-dialog.h"
+#include "ui/gui/crosstabs-dialog.h"
+#include "ui/gui/descriptives-dialog.h"
+#include "ui/gui/examine-dialog.h"
+#include "ui/gui/executor.h"
+#include "ui/gui/factor-dialog.h"
+#include "ui/gui/find-dialog.h"
+#include "ui/gui/frequencies-dialog.h"
+#include "ui/gui/goto-case-dialog.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/oneway-anova-dialog.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-window.h"
+#include "ui/gui/psppire.h"
+#include "ui/gui/rank-dialog.h"
+#include "ui/gui/recode-dialog.h"
+#include "ui/gui/regression-dialog.h"
+#include "ui/gui/reliability-dialog.h"
+#include "ui/gui/roc-dialog.h"
+#include "ui/gui/select-cases-dialog.h"
+#include "ui/gui/sort-cases-dialog.h"
+#include "ui/gui/split-file-dialog.h"
+#include "ui/gui/t-test-independent-samples-dialog.h"
+#include "ui/gui/t-test-one-sample.h"
+#include "ui/gui/t-test-paired-samples.h"
+#include "ui/gui/text-data-import-dialog.h"
+#include "ui/gui/transpose-dialog.h"
+#include "ui/gui/variable-info-dialog.h"
+#include "ui/gui/weight-cases-dialog.h"
+#include "ui/syntax-gen.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
else
{
PsppireVarStore *vs = NULL;
+ PsppireDict *dict = NULL;
struct variable *var ;
gchar *text ;
g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &dict, NULL);
- var = psppire_dict_get_variable (vs->dict, filter_index);
+ var = psppire_dict_get_variable (dict, filter_index);
text = g_strdup_printf (_("Filter by %s"), var_get_name (var));
{
struct variable *var ;
PsppireVarStore *vs = NULL;
+ PsppireDict *dict = NULL;
gchar *text;
g_object_get (de->data_editor, "var-store", &vs, NULL);
-
- var = psppire_dict_get_variable (vs->dict, weight_index);
+ g_object_get (vs, "dictionary", &dict, NULL);
+
+ var = psppire_dict_get_variable (dict, weight_index);
text = g_strdup_printf (_("Weight by %s"), var_get_name (var));
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
- GtkFileFilter *filter = gtk_file_filter_new ();
+ GtkFileFilter *filter;
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Data and Syntax Files"));
+ gtk_file_filter_add_pattern (filter, "*.sav");
+ gtk_file_filter_add_pattern (filter, "*.SAV");
+ gtk_file_filter_add_pattern (filter, "*.por");
+ gtk_file_filter_add_pattern (filter, "*.POR");
+ gtk_file_filter_add_pattern (filter, "*.sps");
+ gtk_file_filter_add_pattern (filter, "*.SPS");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
gtk_file_filter_add_pattern (filter, "*.sav");
gtk_file_filter_add_pattern (filter, "*.SAV");
gtk_file_filter_add_pattern (filter, "*.POR");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
+ gtk_file_filter_add_pattern (filter, "*.sps");
+ gtk_file_filter_add_pattern (filter, "*.SPS");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All Files"));
gtk_file_filter_add_pattern (filter, "*");
/* Callback for the data_open action.
Prompts for a filename and opens it */
static void
-open_data_dialog (GtkAction *action, PsppireWindow *de)
+open_window (GtkAction *action, PsppireWindow *de)
{
GtkWidget *dialog = sysfile_chooser_dialog (de);
gchar *name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- psppire_window_load (de, name);
+ if (any_reader_may_open (name))
+ psppire_window_load (de, name);
+ else
+ open_syntax_window (name);
g_free (name);
}
insert_case (GtkAction *action, gpointer data)
{
PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data);
-
psppire_data_editor_insert_case (dw->data_editor);
}
(gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)),
_("Portable File"));
- gtk_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
- gtk_box_pack_start_defaults (GTK_BOX (vbox), button_por);
+ psppire_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
+ psppire_box_pack_start_defaults (GTK_BOX (vbox), button_por);
gtk_widget_show_all (vbox);
psppire_data_window_init (PsppireDataWindow *de)
{
PsppireVarStore *vs;
+ PsppireDict *dict = NULL;
GtkWidget *menubar;
GtkWidget *hb ;
g_assert(vs); /* Traps a possible bug in w32 build */
- g_signal_connect (vs->dict, "weight-changed",
+ g_object_get (vs, "dictionary", &dict, NULL);
+
+ g_signal_connect (dict, "weight-changed",
G_CALLBACK (on_weight_change),
de);
- g_signal_connect (vs->dict, "filter-changed",
+ g_signal_connect (dict, "filter-changed",
G_CALLBACK (on_filter_change),
de);
- g_signal_connect (vs->dict, "split-changed",
+ g_signal_connect (dict, "split-changed",
G_CALLBACK (on_split_change),
de);
GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open");
GtkAction *action_data_open =
- resolve_action (de->builder, "file_open_data", NULL);
+ resolve_action (de->builder, "file_open", NULL);
g_object_set (action_data_open,
- "tooltip", _("Open a data file"),
+ "tooltip", _("Open a data or syntax file"),
"stock-id", "gtk-open",
NULL);
g_signal_connect (action_data_open, "activate",
- G_CALLBACK (open_data_dialog), de);
+ G_CALLBACK (open_window), de);
g_signal_connect_swapped (toolbarbutton, "clicked",
G_CALLBACK (gtk_action_activate), action_data_open);
resolve_action (de->builder, "file_save_as", NULL);
g_object_set (action_data_save_as,
- "label", _("Save As"),
"tooltip", _("Save data to file"),
"stock-id", "gtk-save-as",
NULL);
G_CALLBACK (reliability_dialog), de);
}
+ {
+ GtkAction *invoke_roc_dialog =
+ resolve_action (de->builder, "roc-curve", NULL);
+
+ g_object_set (invoke_roc_dialog,
+ "tooltip", _("ROC Curve"),
+ "stock-id", "pspp-roc",
+ NULL
+ );
+
+ g_signal_connect (invoke_roc_dialog, "activate",
+ G_CALLBACK (roc_dialog), de);
+ }
+
+ {
+ GtkAction *invoke_correlation_dialog =
+ resolve_action (de->builder, "correlation", NULL);
+
+ g_object_set (invoke_correlation_dialog,
+ "tooltip", _("Bivariate Correlation"),
+ "stock-id", "pspp-correlation",
+ NULL
+ );
+
+ g_signal_connect (invoke_correlation_dialog, "activate",
+ G_CALLBACK (correlation_dialog), de);
+ }
+
+ {
+ GtkAction *invoke_factor_dialog =
+ resolve_action (de->builder, "factor-analysis", NULL);
+
+ g_object_set (invoke_factor_dialog,
+ "tooltip", _("Principal Axis Factoring and Principal Components Analysis"),
+ "stock-id", "pspp-factor",
+ NULL
+ );
+
+ g_signal_connect (invoke_factor_dialog, "activate",
+ G_CALLBACK (factor_dialog), de);
+ }
+
{
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
G_CALLBACK (create_syntax_window),
NULL);
- g_signal_connect (get_action_assert (de->builder,"file_open_syntax"),
- "activate",
- G_CALLBACK (open_syntax_window),
- de);
{
GtkAction *abt = get_action_assert (de->builder, "help_about");
de);
}
- de->data_sheet_variable_popup_menu =
- GTK_MENU (create_data_sheet_variable_popup_menu (de));
-
- de->var_sheet_variable_popup_menu =
- GTK_MENU (create_var_sheet_variable_popup_menu (de));
+ {
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
- de->data_sheet_cases_popup_menu =
- GTK_MENU (create_data_sheet_cases_popup_menu (de));
+ PSPPIRE_WINDOW (de)->menu =
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
+ }
{
- GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
+ GtkMenu *data_sheet_variable_popup_menu =
+ GTK_MENU (create_data_sheet_variable_popup_menu (de));
- PSPPIRE_WINDOW (de)->menu =
- GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
- }
+ GtkMenu *var_sheet_variable_popup_menu =
+ GTK_MENU (create_var_sheet_variable_popup_menu (de));
+ GtkMenu *data_sheet_cases_popup_menu =
+ GTK_MENU (create_data_sheet_cases_popup_menu (de));
- g_object_set (de->data_editor,
- "datasheet-column-menu", de->data_sheet_variable_popup_menu,
- "datasheet-row-menu", de->data_sheet_cases_popup_menu,
- "varsheet-row-menu", de->var_sheet_variable_popup_menu,
- NULL);
+ g_object_set (de->data_editor,
+ "datasheet-column-menu", data_sheet_variable_popup_menu,
+ "datasheet-row-menu", data_sheet_cases_popup_menu,
+ "varsheet-row-menu", var_sheet_variable_popup_menu,
+ NULL);
+ }
gtk_widget_show (GTK_WIDGET (de->data_editor));
gtk_widget_show (box);