X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fexecutor.c;h=9b4c4c91867744008484d3430af834f4faf7848b;hb=af8fe020fa47f88b896924092297fb40c7831b1e;hp=3afa1ecd022359d2b0e72468c962451fe0477fb4;hpb=2be9bee9da6a2ce27715e58128569594319abfa2;p=pspp diff --git a/src/ui/gui/executor.c b/src/ui/gui/executor.c index 3afa1ecd02..9b4c4c9186 100644 --- a/src/ui/gui/executor.c +++ b/src/ui/gui/executor.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2009, 2010 Free Software Foundation + Copyright (C) 2007, 2009, 2010, 2011, 2012 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 @@ -20,15 +20,13 @@ #include "data/dataset.h" #include "data/lazy-casereader.h" +#include "data/session.h" #include "language/command.h" #include "language/lexer/lexer.h" #include "libpspp/cast.h" #include "output/driver.h" #include "ui/gui/psppire-data-store.h" -#include "ui/gui/psppire-output-window.h" - -extern struct dataset *the_dataset; -extern PsppireDataStore *the_data_store; +#include "ui/gui/psppire.h" /* Lazy casereader callback function used by execute_syntax. */ static struct casereader * @@ -38,38 +36,94 @@ create_casereader_from_data_store (void *data_store_) return psppire_data_store_get_reader (data_store); } +/* Ensures that dataset DS has a name, because some parts of the GUI insist + upon this. */ +static void +name_dataset_cb (struct dataset *ds, void *aux UNUSED) +{ + if (dataset_name (ds)[0] == '\0') + { + struct session *session = dataset_session (ds); + char *dataset_name = session_generate_dataset_name (session); + dataset_set_name (ds, dataset_name); + free (dataset_name); + } +} + +static void +new_pdw_cb (struct dataset *ds, void *aux UNUSED) +{ + PsppireDataWindow *pdw = psppire_data_window_for_dataset (ds); + if (pdw == NULL) + pdw = PSPPIRE_DATA_WINDOW (psppire_data_window_new (ds)); + + switch (dataset_get_display (ds)) + { + case DATASET_ASIS: + break; + + case DATASET_FRONT: + gtk_widget_show (GTK_WIDGET (pdw)); + gtk_window_deiconify (GTK_WINDOW (pdw)); + gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (pdw))); + psppire_data_window_set_default (pdw); + break; + + case DATASET_MINIMIZED: + gtk_window_iconify (GTK_WINDOW (pdw)); + gtk_widget_show (GTK_WIDGET (pdw)); + psppire_data_window_undefault (pdw); + break; + + case DATASET_HIDDEN: + gtk_widget_hide (GTK_WIDGET (pdw)); + psppire_data_window_undefault (pdw); + break; + } + dataset_set_display (ds, DATASET_ASIS); +} + gboolean -execute_syntax (struct lex_reader *lex_reader) +execute_syntax (PsppireDataWindow *window, struct lex_reader *lex_reader) { struct lexer *lexer; gboolean retval = TRUE; - struct casereader *reader; - const struct caseproto *proto; - casenumber case_cnt; - unsigned long int lazy_serial; - - /* When the user executes a number of snippets of syntax in a - row, none of which read from the active file, the GUI becomes - progressively less responsive. The reason is that each syntax - execution encapsulates the active file data in another - datasheet layer. The cumulative effect of having a number of - layers of datasheets wastes time and space. - - To solve the problem, we use a "lazy casereader", a wrapper - around the casereader obtained from the data store, that - only actually instantiates that casereader when it is - needed. If the data store casereader is never needed, then - it is reused the next time syntax is run, without wrapping - it in another layer. */ - proto = psppire_data_store_get_proto (the_data_store); - case_cnt = psppire_data_store_get_case_count (the_data_store); - reader = lazy_casereader_create (proto, case_cnt, - create_casereader_from_data_store, - the_data_store, &lazy_serial); - proc_set_active_file_data (the_dataset, reader); - - g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE); + PsppireDataWindow *pdw, *next_pdw; + + ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows) + { + const struct caseproto *proto; + struct casereader *reader; + casenumber case_cnt; + + /* When the user executes a number of snippets of syntax in a + row, none of which read from the active dataset, the GUI becomes + progressively less responsive. The reason is that each syntax + execution encapsulates the active dataset data in another + datasheet layer. The cumulative effect of having a number of + layers of datasheets wastes time and space. + + To solve the problem, we use a "lazy casereader", a wrapper + around the casereader obtained from the data store, that + only actually instantiates that casereader when it is + needed. If the data store casereader is never needed, then + it is reused the next time syntax is run, without wrapping + it in another layer. */ + proto = psppire_data_store_get_proto (pdw->data_store); + case_cnt = psppire_data_store_get_case_count (pdw->data_store); + reader = lazy_casereader_create (proto, case_cnt, + create_casereader_from_data_store, + pdw->data_store, &pdw->lazy_serial); + dataset_set_source (pdw->dataset, reader); + + if (pdw == window) + session_set_active_dataset (the_session, pdw->dataset); + + g_return_val_if_fail (dataset_has_source (pdw->dataset), FALSE); + + pdw->dataset_seqno = dataset_seqno (pdw->dataset); + } lexer = lex_create (); psppire_set_lexer (lexer); @@ -77,7 +131,8 @@ execute_syntax (struct lex_reader *lex_reader) for (;;) { - enum cmd_result result = cmd_parse (lexer, the_dataset); + struct dataset *ds = session_active_dataset (the_session); + enum cmd_result result = cmd_parse (lexer, ds); if ( cmd_result_is_failure (result)) { @@ -90,17 +145,42 @@ execute_syntax (struct lex_reader *lex_reader) break; } - lex_destroy (lexer); - psppire_set_lexer (NULL); + session_for_each_dataset (the_session, name_dataset_cb, NULL); + + ll_for_each_safe (pdw, next_pdw, PsppireDataWindow, ll, &all_data_windows) + { + struct dataset *ds; + + ds = session_get_dataset_by_seqno (the_session, pdw->dataset_seqno); + if (ds != NULL) + { + struct casereader *reader; - proc_execute (the_dataset); + pdw->dataset = ds; + proc_execute (pdw->dataset); - psppire_dict_replace_dictionary (the_data_store->dict, - dataset_dict (the_dataset)); + psppire_dict_replace_dictionary (pdw->data_store->dict, + dataset_dict (pdw->dataset)); - reader = proc_extract_active_file_data (the_dataset); - if (!lazy_casereader_destroy (reader, lazy_serial)) - psppire_data_store_set_reader (the_data_store, reader); + reader = dataset_steal_source (pdw->dataset); + if (!lazy_casereader_destroy (reader, pdw->lazy_serial)) + psppire_data_store_set_reader (pdw->data_store, reader); + + g_object_set (G_OBJECT (pdw), "id", dataset_name (pdw->dataset), + (void *) NULL); + } + else + gtk_widget_destroy (GTK_WIDGET (pdw)); + } + + session_for_each_dataset (the_session, new_pdw_cb, NULL); + + /* Destroy the lexer only after obtaining the dataset, because the dataset + might depend on the lexer, if the casereader specifies inline data. (In + such a case then we'll always get an error message--the inline data is + missing, otherwise it would have been parsed in the loop above.) */ + lex_destroy (lexer); + psppire_set_lexer (NULL); output_flush (); @@ -110,15 +190,15 @@ execute_syntax (struct lex_reader *lex_reader) /* Executes null-terminated string SYNTAX as syntax. Returns SYNTAX. */ gchar * -execute_syntax_string (gchar *syntax) +execute_syntax_string (PsppireDataWindow *window, gchar *syntax) { - execute_const_syntax_string (syntax); + execute_const_syntax_string (window, syntax); return syntax; } /* Executes null-terminated string SYNTAX as syntax. */ void -execute_const_syntax_string (const gchar *syntax) +execute_const_syntax_string (PsppireDataWindow *window, const gchar *syntax) { - execute_syntax (lex_reader_for_string (syntax)); + execute_syntax (window, lex_reader_for_string (syntax, "UTF-8")); }