projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Create a new "struct fmt_affix" for prefix and suffix strings.
[pspp]
/
src
/
ui
/
gui
/
descriptives-dialog.c
diff --git
a/src/ui/gui/descriptives-dialog.c
b/src/ui/gui/descriptives-dialog.c
index a867fe016d05131f0ff759e3536118c5ae60c855..ef77246891f0549a4406ea336aa94b5fd1b45bef 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2010
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
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
@@
-18,11
+18,11
@@
#include "checkbox-treeview.h"
#include "descriptives-dialog.h"
#include "checkbox-treeview.h"
#include "descriptives-dialog.h"
+#include "psppire-var-view.h"
#include <gtk/gtk.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <stdlib.h>
-#include <language/syntax-string-source.h>
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
@@
-117,7
+117,7
@@
generate_syntax (const struct descriptives_dialog *scd)
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
-
append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (scd->stat_vars), 0, string
);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
@@
-176,6
+176,9
@@
generate_syntax (const struct descriptives_dialog *scd)
g_string_append (string, ".");
g_string_append (string, ".");
+ if (gtk_toggle_button_get_active (scd->save_z_scores))
+ g_string_append (string, "\nEXECUTE.");
+
text = string->str;
g_string_free (string, FALSE);
text = string->str;
g_string_free (string, FALSE);
@@
-199,42
+202,33
@@
dialog_state_valid (gpointer data)
/* Pops up the Descriptives dialog box */
void
/* Pops up the Descriptives dialog box */
void
-descriptives_dialog (
GObject *o, gpointer data
)
+descriptives_dialog (
PsppireDataWindow *de
)
{
gint response;
{
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct descriptives_dialog scd;
struct descriptives_dialog scd;
- GtkBuilder *xml = builder_new ("descriptives
-dialog
.ui");
+ GtkBuilder *xml = builder_new ("descriptives.ui");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
GtkWidget *source = get_widget_assert (xml, "all-variables");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
GtkWidget *source = get_widget_assert (xml, "all-variables");
- GtkWidget *selector = get_widget_assert (xml, "stat-var-selector");
GtkWidget *dest = get_widget_assert (xml, "stat-variables");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
PsppireVarStore *vs = NULL;
GtkWidget *dest = get_widget_assert (xml, "stat-variables");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
PsppireVarStore *vs = NULL;
+ PsppireDict *dict;
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &dict, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_set (source, "dictionary", vs->dict,
- "predicate", var_is_numeric, NULL);
-
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ g_object_set (source, "model", dict,
+ "predicate", var_is_numeric, NULL);
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
B_DS_DEFAULT,
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
B_DS_DEFAULT,
@@
-242,7
+236,9
@@
descriptives_dialog (GObject *o, gpointer data)
scd.stat_vars = GTK_TREE_VIEW (dest);
scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
scd.stat_vars = GTK_TREE_VIEW (dest);
scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
- scd.dict = vs->dict;
+
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+
scd.include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
scd.exclude_missing_listwise =
scd.include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
scd.exclude_missing_listwise =
@@
-261,21
+257,10
@@
descriptives_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
- paste_syntax_in_new_window (syntax);
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;
break;
default:
break;