From: John Darrington Date: Sun, 27 Dec 2009 17:25:26 +0000 (+0100) Subject: Added a menu entry and dialog box for the FACTOR command. X-Git-Tag: fc11-x64-build63~1 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86c375340d9440a413ed014a3db81987f7d66b95;p=pspp-builds.git Added a menu entry and dialog box for the FACTOR command. --- diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c index 9d3d944e..706e1d0d 100644 --- a/src/language/stats/factor.c +++ b/src/language/stats/factor.c @@ -546,7 +546,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) { lex_match (lexer, '/'); -#if FACTOR_FULLY_IMPLEMENTED + if (lex_match_id (lexer, "PLOT")) { lex_match (lexer, '='); @@ -555,9 +555,11 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "EIGEN")) { } +#if FACTOR_FULLY_IMPLEMENTED else if (lex_match_id (lexer, "ROTATION")) { } +#endif else { lex_error (lexer, NULL); @@ -565,9 +567,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) } } } - else -#endif - if (lex_match_id (lexer, "METHOD")) + else if (lex_match_id (lexer, "METHOD")) { lex_match (lexer, '='); while (lex_token (lexer) != '.' && lex_token (lexer) != '/') diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index b7d60a78..0a827a3a 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -58,6 +58,7 @@ UI_FILES = \ src/ui/gui/crosstabs.ui \ src/ui/gui/descriptives.ui \ src/ui/gui/examine.ui \ + src/ui/gui/factor.ui \ src/ui/gui/find.ui \ src/ui/gui/frequencies.ui \ src/ui/gui/message-dialog.ui \ @@ -133,6 +134,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/executor.h \ src/ui/gui/find-dialog.c \ src/ui/gui/find-dialog.h \ + src/ui/gui/factor-dialog.c \ + src/ui/gui/factor-dialog.h \ src/ui/gui/frequencies-dialog.c \ src/ui/gui/frequencies-dialog.h \ src/ui/gui/goto-case-dialog.c \ diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade index 8efdc12b..6c32014f 100644 --- a/src/ui/gui/data-editor.glade +++ b/src/ui/gui/data-editor.glade @@ -551,6 +551,13 @@ True + + + True + Factor _Analysis + True + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/factor-dialog.c b/src/ui/gui/factor-dialog.c new file mode 100644 index 00000000..1f543a61 --- /dev/null +++ b/src/ui/gui/factor-dialog.c @@ -0,0 +1,352 @@ +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2009 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "dialog-common.h" +#include +#include +#include + +#include "factor-dialog.h" +#include "psppire-selector.h" +#include "psppire-dictview.h" +#include "psppire-dialog.h" + +#include "psppire-data-window.h" +#include "psppire-var-view.h" + +#include "widget-io.h" + +#include "executor.h" +#include "helper.h" + +#include + +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + + +struct extraction_parameters +{ + gdouble mineigen; + gint n_factors; + gint iterations; + + gboolean explicit_nfactors; + gboolean covariance; + + gboolean scree; + gboolean unrotated; + + gboolean paf; +}; + + +static const struct extraction_parameters default_extraction_parameters = {1.0, 0, 25, FALSE, TRUE, FALSE, TRUE, FALSE}; + +struct factor +{ + GtkBuilder *xml; + PsppireDict *dict; + + GtkWidget *variables; + PsppireDataWindow *de ; + + /* The Extraction subdialog */ + GtkWidget *extraction_dialog; + + GtkWidget *n_factors; + GtkWidget *mineigen; + GtkWidget *iterations; + + GtkWidget *nfactors_toggle; + GtkWidget *mineigen_toggle; + + GtkWidget *covariance_toggle; + GtkWidget *correlation_toggle; + + GtkWidget *scree_button; + GtkWidget *unrotated_button; + + GtkWidget *extraction_combo; + + struct extraction_parameters extraction; +}; + +static void +load_extraction_parameters (struct factor *fd, const struct extraction_parameters *p) +{ + gtk_spin_button_set_value (GTK_SPIN_BUTTON (fd->mineigen), p->mineigen); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (fd->n_factors), p->n_factors); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (fd->iterations), p->iterations); + + if (p->explicit_nfactors) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->nfactors_toggle), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->mineigen_toggle), TRUE); + + if (p->covariance) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->covariance_toggle), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->correlation_toggle), TRUE); + + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->scree_button), p->scree); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->unrotated_button), p->unrotated); + + if ( p->paf ) + gtk_combo_box_set_active (GTK_COMBO_BOX (fd->extraction_combo), 1); + else + gtk_combo_box_set_active (GTK_COMBO_BOX (fd->extraction_combo), 0); + +} + +static void +set_extraction_parameters (struct extraction_parameters *p, const struct factor *fd) +{ + p->mineigen = gtk_spin_button_get_value (GTK_SPIN_BUTTON (fd->mineigen)); + p->n_factors = gtk_spin_button_get_value (GTK_SPIN_BUTTON (fd->n_factors)); + p->iterations = gtk_spin_button_get_value (GTK_SPIN_BUTTON (fd->iterations)); + + p->explicit_nfactors = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->nfactors_toggle)); + p->covariance = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->covariance_toggle)); + + p->scree = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->scree_button)); + p->unrotated = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->unrotated_button)); + + p->paf = (gtk_combo_box_get_active (GTK_COMBO_BOX (fd->extraction_combo)) == 1); +} + +static void run_extractions_subdialog (struct factor *fd) +{ + struct extraction_parameters *ex = &fd->extraction; + + gint response = psppire_dialog_run (PSPPIRE_DIALOG (fd->extraction_dialog)); + + if ( response == PSPPIRE_RESPONSE_CONTINUE ) + { + /* Set the parameters from their respective widgets */ + set_extraction_parameters (ex, fd); + } + else + { + /* Cancelled. Reset the widgets to their old state */ + load_extraction_parameters (fd, ex); + } +} + + +static char * generate_syntax (const struct factor *rd); + + +static void +refresh (struct factor *fd) +{ + GtkTreeModel *liststore = + gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables)); + gtk_list_store_clear (GTK_LIST_STORE (liststore)); + + load_extraction_parameters (fd, &default_extraction_parameters); +} + + +static gboolean +dialog_state_valid (gpointer data) +{ + struct factor *fd = data; + + GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables)); + + if (gtk_tree_model_iter_n_children (liststore, NULL) < 2) + return FALSE; + + return TRUE; +} + +static void +on_show (struct factor *fd, GtkWidget *dialog) +{ + GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables)); + + gint n_vars = gtk_tree_model_iter_n_children (liststore, NULL); + + gtk_spin_button_set_range (GTK_SPIN_BUTTON (fd->n_factors), 1, n_vars - 1); +} + + +static void +on_extract_toggle (GtkToggleButton *button, struct factor *f) +{ + gboolean active = gtk_toggle_button_get_active (button); + + gtk_widget_set_sensitive (GTK_WIDGET (f->n_factors), active); + gtk_widget_set_sensitive (GTK_WIDGET (f->mineigen), ! active); +} + +/* Pops up the Factor dialog box */ +void +factor_dialog (GObject *o, gpointer data) +{ + struct factor fd; + gint response; + + PsppireVarStore *vs; + + GtkWidget *dialog ; + GtkWidget *source ; + GtkWidget *extraction_button ; + + fd.xml = builder_new ("factor.ui"); + + dialog = get_widget_assert (fd.xml, "factor-dialog"); + source = get_widget_assert (fd.xml, "dict-view"); + extraction_button = get_widget_assert (fd.xml, "button-extraction"); + + fd.extraction_dialog = get_widget_assert (fd.xml, "extractions-dialog"); + + fd.de = PSPPIRE_DATA_WINDOW (data); + + g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh), &fd); + + { + GtkWidget *hbox = get_widget_assert (fd.xml, "hbox6"); + GtkWidget *eigenvalue_extraction = widget_scanf (_("Eigenvalues over %4.2f times the mean eigenvalue"), &fd.mineigen); + + fd.nfactors_toggle = get_widget_assert (fd.xml, "nfactors-radiobutton"); + fd.mineigen_toggle = get_widget_assert (fd.xml, "mineigen-radiobutton"); + fd.n_factors = get_widget_assert (fd.xml, "spinbutton-nfactors"); + fd.iterations = get_widget_assert (fd.xml, "spinbutton-iterations"); + fd.covariance_toggle = get_widget_assert (fd.xml, "covariance-radiobutton"); + fd.correlation_toggle = get_widget_assert (fd.xml, "correlations-radiobutton"); + + fd.scree_button = get_widget_assert (fd.xml, "scree-button"); + fd.unrotated_button = get_widget_assert (fd.xml, "unrotated-button"); + fd.extraction_combo = get_widget_assert (fd.xml, "combobox1"); + + gtk_container_add (GTK_CONTAINER (hbox), eigenvalue_extraction); + + g_signal_connect (fd.nfactors_toggle, "toggled", G_CALLBACK (on_extract_toggle), &fd); + + gtk_widget_show_all (eigenvalue_extraction); + } + + g_signal_connect_swapped (extraction_button, "clicked", G_CALLBACK (run_extractions_subdialog), &fd); + + g_signal_connect_swapped (fd.extraction_dialog, "show", G_CALLBACK (on_show), &fd); + + fd.variables = get_widget_assert (fd.xml, "psppire-var-view1"); + + g_object_get (fd.de->data_editor, "var-store", &vs, NULL); + + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de)); + gtk_window_set_transient_for (GTK_WINDOW (fd.extraction_dialog), GTK_WINDOW (fd.de)); + + g_object_get (vs, "dictionary", &fd.dict, NULL); + g_object_set (source, "model", fd.dict, NULL); + + + psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog), + dialog_state_valid, &fd); + + psppire_selector_set_allow (PSPPIRE_SELECTOR (get_widget_assert (fd.xml, "dep-selector")), + numeric_only); + + response = psppire_dialog_run (PSPPIRE_DIALOG (dialog)); + + switch (response) + { + case GTK_RESPONSE_OK: + { + gchar *syntax = generate_syntax (&fd); + + struct getl_interface *sss = create_syntax_string_source (syntax); + execute_syntax (sss); + + g_free (syntax); + } + break; + case PSPPIRE_RESPONSE_PASTE: + { + gchar *syntax = generate_syntax (&fd); + paste_syntax_in_new_window (syntax); + + g_free (syntax); + } + break; + default: + break; + } + + g_object_unref (fd.xml); +} + + + + +static char * +generate_syntax (const struct factor *rd) +{ + gchar *text; + + GString *string = g_string_new ("FACTOR "); + + g_string_append (string, "VARIABLES = "); + + psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->variables), 0, string); + + g_string_append (string, "\n\t/EXTRACTION ="); + if ( rd->extraction.paf) + g_string_append (string, "PAF"); + else + g_string_append (string, "PC"); + + + g_string_append (string, "\n\t/METHOD = "); + if ( rd->extraction.covariance ) + g_string_append (string, "COVARIANCE"); + else + g_string_append (string, "CORRELATION"); + + + g_string_append (string, "\n\t/CRITERIA = "); + if ( rd->extraction.explicit_nfactors ) + g_string_append_printf (string, "FACTORS (%d)", rd->extraction.n_factors); + else + g_string_append_printf (string, "MINEIGEN (%g)", rd->extraction.mineigen); + + + if ( rd->extraction.scree ) + { + g_string_append (string, "\n\t/PLOT = "); + g_string_append (string, "EIGEN"); + } + + g_string_append (string, "\n\t/PRINT = "); + g_string_append (string, "INITIAL "); + if ( rd->extraction.unrotated ) + g_string_append (string, "EXTRACTION "); + + + g_string_append (string, ".\n"); + + text = string->str; + + g_string_free (string, FALSE); + + return text; +} diff --git a/src/ui/gui/factor-dialog.h b/src/ui/gui/factor-dialog.h new file mode 100644 index 00000000..76b7ef9d --- /dev/null +++ b/src/ui/gui/factor-dialog.h @@ -0,0 +1,25 @@ +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2009 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef __FACTOR_DIALOG_H +#define __FACTOR_DIALOG_H + + +#include + +void factor_dialog (GObject *o, gpointer data); + +#endif diff --git a/src/ui/gui/factor.ui b/src/ui/gui/factor.ui new file mode 100644 index 00000000..2bf61b2b --- /dev/null +++ b/src/ui/gui/factor.ui @@ -0,0 +1,520 @@ + + + + + + + + + + + + + Principal Components Analysis + + + Principal Axis Factoring + + + + + Factor Analysis + True + Tabular + + + True + 2 + 2 + 5 + + + True + 5 + + + 1 + 2 + + + + + + True + spread + + + Descriptives... + False + True + True + + + False + False + 0 + + + + + Extraction... + True + True + True + + + False + False + 1 + + + + + + + + 2 + 1 + 2 + + 5 + 5 + + + + + True + + + True + True + never + automatic + in + + + True + True + True + 5 + False + False + + + + + 0 + + + + + True + 0.5 + 0 + + + True + True + True + 5 + dict-view + psppire-var-view1 + + + + + 1 + + + + + True + 0 + none + + + True + 12 + + + True + True + never + automatic + in + + + True + True + 5 + False + False + + + + + + + + + True + Variables: + True + + + + + 2 + + + + + 5 + 5 + + + + + + + Factor Analysis: Extraction + True + + + True + 2 + + + True + 5 + 5 + 5 + 5 + + + True + vertical + 5 + + + True + + + True + Method: + + + False + False + 0 + + + + + True + extraction-methods + 0 + + + + 0 + + + + + False + 1 + + + + + False + 0 + + + + + True + 5 + + + True + 0 + + + True + 12 + + + True + vertical + spread + + + Correlation matrix + True + True + False + True + + + False + False + 0 + + + + + Covariance matrix + True + True + False + True + correlations-radiobutton + + + False + False + 1 + + + + + + + + + True + Analyse + True + + + + + 0 + + + + + True + 0 + + + True + 12 + + + True + vertical + spread + + + Unrotatated factor solution + True + True + False + True + + + False + False + 0 + + + + + Scree plot + True + True + False + True + + + False + False + 1 + + + + + + + + + True + Display + True + + + + + 1 + + + + + 5 + 1 + + + + + True + 0 + + + True + 12 + + + True + vertical + + + True + + + True + True + False + True + True + nfactors-radiobutton + + + False + False + 0 + + + + + + + + 0 + + + + + True + + + True + True + False + True + + + False + False + 0 + + + + + True + 0 + Number of factors: + + + 1 + + + + + True + True + • + adjustment1 + True + + + 2 + + + + + 1 + + + + + + + + + True + Extract + True + + + + + 2 + + + + + True + + + True + Maximum iterations for convergence: + + + 0 + + + + + True + True + • + adjustment2 + + + 1 + + + + + False + 3 + + + + + + + 0 + + + + + True + 5 + 5 + PSPPIRE_BUTTON_CONTINUE_MASK | PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_HELP_MASK + + + False + False + end + 1 + + + + + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index e9a89465..564d91b1 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -58,6 +58,7 @@ #include "reliability-dialog.h" #include "roc-dialog.h" #include "correlation-dialog.h" +#include "factor-dialog.h" #include "oneway-anova-dialog.h" #include "t-test-independent-samples-dialog.h" #include "t-test-one-sample.h" @@ -1722,6 +1723,20 @@ psppire_data_window_init (PsppireDataWindow *de) G_CALLBACK (correlation_dialog), de); } + { + GtkAction *invoke_factor_dialog = + resolve_action (de->builder, "factor-analysis", NULL); + + g_object_set (invoke_factor_dialog, + "tooltip", _("Principal Axis Factoring and Principal Components Analysis"), + "stock-id", "pspp-factor", + NULL + ); + + g_signal_connect (invoke_factor_dialog, "activate", + G_CALLBACK (factor_dialog), de); + } + { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));