From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 30 Jul 2007 09:28:35 +0000 (+0000)
Subject: Enabled output generation in the GUI.
X-Git-Tag: v0.6.0~337
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12219168a9ece27a11d652ae82c8e7d65e1be98f;p=pspp-builds.git

Enabled output generation in the GUI.
---

diff --git a/src/output/output.c b/src/output/output.c
index 3f1dd904..58750724 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -1096,10 +1096,10 @@ outp_drivers (struct outp_driver *d)
   return d;
 }
 
-/* Enables (if ENABLE is nonzero) or disables (if ENABLE is zero) the
+/* Enables (if ENABLE is true) or disables (if ENABLE is false) the
    device(s) given in mask DEVICE. */
 void
-outp_enable_device (int enable, int device)
+outp_enable_device (bool enable, int device)
 {
   if (enable)
     disabled_devices &= ~device;
diff --git a/src/output/output.h b/src/output/output.h
index 7215cb6c..f7504bce 100644
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -142,7 +142,7 @@ void outp_configure_macro (char *);
 
 void outp_list_classes (void);
 
-void outp_enable_device (int enable, int device);
+void outp_enable_device (bool enable, int device);
 struct outp_driver *outp_drivers (struct outp_driver *);
 
 bool outp_parse_options (struct substring options,
diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 4f0a0949..9d98f65b 100644
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-29  John Darrington <john@darrington.wattle.id.au>
+
+	* helper.c psppire.c: Enabled the output system so that the results
+	of analysis can be seen.
+
 2007-07-26  John Darrington <john@darrington.wattle.id.au>
 
 	* helper.c helper.h (execute_syntax): removed implicit EXECUTE at end 
diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 56684968..274635d7 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -40,6 +40,7 @@
 #include <data/procedure.h>
 #include <language/lexer/lexer.h>
 #include "psppire-data-store.h"
+#include <output/manager.h>
 
 
 #include <gettext.h>
@@ -199,6 +200,8 @@ execute_syntax (struct getl_interface *sss)
 
     psppire_data_store_set_case_file (the_data_store, pcf);
   }
+
+  som_flush ();
 }
 
 
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 05a1acc4..7a9c91c4 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -36,6 +36,7 @@
 #include <libpspp/getl.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/version.h>
+#include <output/output.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -80,6 +81,8 @@ initialize (void)
   glade_init ();
 
   fmt_init ();
+  fn_init ();
+  outp_init ();
   settings_init ();
   fh_init ();
   the_source_stream =
@@ -94,19 +97,19 @@ initialize (void)
 
   dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
 
-
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
-
   /* Create the model for the var_sheet */
   the_var_store = psppire_var_store_new (dictionary);
 
   the_data_store = psppire_data_store_new (dictionary);
   replace_casereader (NULL);
 
-
   create_icon_factory ();
 
+  outp_read_devices ();
+  outp_enable_device (true, OUTP_DEV_SCREEN);
+
   new_data_window (NULL, NULL);
 }
 
@@ -117,6 +120,7 @@ de_initialize (void)
   destroy_source_stream (the_source_stream);
   message_dialog_done ();
   settings_done ();
+  outp_done ();
 }