[Pspp-cvs] pspp/src output/output.c output/output.h ui/gui...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/07/30 09:28:36

Modified files:
        src/output     : output.c output.h 
        src/ui/gui     : ChangeLog helper.c psppire.c 

Log message:
        Enabled output generation in the GUI.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/output.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/output.h?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.45&r2=1.46

Patches:
Index: output/output.c
===================================================================
RCS file: /sources/pspp/pspp/src/output/output.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- output/output.c     27 Jul 2007 22:59:32 -0000      1.23
+++ output/output.c     30 Jul 2007 09:28:35 -0000      1.24
@@ -1096,10 +1096,10 @@
   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;

Index: output/output.h
===================================================================
RCS file: /sources/pspp/pspp/src/output/output.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- output/output.h     27 Jul 2007 22:58:03 -0000      1.11
+++ output/output.h     30 Jul 2007 09:28:35 -0000      1.12
@@ -142,7 +142,7 @@
 
 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,

Index: ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- ui/gui/ChangeLog    26 Jul 2007 02:02:23 -0000      1.73
+++ ui/gui/ChangeLog    30 Jul 2007 09:28:36 -0000      1.74
@@ -1,3 +1,8 @@
+2007-07-29  John Darrington <address@hidden>
+
+       * helper.c psppire.c: Enabled the output system so that the results
+       of analysis can be seen.
+
 2007-07-26  John Darrington <address@hidden>
 
        * helper.c helper.h (execute_syntax): removed implicit EXECUTE at end 

Index: ui/gui/helper.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ui/gui/helper.c     26 Jul 2007 02:02:23 -0000      1.22
+++ ui/gui/helper.c     30 Jul 2007 09:28:36 -0000      1.23
@@ -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 @@
 
     psppire_data_store_set_case_file (the_data_store, pcf);
   }
+
+  som_flush ();
 }
 
 

Index: ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ui/gui/psppire.c    7 Jul 2007 06:14:29 -0000       1.45
+++ ui/gui/psppire.c    30 Jul 2007 09:28:36 -0000      1.46
@@ -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 @@
   glade_init ();
 
   fmt_init ();
+  fn_init ();
+  outp_init ();
   settings_init ();
   fh_init ();
   the_source_stream =
@@ -94,19 +97,19 @@
 
   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 @@
   destroy_source_stream (the_source_stream);
   message_dialog_done ();
   settings_done ();
+  outp_done ();
 }