X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=e9a89465b4cf1c17cda74bd5356e9547cf5b296d;hb=ba03e6dae4d379b510b053c4df6d41277b456d3a;hp=1df084c1418c79339d458151ce25bb4ac4c07d82;hpb=73d03a239e23f6adb9b4c5a3596abed8c0198ca0;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 1df084c1..e9a89465 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -56,6 +56,8 @@
 #include "examine-dialog.h"
 #include "regression-dialog.h"
 #include "reliability-dialog.h"
+#include "roc-dialog.h"
+#include "correlation-dialog.h"
 #include "oneway-anova-dialog.h"
 #include "t-test-independent-samples-dialog.h"
 #include "t-test-one-sample.h"
@@ -231,12 +233,14 @@ on_filter_change (GObject *o, gint filter_index, gpointer data)
   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));
 
@@ -302,11 +306,13 @@ on_weight_change (GObject *o, gint weight_index, gpointer data)
     {
       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));
 
@@ -521,7 +527,6 @@ static void
 insert_case (GtkAction *action, gpointer data)
 {
   PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data);
-
   psppire_data_editor_insert_case (dw->data_editor);
 }
 
@@ -1091,6 +1096,7 @@ static void
 psppire_data_window_init (PsppireDataWindow *de)
 {
   PsppireVarStore *vs;
+  PsppireDict *dict = NULL;
 
   GtkWidget *menubar;
   GtkWidget *hb ;
@@ -1146,15 +1152,17 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   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);
 
@@ -1241,7 +1249,6 @@ psppire_data_window_init (PsppireDataWindow *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);
@@ -1687,6 +1694,34 @@ psppire_data_window_init (PsppireDataWindow *de)
 		      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);
+  }
+
 
   {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));