/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010, 2011 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
#include <stdlib.h>
#include "data/any-reader.h"
-#include "data/procedure.h"
-#include "language/syntax-string-source.h"
+#include "data/dataset.h"
+#include "language/lexer/lexer.h"
#include "libpspp/message.h"
-#include "ui/gui/help-menu.h"
+#include "ui/gui/aggregate-dialog.h"
+#include "ui/gui/binomial-dialog.h"
+#include "ui/gui/chi-square-dialog.h"
#include "ui/gui/comments-dialog.h"
#include "ui/gui/compute-dialog.h"
#include "ui/gui/correlation-dialog.h"
#include "ui/gui/find-dialog.h"
#include "ui/gui/frequencies-dialog.h"
#include "ui/gui/goto-case-dialog.h"
+#include "ui/gui/help-menu.h"
#include "ui/gui/helper.h"
+#include "ui/gui/k-related-dialog.h"
#include "ui/gui/oneway-anova-dialog.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-syntax-window.h"
static void
execute (void)
{
- struct getl_interface *sss = create_syntax_string_source ("EXECUTE.");
-
- execute_syntax (sss);
+ execute_const_syntax_string ("EXECUTE.");
}
static void
load_file (PsppireWindow *de, const gchar *file_name)
{
gchar *native_file_name;
- struct getl_interface *sss;
struct string filename;
+ gchar *syntax;
+ bool ok;
ds_init_empty (&filename);
g_free (native_file_name);
- sss = create_syntax_string_source ("GET FILE=%s.",
- ds_cstr (&filename));
-
+ syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
ds_destroy (&filename);
- if (execute_syntax (sss) )
- return TRUE;
-
- return FALSE;
+ ok = execute_syntax (lex_reader_for_string (syntax));
+ g_free (syntax);
+ return ok;
}
static GtkWidget *
gchar *name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- if (any_reader_may_open (name))
+ gchar *sysname = convert_glib_filename_to_system_filename (name, NULL);
+
+ if (any_reader_may_open (sysname))
psppire_window_load (de, name);
else
open_syntax_window (name);
+ g_free (sysname);
g_free (name);
}
break;
gchar *native_file_name = NULL;
gchar *file_name = NULL;
GString *fnx;
- struct getl_interface *sss;
struct string filename ;
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w);
+ gchar *syntax;
g_object_get (w, "filename", &file_name, NULL);
syntax_gen_string (&filename, ss_cstr (native_file_name));
g_free (native_file_name);
- if ( de->save_as_portable )
- {
- sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
- ds_cstr (&filename));
- }
- else
- {
- sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
- ds_cstr (&filename));
- }
+ syntax = g_strdup_printf ("%s OUTFILE=%s.",
+ de->save_as_portable ? "EXPORT" : "SAVE",
+ ds_cstr (&filename));
ds_destroy (&filename);
- execute_syntax (sss);
+ g_free (execute_syntax_string (syntax));
}
static void
display_dict (PsppireDataWindow *de)
{
-
- struct getl_interface *sss =
- create_syntax_string_source ("DISPLAY DICTIONARY.");
-
- execute_syntax (sss);
+ execute_const_syntax_string ("DISPLAY DICTIONARY.");
}
static void
if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
{
struct string filename;
- struct getl_interface *sss;
gchar *file_name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
gchar *native_file_name =
convert_glib_filename_to_system_filename (file_name, NULL);
+ gchar *syntax;
+
ds_init_empty (&filename);
syntax_gen_string (&filename, ss_cstr (native_file_name));
g_free (native_file_name);
- sss = create_syntax_string_source ("SYSFILE INFO %s.",
- ds_cstr (&filename));
- execute_syntax (sss);
+ syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename));
+ g_free (execute_syntax_string (syntax));
}
gtk_widget_destroy (dialog);
static void
new_file (PsppireDataWindow *de)
{
- struct getl_interface *sss =
- create_syntax_string_source ("NEW FILE.");
-
- execute_syntax (sss);
-
+ execute_const_syntax_string ("NEW FILE.");
psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL);
}
static void
psppire_data_window_init (PsppireDataWindow *de)
{
+ static const struct dataset_callbacks cbs =
+ {
+ set_unsaved, /* changed */
+ transformation_change_callback, /* transformations_changed */
+ };
+
PsppireVarStore *vs;
PsppireDict *dict = NULL;
g_signal_connect_swapped (the_data_store, "cases-deleted",
G_CALLBACK (set_unsaved), de);
- dataset_set_callback (the_dataset, set_unsaved, de);
+ dataset_set_callbacks (the_dataset, &cbs, de);
connect_help (de->builder);
g_signal_connect_swapped (de->data_editor, "data-available-changed",
G_CALLBACK (set_paste_menuitem_sensitivity), de);
- dataset_add_transform_change_callback (the_dataset,
- transformation_change_callback,
- de);
-
-
vs = the_var_store;
g_assert(vs); /* Traps a possible bug in w32 build */
connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog));
+ connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog));
+
connect_action (de, "data_sort-cases", G_CALLBACK (sort_cases_dialog));
+ connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog));
+
connect_action (de, "transform_compute", G_CALLBACK (compute_dialog));
connect_action (de, "edit_find", G_CALLBACK (find_dialog));
connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog));
+
connect_action (de, "utilities_variables", G_CALLBACK (variable_info_dialog));
connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog));
connect_action (de, "reliability", G_CALLBACK (reliability_dialog));
connect_action (de, "roc-curve", G_CALLBACK (roc_dialog));
-
+
connect_action (de, "correlation", G_CALLBACK (correlation_dialog));
connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog));
+
+ connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog));
+
+ connect_action (de, "binomial", G_CALLBACK (binomial_dialog));
+
+ connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog));
{
psppire_data_window_new (void)
{
return GTK_WIDGET (g_object_new (psppire_data_window_get_type (),
+ /* TRANSLATORS: This will form a filename. Please avoid whitespace. */
+ "filename", _("PSPP-data"),
"description", _("Data Editor"),
NULL));
}