X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-factor.c;h=de78ae6c902d8dcbddcc3d3e41007c1b5d53a105;hb=5539849055ad928f536d192561cbbaab3b926180;hp=6b6144a6fb70559928cd8e3831d7f98396940799;hpb=e0d88baeadd6bc1eb1176da30de771ac9658f4c9;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-factor.c b/src/ui/gui/psppire-dialog-action-factor.c index 6b6144a6fb..de78ae6c90 100644 --- a/src/ui/gui/psppire-dialog-action-factor.c +++ b/src/ui/gui/psppire-dialog-action-factor.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation + Copyright (C) 2009, 2010, 2011, 2012, 2014 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 @@ -19,6 +19,8 @@ #include "psppire-dialog-action-factor.h" +#include + #include "psppire-var-view.h" #include "dialog-common.h" #include "psppire-selector.h" @@ -26,6 +28,7 @@ #include "psppire-dialog.h" #include "builder-wrapper.h" #include "psppire-scanf.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) @@ -53,74 +56,74 @@ on_extract_toggle (GtkToggleButton *button, PsppireDialogActionFactor *f) } static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionFactor *rd = PSPPIRE_DIALOG_ACTION_FACTOR (act); gchar *text = NULL; - GString *string = g_string_new ("FACTOR "); + struct string str; + ds_init_cstr (&str, "FACTOR "); - g_string_append (string, "\n\t/VARIABLES="); + ds_put_cstr (&str, "\n\t/VARIABLES="); - psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->variables), 0, string); + psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (rd->variables), 0, &str); - g_string_append (string, "\n\t/CRITERIA = "); + ds_put_cstr (&str, "\n\t/CRITERIA = "); if ( rd->extraction.explicit_nfactors ) - g_string_append_printf (string, "FACTORS (%d)", rd->extraction.n_factors); + ds_put_c_format (&str, "FACTORS (%d)", rd->extraction.n_factors); else - g_string_append_printf (string, "MINEIGEN (%g)", rd->extraction.mineigen); + ds_put_c_format (&str, "MINEIGEN (%.*g)", + DBL_DIG + 1, rd->extraction.mineigen); /* The CRITERIA = ITERATE subcommand is overloaded. It applies to the next /ROTATION and/or EXTRACTION command whatever comes first. */ - g_string_append_printf (string, " ITERATE (%d)", rd->extraction.n_iterations); + ds_put_c_format (&str, " ITERATE (%d)", rd->extraction.n_iterations); - g_string_append (string, "\n\t/EXTRACTION ="); + ds_put_cstr (&str, "\n\t/EXTRACTION ="); if ( rd->extraction.paf) - g_string_append (string, "PAF"); + ds_put_cstr (&str, "PAF"); else - g_string_append (string, "PC"); + ds_put_cstr (&str, "PC"); - g_string_append (string, "\n\t/METHOD = "); + ds_put_cstr (&str, "\n\t/METHOD = "); if ( rd->extraction.covariance ) - g_string_append (string, "COVARIANCE"); + ds_put_cstr (&str, "COVARIANCE"); else - g_string_append (string, "CORRELATION"); - - + ds_put_cstr (&str, "CORRELATION"); if ( rd->extraction.scree ) { - g_string_append (string, "\n\t/PLOT = "); - g_string_append (string, "EIGEN"); + ds_put_cstr (&str, "\n\t/PLOT = "); + ds_put_cstr (&str, "EIGEN"); } - g_string_append (string, "\n\t/PRINT = "); - g_string_append (string, "INITIAL "); + ds_put_cstr (&str, "\n\t/PRINT = "); + ds_put_cstr (&str, "INITIAL "); if ( rd->extraction.unrotated ) - g_string_append (string, "EXTRACTION "); + ds_put_cstr (&str, "EXTRACTION "); if ( rd->rotation.rotated_solution ) - g_string_append (string, "ROTATION"); + ds_put_cstr (&str, "ROTATION"); /* The CRITERIA = ITERATE subcommand is overloaded. It applies to the next /ROTATION and/or EXTRACTION command whatever comes first. */ - g_string_append_printf (string, "\n\t/CRITERIA = ITERATE (%d)", rd->rotation.iterations ); + ds_put_c_format (&str, "\n\t/CRITERIA = ITERATE (%d)", rd->rotation.iterations ); - g_string_append (string, "\n\t/ROTATION = "); - g_string_append (string, rot_method_syntax[rd->rotation.method]); + ds_put_cstr (&str, "\n\t/ROTATION = "); + ds_put_cstr (&str, rot_method_syntax[rd->rotation.method]); - g_string_append (string, "."); - text = string->str; + ds_put_cstr (&str, "."); + text = ds_steal_cstr (&str); - g_string_free (string, FALSE); + ds_destroy (&str); return text; } @@ -291,84 +294,89 @@ run_rotations_subdialog (PsppireDialogActionFactor *act) } static void -psppire_dialog_action_factor_activate (GtkAction *a) +psppire_dialog_action_factor_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionFactor *act = PSPPIRE_DIALOG_ACTION_FACTOR (a); GtkWidget *extraction_button ; GtkWidget *rotation_button ; - GtkBuilder *xml = builder_new ("factor.ui"); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("factor.ui"); + g_hash_table_insert (thing, a, xml); - pda->dialog = get_widget_assert (xml, "factor-dialog"); - pda->source = get_widget_assert (xml, "dict-view"); - extraction_button = get_widget_assert (xml, "button-extractions"); - rotation_button = get_widget_assert (xml, "button-rotations"); + pda->dialog = get_widget_assert (xml, "factor-dialog"); + pda->source = get_widget_assert (xml, "dict-view"); - act->extraction_dialog = get_widget_assert (xml, "extractions-dialog"); - act->rotation_dialog = get_widget_assert (xml, "rotations-dialog"); + extraction_button = get_widget_assert (xml, "button-extractions"); + rotation_button = get_widget_assert (xml, "button-rotations"); - act->variables = get_widget_assert (xml, "psppire-var-view1"); + act->extraction_dialog = get_widget_assert (xml, "extractions-dialog"); + act->rotation_dialog = get_widget_assert (xml, "rotations-dialog"); - { - GtkWidget *hbox = get_widget_assert (xml, "hbox6"); - GtkWidget *eigenvalue_extraction ; + act->variables = get_widget_assert (xml, "psppire-var-view1"); - act->mineigen_toggle = get_widget_assert (xml, "mineigen-radiobutton"); + { + GtkWidget *hbox = get_widget_assert (xml, "hbox6"); + GtkWidget *eigenvalue_extraction ; - eigenvalue_extraction = psppire_scanf_new (_("_Eigenvalues over %4.2f times the mean eigenvalue"), &act->mineigen); + act->mineigen_toggle = get_widget_assert (xml, "mineigen-radiobutton"); - g_object_set (eigenvalue_extraction, - "use-underline", TRUE, - "mnemonic-widget", act->mineigen_toggle, - NULL); + eigenvalue_extraction = psppire_scanf_new (_("_Eigenvalues over %4.2f times the mean eigenvalue"), &act->mineigen); - act->nfactors_toggle = get_widget_assert (xml, "nfactors-radiobutton"); - act->n_factors = get_widget_assert (xml, "spinbutton-nfactors"); - act->extract_iterations = get_widget_assert (xml, "spinbutton-extract-iterations"); - act->covariance_toggle = get_widget_assert (xml, "covariance-radiobutton"); - act->correlation_toggle = get_widget_assert (xml, "correlations-radiobutton"); + g_object_set (eigenvalue_extraction, + "use-underline", TRUE, + "mnemonic-widget", act->mineigen_toggle, + NULL); - act->scree_button = get_widget_assert (xml, "scree-button"); - act->unrotated_button = get_widget_assert (xml, "unrotated-button"); - act->extraction_combo = get_widget_assert (xml, "combobox1"); + act->nfactors_toggle = get_widget_assert (xml, "nfactors-radiobutton"); + act->n_factors = get_widget_assert (xml, "spinbutton-nfactors"); + act->extract_iterations = get_widget_assert (xml, "spinbutton-extract-iterations"); + act->covariance_toggle = get_widget_assert (xml, "covariance-radiobutton"); + act->correlation_toggle = get_widget_assert (xml, "correlations-radiobutton"); - gtk_container_add (GTK_CONTAINER (hbox), eigenvalue_extraction); + act->scree_button = get_widget_assert (xml, "scree-button"); + act->unrotated_button = get_widget_assert (xml, "unrotated-button"); + act->extraction_combo = get_widget_assert (xml, "combobox1"); - g_signal_connect (act->nfactors_toggle, "toggled", G_CALLBACK (on_extract_toggle), act); + gtk_container_add (GTK_CONTAINER (hbox), eigenvalue_extraction); - gtk_widget_show_all (eigenvalue_extraction); - } + g_signal_connect (act->nfactors_toggle, "toggled", G_CALLBACK (on_extract_toggle), act); - { - act->rotate_iterations = get_widget_assert (xml, "spinbutton-rot-iterations"); + gtk_widget_show_all (eigenvalue_extraction); + } + + { + act->rotate_iterations = get_widget_assert (xml, "spinbutton-rot-iterations"); - act->display_rotated_solution = get_widget_assert (xml, "checkbutton-rotated-solution"); + act->display_rotated_solution = get_widget_assert (xml, "checkbutton-rotated-solution"); - act->rotation_none = get_widget_assert (xml, "radiobutton-none"); - act->rotation_varimax = get_widget_assert (xml, "radiobutton-varimax"); - act->rotation_quartimax = get_widget_assert (xml, "radiobutton-quartimax"); - act->rotation_equimax = get_widget_assert (xml, "radiobutton-equimax"); - } + act->rotation_none = get_widget_assert (xml, "radiobutton-none"); + act->rotation_varimax = get_widget_assert (xml, "radiobutton-varimax"); + act->rotation_quartimax = get_widget_assert (xml, "radiobutton-quartimax"); + act->rotation_equimax = get_widget_assert (xml, "radiobutton-equimax"); + } - g_signal_connect_swapped (extraction_button, "clicked", - G_CALLBACK (run_extractions_subdialog), act); - g_signal_connect_swapped (rotation_button, "clicked", G_CALLBACK (run_rotations_subdialog), act); + g_signal_connect_swapped (extraction_button, "clicked", + G_CALLBACK (run_extractions_subdialog), act); + g_signal_connect_swapped (rotation_button, "clicked", G_CALLBACK (run_rotations_subdialog), act); + } psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid); psppire_dialog_action_set_refresh (pda, dialog_refresh); PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_factor_parent_class)->activate (pda); - - g_object_unref (xml); } static void psppire_dialog_action_factor_class_init (PsppireDialogActionFactorClass *class) { - GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_factor_activate; + psppire_dialog_action_set_activation (class, psppire_dialog_action_factor_activate); PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }