PsppireDataSheet.c: Indicate filtered out cases in the row headers

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

diff --git a/src/ui/gui/psppire-dialog-action-chisquare.c b/src/ui/gui/psppire-dialog-action-chisquare.c
index 36c68c064e42d68f0c996eafb7f3ff07530a0c57..57f8250078c081022a6a7bb5d802e34de51158fa 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-chisquare.c
+++ b/src/ui/gui/psppire-dialog-action-chisquare.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010, 2011, 2012, 2013  Free Software Foundation
+   Copyright (C) 2010, 2011, 2012, 2013, 2014  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
@@ -19,6 +19,8 @@
 
 #include "psppire-dialog-action-chisquare.h"
 
+#include <float.h>
+
 #include "psppire-var-view.h"
 
 #include "psppire-dialog.h"
@@ -35,7 +37,7 @@ G_DEFINE_TYPE (PsppireDialogActionChisquare, psppire_dialog_action_chisquare, PS
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionChisquare *scd = PSPPIRE_DIALOG_ACTION_CHISQUARE (act);
 
@@ -49,8 +51,8 @@ generate_syntax (PsppireDialogAction *act)
   if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->range_button)))
     {
       ds_put_cstr (&dss, "(");
-      
-      ds_put_cstr (&dss, 
+
+      ds_put_cstr (&dss,
                       gtk_entry_get_text (GTK_ENTRY (scd->value_lower)));
 
       ds_put_cstr (&dss, ", ");
@@ -70,7 +72,7 @@ generate_syntax (PsppireDialogAction *act)
       ds_put_cstr (&dss, "\n\t");
       ds_put_cstr (&dss, "/EXPECTED = ");
 
-      
+
       for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(ls),
                                               &iter);
           ok;
@@ -80,7 +82,7 @@ generate_syntax (PsppireDialogAction *act)
 
          gtk_tree_model_get (GTK_TREE_MODEL (ls), &iter, 0, &v, -1);
 
-         ds_put_c_format (&dss, " %g", v);
+         ds_put_c_format (&dss, " %.*g", DBL_DIG + 1, v);
        }
     }
 
@@ -126,13 +128,13 @@ refresh (PsppireDialogAction *rd_)
   gtk_entry_set_text (GTK_ENTRY (csd->value_upper), "");
 }
 
-static void
-psppire_dialog_action_chisquare_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_chisquare_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a);
 
-  GtkBuilder *xml = builder_new ("chi-square.ui");
+  GtkBuilder *xml = builder_new ( "chi-square.ui");
 
   GtkWidget *range_table = get_widget_assert   (xml, "range-table");
   GtkWidget *values_acr = get_widget_assert   (xml, "psppire-acr1");
@@ -157,19 +159,17 @@ psppire_dialog_action_chisquare_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  g_object_unref (xml);
-
-  g_signal_connect (act->range_button, "toggled", 
-                   G_CALLBACK (set_sensitivity_from_toggle), 
+  g_signal_connect (act->range_button, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),
                    range_table);
 
 
-  g_signal_connect (act->values_button, "toggled", 
-                   G_CALLBACK (set_sensitivity_from_toggle), 
+  g_signal_connect (act->values_button, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),
                    values_acr);
 
-  g_signal_connect (act->values_button, "toggled", 
-                   G_CALLBACK (set_sensitivity_from_toggle), 
+  g_signal_connect (act->values_button, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),
                    expected_value_entry);
 
   psppire_acr_set_entry (PSPPIRE_ACR (values_acr),
@@ -177,17 +177,13 @@ psppire_dialog_action_chisquare_activate (GtkAction *a)
 
   psppire_acr_set_model(PSPPIRE_ACR (values_acr), act->expected_list);
 
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_chisquare_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_chisquare_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_chisquare_class_init (PsppireDialogActionChisquareClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_chisquare_activate;
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_chisquare_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }