Logistic Regression: Added options dialog box

[pspp] / src / ui / gui / psppire-dialog-action-logistic.c

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index fab3b15aa1e35dcd183b689283191041f317e2c3..d93a2f5b0c5e85fd871f7d6a4e6452af119c33d0 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -41,6 +41,16 @@ psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *cla
 
 G_DEFINE_TYPE (PsppireDialogActionLogistic, psppire_dialog_action_logistic, PSPPIRE_TYPE_DIALOG_ACTION);
 
+static void
+set_sensitivity_from_toggle (GtkToggleButton *togglebutton,  gpointer data)
+{
+  GtkWidget *w = data;
+  gboolean active = gtk_toggle_button_get_active (togglebutton);
+
+  gtk_widget_set_sensitive (w, active);
+}
+
+
 static gboolean
 dialog_state_valid (gpointer data)
 {
@@ -68,19 +78,72 @@ refresh (PsppireDialogAction *rd_)
 }
 
 
+static void
+on_opts_clicked (PsppireDialogActionLogistic *act)
+{
+  int ret;
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), act->conf);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->conf_entry), act->conf_level);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->const_checkbox), act->constant);
+
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->cut_point_entry), act->cut_point);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->iterations_entry), act->max_iterations);
+
+  
+  ret = psppire_dialog_run (PSPPIRE_DIALOG (act->opts_dialog));
+
+  if ( ret == PSPPIRE_RESPONSE_CONTINUE )
+    {
+      act->conf = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->conf_checkbox));
+      act->conf_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->conf_entry));
+      
+      act->constant = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->const_checkbox));
+
+      act->cut_point = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->cut_point_entry));
+      act->max_iterations = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->iterations_entry));
+    }
+}
+
+
 static void
 psppire_dialog_action_logistic_activate (GtkAction *a)
 {
   PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
+  GtkWidget *opts_button;
 
   GtkBuilder *xml = builder_new ("logistic.ui");
 
   pda->dialog = get_widget_assert   (xml, "logistic-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
+  act->cut_point = 0.5;
+  act->max_iterations = 20;
+  act->constant = true;
+  act->conf = false;
+  act->conf_level = 95;
 
   act->dep_var  = get_widget_assert   (xml, "dependent-entry");
   act->indep_vars  = get_widget_assert   (xml, "indep-view");
+  act->opts_dialog = get_widget_assert (xml, "options-dialog");
+  act->conf_checkbox = get_widget_assert (xml, "checkbutton2");
+  act->conf_entry = get_widget_assert (xml, "spinbutton1");
+  act->const_checkbox = get_widget_assert (xml, "checkbutton1");
+
+  act->iterations_entry = get_widget_assert (xml, "spinbutton3");
+  act->cut_point_entry = get_widget_assert (xml, "spinbutton2");
+
+  opts_button = get_widget_assert (xml, "options-button");
+
+  g_signal_connect_swapped (opts_button, "clicked",
+                           G_CALLBACK (on_opts_clicked),  act);
+
+  g_signal_connect (act->conf_checkbox, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),  
+                   act->conf_entry);
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), FALSE);
 
   g_object_unref (xml);
 
@@ -111,6 +174,21 @@ generate_syntax (PsppireDialogAction *a)
 
   psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
 
+  g_string_append (string, "\n\t/CRITERIA =");
+
+  g_string_append_printf (string, " CUT(%g)", rd->cut_point);
+  g_string_append_printf (string, " ITERATE(%d)", rd->max_iterations);
+
+  if (rd->conf)
+    {
+      g_string_append_printf (string, "\n\t/PRINT = CI(%g)", rd->conf_level);
+    }
+
+  if (rd->constant) 
+    g_string_append (string, "\n\t/NOORIGIN");
+  else
+    g_string_append (string, "\n\t/ORIGIN");
+
   g_string_append (string, ".\n");
 
   text = string->str;