Implemented the paired samples t test dialog. Closes patch #6378

[pspp-builds.git] / src / ui / gui / compute-dialog.c

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index a74cc8dd601de843c9625dc08d6b810075550376..2dd1b8f628eacd41168adee33f2f127d15cc2e50 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-
+#include <config.h>
 #include <gtk/gtk.h>
 #include "compute-dialog.h"
 #include "helper.h"
@@ -34,12 +34,14 @@ static void function_list_populate (GtkTreeView *tv);
 
 static void insert_function_into_syntax_area (GtkTreeIter iter,
                                              GtkWidget *text_view,
-                                             GtkTreeModel *model
+                                             GtkTreeModel *model,
+                                             gpointer data
                                              );
 
 static void insert_source_row_into_text_view (GtkTreeIter iter,
                                              GtkWidget *dest,
-                                             GtkTreeModel *model
+                                             GtkTreeModel *model,
+                                             gpointer data
                                              );
 
 
@@ -48,6 +50,7 @@ struct compute_dialog
 {
   GladeXML *xml;  /* The xml that generated the widgets */
   PsppireDict *dict;
+  gboolean use_type;
 };
 
 
@@ -77,18 +80,15 @@ refresh (GObject *obj, const struct compute_dialog *cd)
 
   GtkTreeSelection *selection;
 
-
   /* Clear the target variable entry box */
   gtk_entry_set_text (GTK_ENTRY (target), "");
   g_signal_emit_by_name (target, "changed");
 
-
   /* Clear the syntax area textbuffer */
   gtk_text_buffer_get_start_iter (buffer, &start);
   gtk_text_buffer_get_end_iter (buffer, &end);
   gtk_text_buffer_delete (buffer, &start, &end);
 
-
   /* Unselect all items in the treeview */
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (varlist));
   gtk_tree_selection_unselect_all (selection);
@@ -178,7 +178,8 @@ generate_syntax (const struct compute_dialog *cd)
 
   string = g_string_sized_new (64);
 
-  if ( NULL == psppire_dict_lookup_var (cd->dict, target_name ))
+  if ( cd-> use_type &&
+       NULL == psppire_dict_lookup_var (cd->dict, target_name ))
     {
       if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle)))
        {
@@ -200,11 +201,13 @@ generate_syntax (const struct compute_dialog *cd)
                            target_name,
                            label);
 
-  g_string_append_printf (string, "COMPUTE %s = %s.",
+  g_string_append_printf (string, "COMPUTE %s = %s.\n",
                          target_name,
                          expression
                          );
 
+  g_string_append (string, "EXECUTE.\n");
+
   text = string->str;
 
   g_string_free (string, FALSE);
@@ -293,6 +296,8 @@ run_type_label_dialog (GtkButton *b, gpointer data)
 
   reset_type_label_dialog (cd);
   response = psppire_dialog_run (PSPPIRE_DIALOG (subdialog));
+  if ( response == PSPPIRE_RESPONSE_CONTINUE)
+    cd->use_type = TRUE;
 }
 
 
@@ -326,6 +331,28 @@ on_expression_toggle (GtkToggleButton *button, gpointer data)
     }
 }
 
+
+/* Return TRUE if the dialog box's widgets' state are such that clicking OK
+   might not result in erroneous syntax being generated */
+static gboolean
+contents_plausible (gpointer data)
+{
+  struct compute_dialog *cd = data;
+
+  GtkWidget *target      = get_widget_assert (cd->xml, "compute-entry1");
+  GtkWidget *syntax_area = get_widget_assert (cd->xml, "compute-textview1");
+  GtkTextBuffer *buffer  =
+    gtk_text_view_get_buffer (GTK_TEXT_VIEW (syntax_area));
+
+  if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (target))))
+    return FALSE;
+
+  if ( gtk_text_buffer_get_char_count (buffer) == 0 )
+    return FALSE;
+
+  return TRUE;
+}
+
 /* Pops up the Compute dialog box */
 void
 compute_dialog (GObject *o, gpointer data)
@@ -358,7 +385,9 @@ compute_dialog (GObject *o, gpointer data)
 
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
+
   scd.dict = vs->dict;
+  scd.use_type = FALSE;
 
   g_signal_connect (expression, "toggled",
                    G_CALLBACK(on_expression_toggle), &scd);
@@ -374,6 +403,7 @@ compute_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
                                 dict_view, syntax_area,
                                 insert_source_row_into_text_view,
+                                NULL,
                                 NULL);
 
 
@@ -382,11 +412,15 @@ compute_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
                                 functions, syntax_area,
                                 insert_function_into_syntax_area,
+                                NULL,
                                 NULL);
 
 
   scd.xml = xml;
 
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+                                     contents_plausible, &scd);
+
   g_signal_connect (target, "changed", G_CALLBACK (on_target_change), &scd);
 
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  &scd);
@@ -403,7 +437,6 @@ compute_dialog (GObject *o, gpointer data)
 
 
 
-  
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
 
@@ -498,7 +531,8 @@ function_list_populate (GtkTreeView *tv)
 static void
 insert_function_into_syntax_area (GtkTreeIter iter,
                                  GtkWidget *text_view,
-                                 GtkTreeModel *model
+                                 GtkTreeModel *model,
+                                 gpointer data
                                  )
 {
   GString *string;
@@ -561,7 +595,8 @@ insert_function_into_syntax_area (GtkTreeIter iter,
 static void
 insert_source_row_into_text_view (GtkTreeIter iter,
                                  GtkWidget *dest,
-                                 GtkTreeModel *model
+                                 GtkTreeModel *model,
+                                 gpointer data
                                  )
 {
   GtkTreePath *path;