#include "examine-dialog.h"
#include "regression-dialog.h"
#include "reliability-dialog.h"
+#include "roc-dialog.h"
+#include "correlation-dialog.h"
+#include "factor-dialog.h"
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
#include "t-test-one-sample.h"
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));
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);
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));