projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0085c7e
)
Enabled output generation in the GUI.
author
John Darrington
<john@darrington.wattle.id.au>
Mon, 30 Jul 2007 09:28:35 +0000
(09:28 +0000)
committer
John Darrington
<john@darrington.wattle.id.au>
Mon, 30 Jul 2007 09:28:35 +0000
(09:28 +0000)
src/output/output.c
patch
|
blob
|
history
src/output/output.h
patch
|
blob
|
history
src/ui/gui/ChangeLog
patch
|
blob
|
history
src/ui/gui/helper.c
patch
|
blob
|
history
src/ui/gui/psppire.c
patch
|
blob
|
history
diff --git
a/src/output/output.c
b/src/output/output.c
index 3f1dd904b4746131a395c6d34b14e87b062463f2..58750724ccda57f332f48c79bead89c465158927 100644
(file)
--- a/
src/output/output.c
+++ b/
src/output/output.c
@@
-1096,10
+1096,10
@@
outp_drivers (struct outp_driver *d)
return 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
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;
{
if (enable)
disabled_devices &= ~device;
diff --git
a/src/output/output.h
b/src/output/output.h
index 7215cb6ca3797cb3f006437a9278791ed503854e..f7504bce0dba4dd48c80ac77c887d0da8c0cb12d 100644
(file)
--- 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_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,
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 4f0a0949f140e3c4e37b21bc4dd7487e69fdea07..9d98f65be80343570c5dfdee740243a00d3a6524 100644
(file)
--- 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
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 5668496833cdd975d1874be4c345de0db54e67d0..274635d7913b1412ce206416af7d393d64c1a4bb 100644
(file)
--- 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 <data/procedure.h>
#include <language/lexer/lexer.h>
#include "psppire-data-store.h"
+#include <output/manager.h>
#include <gettext.h>
#include <gettext.h>
@@
-199,6
+200,8
@@
execute_syntax (struct getl_interface *sss)
psppire_data_store_set_case_file (the_data_store, pcf);
}
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 05a1acc4b75b5cde56bf93d68ba6c063bdab18cf..7a9c91c435a086c466f8632b1e2ad6bc5acf2538 100644
(file)
--- 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 <libpspp/getl.h>
#include <language/lexer/lexer.h>
#include <libpspp/version.h>
+#include <output/output.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
@@
-80,6
+81,8
@@
initialize (void)
glade_init ();
fmt_init ();
glade_init ();
fmt_init ();
+ fn_init ();
+ outp_init ();
settings_init ();
fh_init ();
the_source_stream =
settings_init ();
fh_init ();
the_source_stream =
@@
-94,19
+97,19
@@
initialize (void)
dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
-
bind_textdomain_codeset (PACKAGE, "UTF-8");
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 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 ();
create_icon_factory ();
+ outp_read_devices ();
+ outp_enable_device (true, OUTP_DEV_SCREEN);
+
new_data_window (NULL, NULL);
}
new_data_window (NULL, NULL);
}
@@
-117,6
+120,7
@@
de_initialize (void)
destroy_source_stream (the_source_stream);
message_dialog_done ();
settings_done ();
destroy_source_stream (the_source_stream);
message_dialog_done ();
settings_done ();
+ outp_done ();
}
}