From 0bd0098aec2ee31d9460c8d4c1263d0b5ccc4324 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 29 Jan 2008 11:12:59 +0000 Subject: [PATCH] Implemented the paired samples t test dialog. Closes patch #6378 --- po/de.po | 294 ++++++------- po/en_GB.po | 290 ++++++------ src/ui/gui/ChangeLog | 13 + src/ui/gui/automake.mk | 4 + src/ui/gui/compute-dialog.c | 14 +- src/ui/gui/data-editor.c | 17 + src/ui/gui/data-editor.h | 1 + src/ui/gui/descriptives-dialog.c | 3 +- src/ui/gui/dialog-common.c | 21 +- src/ui/gui/dialog-common.h | 4 +- src/ui/gui/dict-display.c | 6 +- src/ui/gui/dict-display.h | 6 +- src/ui/gui/find-dialog.c | 3 +- src/ui/gui/frequencies-dialog.c | 3 +- src/ui/gui/oneway-anova-dialog.c | 6 +- src/ui/gui/psppire-dialog.c | 3 + src/ui/gui/psppire-selector.c | 25 +- src/ui/gui/psppire-selector.h | 8 +- src/ui/gui/rank-dialog.c | 6 +- src/ui/gui/recode-dialog.c | 3 +- src/ui/gui/select-cases-dialog.c | 3 +- src/ui/gui/sort-cases-dialog.c | 3 +- src/ui/gui/split-file-dialog.c | 3 +- .../gui/t-test-independent-samples-dialog.c | 6 +- src/ui/gui/t-test-one-sample.c | 3 +- src/ui/gui/t-test.glade | 416 ++++++++++++------ src/ui/gui/transpose-dialog.c | 6 +- src/ui/gui/weight-cases-dialog.c | 3 +- 28 files changed, 711 insertions(+), 462 deletions(-) diff --git a/po/de.po b/po/de.po index 4d0a33a3..ed0551e5 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2008-01-22 15:39+0900\n" +"POT-Creation-Date: 2008-01-29 19:25+0900\n" "PO-Revision-Date: 2006-07-28 19:32+0800\n" "Last-Translator: John Darrington \n" "Language-Team: German \n" @@ -47,12 +47,6 @@ msgstr "Tag %d muß zwischen 0 bit 31 sein." msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -73,6 +67,12 @@ msgstr "plotzlich ist der Datei beendet" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:254 src/data/data-in.c:444 msgid "Field contents are not numeric." msgstr "" @@ -320,14 +320,14 @@ msgid "%s variables are not compatible with %s format %s." msgstr "" #: src/data/format.c:330 src/data/sys-file-reader.c:639 -#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire.glade:2176 -#: src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/psppire.glade:2176 msgid "String" msgstr "Zeichenkette" #: src/data/format.c:330 src/data/sys-file-reader.c:639 -#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire.glade:2131 -#: src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/psppire.glade:2131 msgid "Numeric" msgstr "Nummer" @@ -1375,6 +1375,61 @@ msgstr "" msgid "Handle for %s not allowed here." msgstr "" +#: src/language/data-io/get-data.c:57 +#, c-format +msgid "Unsupported TYPE %s" +msgstr "" + +#: src/language/data-io/get-data.c:181 +#, c-format +msgid "" +"%s is allowed only with %s arrangement, but %s arrangement was stated or " +"implied earlier in this command." +msgstr "" + +#: src/language/data-io/get-data.c:236 +msgid "expecting FIXED or DELIMITED" +msgstr "" + +#: src/language/data-io/get-data.c:249 +msgid "Value of FIRSTCASE must be 1 or greater." +msgstr "" + +#: src/language/data-io/get-data.c:274 +msgid "expecting LINE or VARIABLES" +msgstr "" + +#: src/language/data-io/get-data.c:287 +msgid "Value of FIXCASE must be at least 1." +msgstr "" + +#: src/language/data-io/get-data.c:307 +msgid "Value of FIRST must be at least 1." +msgstr "" + +#: src/language/data-io/get-data.c:319 +msgid "Value of PERCENT must be between 1 and 100." +msgstr "" + +#: src/language/data-io/get-data.c:372 +msgid "expecting VARIABLES" +msgstr "" + +#: src/language/data-io/get-data.c:394 +#: src/language/data-io/placement-parser.c:376 +#, c-format +msgid "" +"The record number specified, %ld, is at or before the previous record, %d. " +"Data fields must be listed in order of increasing record number." +msgstr "" + +#: src/language/data-io/get-data.c:403 +#, c-format +msgid "" +"The record number specified, %ld, exceeds the number of records per case " +"specified on FIXCASE, %d." +msgstr "" + #: src/language/data-io/get.c:99 msgid "expecting COMM or TAPE" msgstr "" @@ -1464,61 +1519,6 @@ msgid "" "variable in earlier file (%s)." msgstr "" -#: src/language/data-io/get-data.c:57 -#, c-format -msgid "Unsupported TYPE %s" -msgstr "" - -#: src/language/data-io/get-data.c:181 -#, c-format -msgid "" -"%s is allowed only with %s arrangement, but %s arrangement was stated or " -"implied earlier in this command." -msgstr "" - -#: src/language/data-io/get-data.c:236 -msgid "expecting FIXED or DELIMITED" -msgstr "" - -#: src/language/data-io/get-data.c:249 -msgid "Value of FIRSTCASE must be 1 or greater." -msgstr "" - -#: src/language/data-io/get-data.c:274 -msgid "expecting LINE or VARIABLES" -msgstr "" - -#: src/language/data-io/get-data.c:287 -msgid "Value of FIXCASE must be at least 1." -msgstr "" - -#: src/language/data-io/get-data.c:307 -msgid "Value of FIRST must be at least 1." -msgstr "" - -#: src/language/data-io/get-data.c:319 -msgid "Value of PERCENT must be between 1 and 100." -msgstr "" - -#: src/language/data-io/get-data.c:372 -msgid "expecting VARIABLES" -msgstr "" - -#: src/language/data-io/get-data.c:394 -#: src/language/data-io/placement-parser.c:376 -#, c-format -msgid "" -"The record number specified, %ld, is at or before the previous record, %d. " -"Data fields must be listed in order of increasing record number." -msgstr "" - -#: src/language/data-io/get-data.c:403 -#, c-format -msgid "" -"The record number specified, %ld, exceeds the number of records per case " -"specified on FIXCASE, %d." -msgstr "" - #: src/language/data-io/inpt-pgm.c:129 msgid "Unexpected end-of-file within INPUT PROGRAM." msgstr "" @@ -1608,6 +1608,20 @@ msgstr "" msgid "The ending column for a field must be greater than the starting column." msgstr "" +#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476 +#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60 +msgid "expecting end of command" +msgstr "" + +#: src/language/data-io/print-space.c:116 +msgid "The expression on PRINT SPACE evaluated to the system-missing value." +msgstr "" + +#: src/language/data-io/print-space.c:119 +#, c-format +msgid "The expression on PRINT SPACE evaluated to %g." +msgstr "" + #: src/language/data-io/print.c:265 #, c-format msgid "Output calls for %d records but %zu specified on RECORDS subcommand." @@ -1627,20 +1641,6 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" -#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476 -#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60 -msgid "expecting end of command" -msgstr "" - -#: src/language/data-io/print-space.c:116 -msgid "The expression on PRINT SPACE evaluated to the system-missing value." -msgstr "" - -#: src/language/data-io/print-space.c:119 -#, c-format -msgid "The expression on PRINT SPACE evaluated to %g." -msgstr "" - #: src/language/dictionary/apply-dictionary.c:75 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -3320,6 +3320,22 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3344,22 +3360,6 @@ msgid "" "not match the number following (%zu)." msgstr "" -#: src/language/stats/npar-summary.c:108 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:145 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:148 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:151 -msgid "75th" -msgstr "" - #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -5378,15 +5378,6 @@ msgstr "xyzzy" msgid "Paste" msgstr "Datum" -#: src/ui/gui/psppire.c:198 -msgid "_Reset" -msgstr "_Zurücksetzen" - -#: src/ui/gui/psppire.c:199 -#, fuzzy -msgid "_Select" -msgstr "Schriftwahlung" - #: src/ui/gui/psppire-data-store.c:816 msgid "var" msgstr "" @@ -5396,6 +5387,33 @@ msgstr "" msgid "%ld" msgstr "" +#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 +msgid "None" +msgstr "Keine" + +#: src/ui/gui/psppire-var-store.c:489 +msgid "Scientific" +msgstr "Wissenschäflich" + +#: src/ui/gui/psppire-var-store.c:492 +msgid "Custom" +msgstr "Spezial" + +#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 +#: src/ui/gui/psppire-var-store.c:583 +#, c-format +msgid "%d" +msgstr "" + +#: src/ui/gui/psppire.c:198 +msgid "_Reset" +msgstr "_Zurücksetzen" + +#: src/ui/gui/psppire.c:199 +#, fuzzy +msgid "_Select" +msgstr "Schriftwahlung" + #: src/ui/gui/psppire.glade:11 #, fuzzy msgid "This is pre-alpha software. Use at your own risk." @@ -5635,24 +5653,6 @@ msgstr "" msgid "Search backward" msgstr "" -#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 -msgid "None" -msgstr "Keine" - -#: src/ui/gui/psppire-var-store.c:489 -msgid "Scientific" -msgstr "Wissenschäflich" - -#: src/ui/gui/psppire-var-store.c:492 -msgid "Custom" -msgstr "Spezial" - -#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 -#: src/ui/gui/psppire-var-store.c:583 -#, c-format -msgid "%d" -msgstr "" - #: src/ui/gui/rank.glade:111 msgid "By:" msgstr "" @@ -5932,6 +5932,11 @@ msgstr "" msgid "To End" msgstr "" +#: src/ui/gui/t-test-options.c:60 +#, c-format +msgid "Confidence Interval: %2d %%" +msgstr "" + #: src/ui/gui/t-test.glade:53 src/ui/gui/t-test.glade:161 msgid "Define Groups" msgstr "" @@ -5974,10 +5979,25 @@ msgstr "" msgid "Test Value: " msgstr "Werte:" -#: src/ui/gui/t-test-options.c:60 -#, c-format -msgid "Confidence Interval: %2d %%" -msgstr "" +#: src/ui/gui/var-sheet.c:65 +msgid "Name" +msgstr "Name" + +#: src/ui/gui/var-sheet.c:68 +msgid "Decimals" +msgstr "Dezimalstellen" + +#: src/ui/gui/var-sheet.c:70 +msgid "Values" +msgstr "Werten" + +#: src/ui/gui/var-sheet.c:73 +msgid "Align" +msgstr "Einstellung" + +#: src/ui/gui/var-sheet.c:74 +msgid "Measure" +msgstr "Messe" #: src/ui/gui/variable-info-dialog.c:88 #, fuzzy, c-format @@ -6009,26 +6029,6 @@ msgstr "Werten" msgid "%s %s\n" msgstr "" -#: src/ui/gui/var-sheet.c:65 -msgid "Name" -msgstr "Name" - -#: src/ui/gui/var-sheet.c:68 -msgid "Decimals" -msgstr "Dezimalstellen" - -#: src/ui/gui/var-sheet.c:70 -msgid "Values" -msgstr "Werten" - -#: src/ui/gui/var-sheet.c:73 -msgid "Align" -msgstr "Einstellung" - -#: src/ui/gui/var-sheet.c:74 -msgid "Measure" -msgstr "Messe" - #: src/ui/gui/weight-cases-dialog.c:88 #, c-format msgid "Weight cases by %s" diff --git a/po/en_GB.po b/po/en_GB.po index 47b71279..1d413ed7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2008-01-22 15:39+0900\n" +"POT-Creation-Date: 2008-01-29 19:25+0900\n" "PO-Revision-Date: 2007-09-15 08:29+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -44,12 +44,6 @@ msgstr "" msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -70,6 +64,12 @@ msgstr "" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:254 src/data/data-in.c:444 msgid "Field contents are not numeric." msgstr "" @@ -315,14 +315,14 @@ msgid "%s variables are not compatible with %s format %s." msgstr "" #: src/data/format.c:330 src/data/sys-file-reader.c:639 -#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire.glade:2176 -#: src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/psppire.glade:2176 msgid "String" msgstr "" #: src/data/format.c:330 src/data/sys-file-reader.c:639 -#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire.glade:2131 -#: src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/psppire.glade:2131 msgid "Numeric" msgstr "" @@ -1366,6 +1366,61 @@ msgstr "" msgid "Handle for %s not allowed here." msgstr "" +#: src/language/data-io/get-data.c:57 +#, c-format +msgid "Unsupported TYPE %s" +msgstr "" + +#: src/language/data-io/get-data.c:181 +#, c-format +msgid "" +"%s is allowed only with %s arrangement, but %s arrangement was stated or " +"implied earlier in this command." +msgstr "" + +#: src/language/data-io/get-data.c:236 +msgid "expecting FIXED or DELIMITED" +msgstr "" + +#: src/language/data-io/get-data.c:249 +msgid "Value of FIRSTCASE must be 1 or greater." +msgstr "" + +#: src/language/data-io/get-data.c:274 +msgid "expecting LINE or VARIABLES" +msgstr "" + +#: src/language/data-io/get-data.c:287 +msgid "Value of FIXCASE must be at least 1." +msgstr "" + +#: src/language/data-io/get-data.c:307 +msgid "Value of FIRST must be at least 1." +msgstr "" + +#: src/language/data-io/get-data.c:319 +msgid "Value of PERCENT must be between 1 and 100." +msgstr "" + +#: src/language/data-io/get-data.c:372 +msgid "expecting VARIABLES" +msgstr "" + +#: src/language/data-io/get-data.c:394 +#: src/language/data-io/placement-parser.c:376 +#, c-format +msgid "" +"The record number specified, %ld, is at or before the previous record, %d. " +"Data fields must be listed in order of increasing record number." +msgstr "" + +#: src/language/data-io/get-data.c:403 +#, c-format +msgid "" +"The record number specified, %ld, exceeds the number of records per case " +"specified on FIXCASE, %d." +msgstr "" + #: src/language/data-io/get.c:99 msgid "expecting COMM or TAPE" msgstr "" @@ -1455,61 +1510,6 @@ msgid "" "variable in earlier file (%s)." msgstr "" -#: src/language/data-io/get-data.c:57 -#, c-format -msgid "Unsupported TYPE %s" -msgstr "" - -#: src/language/data-io/get-data.c:181 -#, c-format -msgid "" -"%s is allowed only with %s arrangement, but %s arrangement was stated or " -"implied earlier in this command." -msgstr "" - -#: src/language/data-io/get-data.c:236 -msgid "expecting FIXED or DELIMITED" -msgstr "" - -#: src/language/data-io/get-data.c:249 -msgid "Value of FIRSTCASE must be 1 or greater." -msgstr "" - -#: src/language/data-io/get-data.c:274 -msgid "expecting LINE or VARIABLES" -msgstr "" - -#: src/language/data-io/get-data.c:287 -msgid "Value of FIXCASE must be at least 1." -msgstr "" - -#: src/language/data-io/get-data.c:307 -msgid "Value of FIRST must be at least 1." -msgstr "" - -#: src/language/data-io/get-data.c:319 -msgid "Value of PERCENT must be between 1 and 100." -msgstr "" - -#: src/language/data-io/get-data.c:372 -msgid "expecting VARIABLES" -msgstr "" - -#: src/language/data-io/get-data.c:394 -#: src/language/data-io/placement-parser.c:376 -#, c-format -msgid "" -"The record number specified, %ld, is at or before the previous record, %d. " -"Data fields must be listed in order of increasing record number." -msgstr "" - -#: src/language/data-io/get-data.c:403 -#, c-format -msgid "" -"The record number specified, %ld, exceeds the number of records per case " -"specified on FIXCASE, %d." -msgstr "" - #: src/language/data-io/inpt-pgm.c:129 msgid "Unexpected end-of-file within INPUT PROGRAM." msgstr "" @@ -1599,6 +1599,20 @@ msgstr "" msgid "The ending column for a field must be greater than the starting column." msgstr "" +#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476 +#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60 +msgid "expecting end of command" +msgstr "" + +#: src/language/data-io/print-space.c:116 +msgid "The expression on PRINT SPACE evaluated to the system-missing value." +msgstr "" + +#: src/language/data-io/print-space.c:119 +#, c-format +msgid "The expression on PRINT SPACE evaluated to %g." +msgstr "" + #: src/language/data-io/print.c:265 #, c-format msgid "Output calls for %d records but %zu specified on RECORDS subcommand." @@ -1618,20 +1632,6 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" -#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476 -#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60 -msgid "expecting end of command" -msgstr "" - -#: src/language/data-io/print-space.c:116 -msgid "The expression on PRINT SPACE evaluated to the system-missing value." -msgstr "" - -#: src/language/data-io/print-space.c:119 -#, c-format -msgid "The expression on PRINT SPACE evaluated to %g." -msgstr "" - #: src/language/dictionary/apply-dictionary.c:75 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -3311,6 +3311,22 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3335,22 +3351,6 @@ msgid "" "not match the number following (%zu)." msgstr "" -#: src/language/stats/npar-summary.c:108 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:145 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:148 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:151 -msgid "75th" -msgstr "" - #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -5322,14 +5322,6 @@ msgstr "" msgid "Paste" msgstr "" -#: src/ui/gui/psppire.c:198 -msgid "_Reset" -msgstr "" - -#: src/ui/gui/psppire.c:199 -msgid "_Select" -msgstr "" - #: src/ui/gui/psppire-data-store.c:816 msgid "var" msgstr "" @@ -5339,6 +5331,32 @@ msgstr "" msgid "%ld" msgstr "" +#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 +msgid "None" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:489 +msgid "Scientific" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:492 +msgid "Custom" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 +#: src/ui/gui/psppire-var-store.c:583 +#, c-format +msgid "%d" +msgstr "" + +#: src/ui/gui/psppire.c:198 +msgid "_Reset" +msgstr "" + +#: src/ui/gui/psppire.c:199 +msgid "_Select" +msgstr "" + #: src/ui/gui/psppire.glade:11 msgid "This is pre-alpha software. Use at your own risk." msgstr "" @@ -5563,24 +5581,6 @@ msgstr "" msgid "Search backward" msgstr "" -#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 -msgid "None" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:489 -msgid "Scientific" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:492 -msgid "Custom" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 -#: src/ui/gui/psppire-var-store.c:583 -#, c-format -msgid "%d" -msgstr "" - #: src/ui/gui/rank.glade:111 msgid "By:" msgstr "" @@ -5837,6 +5837,11 @@ msgstr "" msgid "To End" msgstr "" +#: src/ui/gui/t-test-options.c:60 +#, c-format +msgid "Confidence Interval: %2d %%" +msgstr "" + #: src/ui/gui/t-test.glade:53 src/ui/gui/t-test.glade:161 msgid "Define Groups" msgstr "" @@ -5877,9 +5882,24 @@ msgstr "" msgid "Test Value: " msgstr "" -#: src/ui/gui/t-test-options.c:60 -#, c-format -msgid "Confidence Interval: %2d %%" +#: src/ui/gui/var-sheet.c:65 +msgid "Name" +msgstr "" + +#: src/ui/gui/var-sheet.c:68 +msgid "Decimals" +msgstr "" + +#: src/ui/gui/var-sheet.c:70 +msgid "Values" +msgstr "" + +#: src/ui/gui/var-sheet.c:73 +msgid "Align" +msgstr "" + +#: src/ui/gui/var-sheet.c:74 +msgid "Measure" msgstr "" #: src/ui/gui/variable-info-dialog.c:88 @@ -5911,26 +5931,6 @@ msgstr "" msgid "%s %s\n" msgstr "" -#: src/ui/gui/var-sheet.c:65 -msgid "Name" -msgstr "" - -#: src/ui/gui/var-sheet.c:68 -msgid "Decimals" -msgstr "" - -#: src/ui/gui/var-sheet.c:70 -msgid "Values" -msgstr "" - -#: src/ui/gui/var-sheet.c:73 -msgid "Align" -msgstr "" - -#: src/ui/gui/var-sheet.c:74 -msgid "Measure" -msgstr "" - #: src/ui/gui/weight-cases-dialog.c:88 #, c-format msgid "Weight cases by %s" diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog index 82460740..91a21e9d 100644 --- a/src/ui/gui/ChangeLog +++ b/src/ui/gui/ChangeLog @@ -1,3 +1,16 @@ +2008-01-29 John Darrington + + * psppire-var-ptr.c psppire-var-ptr.h: New files + + * t-test-paired-samples.c t-test-paired-samples.h: New files + + * dialog-common.c dialog-common.h (append_variable_names): Add extra + argument to specify the column number containing the variables. + + * psppire-selector.c psppire-selector.h: Add auxilliary data variable + to SelectItemsFunc. (is_item_in_dest) transform model value to G_TYPE_INT + before using. Hence the model need not be of integer type. + 2008-01-22 John Darrington * psppire-dict.c (psppire_dict_rename_var): Fixed bug where diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index a3ad6e1f..70cfefdb 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -137,6 +137,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-keypad.h \ src/ui/gui/psppire-selector.c \ src/ui/gui/psppire-selector.h \ + src/ui/gui/psppire-var-ptr.c \ + src/ui/gui/psppire-var-ptr.h \ src/ui/gui/psppire-var-store.c \ src/ui/gui/psppire-var-store.h \ src/ui/gui/rank-dialog.c \ @@ -161,6 +163,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/t-test-one-sample.h \ src/ui/gui/t-test-options.c \ src/ui/gui/t-test-options.h \ + src/ui/gui/t-test-paired-samples.c \ + src/ui/gui/t-test-paired-samples.h \ src/ui/gui/val-labs-dialog.c \ src/ui/gui/val-labs-dialog.h \ src/ui/gui/var-display.c \ diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c index 553d55ff..2dd1b8f6 100644 --- a/src/ui/gui/compute-dialog.c +++ b/src/ui/gui/compute-dialog.c @@ -34,12 +34,14 @@ static void function_list_populate (GtkTreeView *tv); static void insert_function_into_syntax_area (GtkTreeIter iter, GtkWidget *text_view, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ); static void insert_source_row_into_text_view (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ); @@ -401,6 +403,7 @@ compute_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector), dict_view, syntax_area, insert_source_row_into_text_view, + NULL, NULL); @@ -409,6 +412,7 @@ compute_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector), functions, syntax_area, insert_function_into_syntax_area, + NULL, NULL); @@ -527,7 +531,8 @@ function_list_populate (GtkTreeView *tv) static void insert_function_into_syntax_area (GtkTreeIter iter, GtkWidget *text_view, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ) { GString *string; @@ -590,7 +595,8 @@ insert_function_into_syntax_area (GtkTreeIter iter, static void insert_source_row_into_text_view (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ) { GtkTreePath *path; diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c index cda87a10..6f279e8f 100644 --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@ -50,6 +50,7 @@ #include "oneway-anova-dialog.h" #include "t-test-independent-samples-dialog.h" #include "t-test-one-sample.h" +#include "t-test-paired-samples.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -613,6 +614,16 @@ new_data_editor (void) G_CALLBACK (t_test_independent_samples_dialog), de); + de->invoke_t_test_paired_samples_dialog = + gtk_action_new ("t-test-paired-samples", + _("_Paired Samples T Test"), + _("Calculate T Test for paired samples"), + NULL); + + g_signal_connect (de->invoke_t_test_paired_samples_dialog, "activate", + G_CALLBACK (t_test_paired_samples_dialog), de); + + de->invoke_t_test_one_sample_dialog = gtk_action_new ("t-test-one-sample", _("One _Sample T Test"), @@ -829,6 +840,12 @@ new_data_editor (void) ); + gtk_action_connect_proxy (de->invoke_t_test_paired_samples_dialog, + get_widget_assert (de->xml, + "paired-t-test") + ); + + gtk_action_connect_proxy (de->invoke_t_test_one_sample_dialog, get_widget_assert (de->xml, "one-sample-t-test") diff --git a/src/ui/gui/data-editor.h b/src/ui/gui/data-editor.h index 97c7c1ec..e472bfa1 100644 --- a/src/ui/gui/data-editor.h +++ b/src/ui/gui/data-editor.h @@ -50,6 +50,7 @@ struct data_editor GtkAction *invoke_frequencies_dialog; GtkAction *invoke_t_test_independent_samples_dialog; + GtkAction *invoke_t_test_paired_samples_dialog; GtkAction *invoke_oneway_anova_dialog; GtkAction *invoke_t_test_one_sample_dialog; diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c index 4697c9fd..af55abd6 100644 --- a/src/ui/gui/descriptives-dialog.c +++ b/src/ui/gui/descriptives-dialog.c @@ -118,7 +118,7 @@ generate_syntax (const struct descriptives_dialog *scd) string = g_string_new ("DESCRIPTIVES"); g_string_append (string, "\n /VARIABLES="); - append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars)); + append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars), 0); listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise); include = gtk_toggle_button_get_active (scd->include_user_missing); @@ -235,6 +235,7 @@ descriptives_dialog (GObject *o, gpointer data) source, dest, insert_source_row_into_tree_view, + NULL, NULL); put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview), diff --git a/src/ui/gui/dialog-common.c b/src/ui/gui/dialog-common.c index b4a12723..fe2c7937 100644 --- a/src/ui/gui/dialog-common.c +++ b/src/ui/gui/dialog-common.c @@ -15,18 +15,22 @@ along with this program. If not, see . */ #include + #include "dialog-common.h" +#include "psppire-var-ptr.h" + #include "helper.h" /* Append the names of selected variables to STRING. TREEVIEW is the treeview containing the variables. + COLUMN is the column in the treeview containing the variables. DICT is the dictionary for those variables. */ gint append_variable_names (GString *string, - PsppireDict *dict, GtkTreeView *treeview) + PsppireDict *dict, GtkTreeView *treeview, gint column) { gint n_vars = 0; GtkTreeIter iter; @@ -39,12 +43,23 @@ append_variable_names (GString *string, do { GValue value = {0}; - struct variable *var; + struct variable *var = NULL; GtkTreePath *path = gtk_tree_model_get_path (list_store, &iter); - gtk_tree_model_get_value (list_store, &iter, 0, &value); + gtk_tree_model_get_value (list_store, &iter, column, &value); + /* FIXME: G_TYPE_INT should be deprecated. + As well as being simpler, it'd be unecessary to pass dict */ + if ( G_VALUE_TYPE (&value) == G_TYPE_INT ) var = psppire_dict_get_variable (dict, g_value_get_int (&value)); + + else if ( G_VALUE_TYPE (&value) == PSPPIRE_VAR_PTR_TYPE) + var = g_value_get_boxed (&value); + + else + g_critical ("Unsupported type \"%s\", in variable name treeview.", + G_VALUE_TYPE_NAME (&value)); + g_value_unset (&value); g_string_append (string, " "); diff --git a/src/ui/gui/dialog-common.h b/src/ui/gui/dialog-common.h index 1e66c8f8..9a003f35 100644 --- a/src/ui/gui/dialog-common.h +++ b/src/ui/gui/dialog-common.h @@ -25,9 +25,11 @@ /* Append the names of selected variables to STRING. TREEVIEW is the treeview containing the variables. + COLUMN is column in treeview containing the variables. DICT is the dictionary for those variables. */ -gint append_variable_names (GString *, PsppireDict *, GtkTreeView *); +gint append_variable_names (GString *string, PsppireDict *dict, + GtkTreeView *treeview, gint column); /* Returns the variable currently selected by the iterator diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c index d54583b8..1c2858d6 100644 --- a/src/ui/gui/dict-display.c +++ b/src/ui/gui/dict-display.c @@ -225,7 +225,8 @@ attach_dictionary_to_treeview (GtkTreeView *treeview, PsppireDict *dict, void insert_source_row_into_entry (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ) { GtkTreePath *path; @@ -257,7 +258,8 @@ insert_source_row_into_entry (GtkTreeIter iter, void insert_source_row_into_tree_view (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ) { GtkTreePath *path; diff --git a/src/ui/gui/dict-display.h b/src/ui/gui/dict-display.h index afb6c8a9..a9481c6d 100644 --- a/src/ui/gui/dict-display.h +++ b/src/ui/gui/dict-display.h @@ -39,14 +39,16 @@ void attach_dictionary_to_treeview (GtkTreeView *treeview, PsppireDict *dict, /* A SelectItemsFunc function for GtkTreeView widgets */ void insert_source_row_into_tree_view (GtkTreeIter source_iter, GtkWidget *dest, - GtkTreeModel *source_model + GtkTreeModel *source_model, + gpointer data ); /* A SelectItemsFunc function for GtkEntry widgets */ void insert_source_row_into_entry (GtkTreeIter source_iter, GtkWidget *dest, - GtkTreeModel *source_model + GtkTreeModel *source_model, + gpointer data ); diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index 508c4ae7..088cac8d 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -251,7 +251,8 @@ find_dialog (GObject *o, gpointer data) source, fd.variable_entry, insert_source_row_into_entry, - is_currently_in_entry + is_currently_in_entry, + NULL ); g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &fd); diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c index 3f955bbc..d7ce37c3 100644 --- a/src/ui/gui/frequencies-dialog.c +++ b/src/ui/gui/frequencies-dialog.c @@ -148,7 +148,7 @@ generate_syntax (const struct frequencies_dialog *fd) GString *string = g_string_new ("FREQUENCIES"); g_string_append (string, "\n\t/VARIABLES="); - append_variable_names (string, fd->dict, GTK_TREE_VIEW (fd->stat_vars)); + append_variable_names (string, fd->dict, GTK_TREE_VIEW (fd->stat_vars), 0); g_string_append (string, "\n\t/FORMAT="); @@ -348,6 +348,7 @@ frequencies_dialog (GObject *o, gpointer data) source, dest, insert_source_row_into_tree_view, + NULL, NULL); diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c index b3cff6be..be281f7c 100644 --- a/src/ui/gui/oneway-anova-dialog.c +++ b/src/ui/gui/oneway-anova-dialog.c @@ -184,13 +184,15 @@ oneway_anova_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1), dict_view, ow.vars_treeview, insert_source_row_into_tree_view, + NULL, NULL); psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2), dict_view, ow.factor_entry, insert_source_row_into_entry, - is_currently_in_entry); + is_currently_in_entry, + NULL); @@ -271,7 +273,7 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow) GString *str = g_string_new ("ONEWAY /VARIABLES="); - append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview)); + append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview), 0); g_string_append (str, " BY "); diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index b0d8a7a3..25af04c9 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -373,6 +373,8 @@ connect_notify_signal (GtkWidget *w, gpointer data) GtkTreeViewColumn *col; GtkTreeModel *model = gtk_tree_view_get_model (tv); + if ( model) + { g_signal_connect_swapped (model, "row-changed", G_CALLBACK (psppire_dialog_notify_change), dialog); @@ -384,6 +386,7 @@ connect_notify_signal (GtkWidget *w, gpointer data) g_signal_connect_swapped (model, "row-inserted", G_CALLBACK (psppire_dialog_notify_change), dialog); + } g_signal_connect_swapped (selection, "changed", G_CALLBACK (psppire_dialog_notify_change), diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c index 9acc2829..2f9dbe06 100644 --- a/src/ui/gui/psppire-selector.c +++ b/src/ui/gui/psppire-selector.c @@ -465,7 +465,9 @@ select_selection (PsppireSelector *selector) selector->select_items (child_iter, selector->dest, - childmodel); + childmodel, + selector->select_user_data + ); } g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); @@ -549,10 +551,21 @@ is_item_in_dest (GtkTreeModel *model, GtkTreeIter *iter, do { + int x; GValue value = {0}; + GValue int_value = {0}; gtk_tree_model_get_value (dest_model, &dest_iter, 0, &value); - if ( g_value_get_int (&value) == index) + g_value_init (&int_value, G_TYPE_INT); + + g_value_transform (&value, &int_value); + + x = g_value_get_int (&int_value); + + g_value_unset (&int_value); + g_value_unset (&value); + + if ( x == index ) return TRUE; } while (gtk_tree_model_iter_next (dest_model, &dest_iter)); @@ -772,7 +785,8 @@ psppire_selector_set_subjects (PsppireSelector *selector, GtkWidget *source, GtkWidget *dest, SelectItemsFunc *select_func, - FilterItemsFunc *filter_func ) + FilterItemsFunc *filter_func, + gpointer user_data) { g_assert(selector); @@ -780,6 +794,7 @@ psppire_selector_set_subjects (PsppireSelector *selector, selector->source = source; selector->dest = dest; + selector->select_user_data = user_data; if ( filter_func == NULL) { @@ -794,7 +809,9 @@ psppire_selector_set_subjects (PsppireSelector *selector, g_assert ( GTK_IS_TREE_MODEL_FILTER (selector->filtered_source)); - if ( GTK_IS_TREE_VIEW (dest)) + if ( NULL == dest) + ; + else if ( GTK_IS_TREE_VIEW (dest)) set_tree_view_dest (selector, GTK_TREE_VIEW (dest)); else if ( GTK_IS_ENTRY (dest)) diff --git a/src/ui/gui/psppire-selector.h b/src/ui/gui/psppire-selector.h index 6385c14c..bdd358eb 100644 --- a/src/ui/gui/psppire-selector.h +++ b/src/ui/gui/psppire-selector.h @@ -46,7 +46,8 @@ typedef struct _PsppireSelectorClass PsppireSelectorClass; /* Function for appending selected items to the destination widget */ typedef void SelectItemsFunc (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *source_model); + GtkTreeModel *source_model, + gpointer data); /* Function to determine if items may be selected */ typedef gboolean AllowSelectionFunc (GtkWidget *src, GtkWidget *dest); @@ -91,6 +92,8 @@ struct _PsppireSelector GtkTreeModelFilter *filtered_source; SelectItemsFunc *select_items; + gpointer select_user_data; + FilterItemsFunc *filter; AllowSelectionFunc *allow_selection; @@ -111,7 +114,8 @@ void psppire_selector_set_subjects (PsppireSelector *, GtkWidget *, GtkWidget *, SelectItemsFunc *, - FilterItemsFunc * ); + FilterItemsFunc *, + gpointer ); void psppire_selector_set_allow (PsppireSelector *, AllowSelectionFunc *); diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c index 3e072aec..b463b25b 100644 --- a/src/ui/gui/rank-dialog.c +++ b/src/ui/gui/rank-dialog.c @@ -111,7 +111,7 @@ generate_syntax (const struct rank_dialog *rd) GString *str = g_string_new ("RANK VARIABLES="); - append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars)); + append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars), 0); g_string_append_printf (str, " (%c)", gtk_toggle_button_get_active (rd->ascending_togglebutton) @@ -121,7 +121,7 @@ generate_syntax (const struct rank_dialog *rd) { g_string_append (str, "\n\tBY "); - append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars)); + append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars), 0); } g_string_append (str, "\n\t/PRINT = "); @@ -320,6 +320,7 @@ rank_dialog (GObject *o, gpointer data) vars, rd.rank_vars, insert_source_row_into_tree_view, + NULL, NULL); set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict); @@ -328,6 +329,7 @@ rank_dialog (GObject *o, gpointer data) vars, rd.group_vars, insert_source_row_into_tree_view, + NULL, NULL); diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c index 103c85c3..b233f116 100644 --- a/src/ui/gui/recode-dialog.c +++ b/src/ui/gui/recode-dialog.c @@ -959,6 +959,7 @@ recode_dialog (struct data_editor *de, gboolean diff) rd.dict_treeview, rd.variable_treeview, insert_source_row_into_tree_view, + NULL, NULL); psppire_selector_set_allow (PSPPIRE_SELECTOR (selector), homogeneous_types); @@ -1443,7 +1444,7 @@ generate_syntax (const struct recode_dialog *rd) g_string_append (str, "\nRECODE "); - append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->variable_treeview)); + append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->variable_treeview), 0); g_string_append (str, "\n\t"); diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c index 473dcdfb..599b2128 100644 --- a/src/ui/gui/select-cases-dialog.c +++ b/src/ui/gui/select-cases-dialog.c @@ -342,7 +342,8 @@ select_cases_dialog (GObject *o, gpointer data) source, entry, insert_source_row_into_entry, - is_currently_in_entry); + is_currently_in_entry, + NULL); } diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c index 0eb0eaa6..a722063b 100644 --- a/src/ui/gui/sort-cases-dialog.c +++ b/src/ui/gui/sort-cases-dialog.c @@ -51,7 +51,7 @@ generate_syntax (const struct sort_cases_dialog *scd) gchar *text; GString *string = g_string_new ("SORT CASES BY "); gint n_vars = append_variable_names (string, - scd->dict, GTK_TREE_VIEW (scd->tv)); + scd->dict, GTK_TREE_VIEW (scd->tv), 0); if ( n_vars == 0 ) g_string_assign (string, ""); @@ -107,6 +107,7 @@ sort_cases_dialog (GObject *o, gpointer data) source, dest, insert_source_row_into_tree_view, + NULL, NULL); g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest); diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c index 755f79d0..1a567eaa 100644 --- a/src/ui/gui/split-file-dialog.c +++ b/src/ui/gui/split-file-dialog.c @@ -71,7 +71,7 @@ generate_syntax (const struct split_file_dialog *sfd) GtkWidget *sort = get_widget_assert (sfd->xml, "split-radiobutton3"); GtkWidget *layered = get_widget_assert (sfd->xml, "split-radiobutton1"); gint n_vars = append_variable_names (varlist, - sfd->dict, GTK_TREE_VIEW (vars)); + sfd->dict, GTK_TREE_VIEW (vars), 0); if ( n_vars > 0 ) { @@ -211,6 +211,7 @@ split_file_dialog (GObject *o, gpointer data) source, dest, insert_source_row_into_tree_view, + NULL, NULL); g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &sfd); diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c index 9a396d9b..74b43cc1 100644 --- a/src/ui/gui/t-test-independent-samples-dialog.c +++ b/src/ui/gui/t-test-independent-samples-dialog.c @@ -162,7 +162,7 @@ generate_syntax (const struct tt_indep_samples_dialog *d) GString *str = g_string_new ("T-TEST /VARIABLES="); - append_variable_names (str, d->dict, GTK_TREE_VIEW (tv)); + append_variable_names (str, d->dict, GTK_TREE_VIEW (tv), 0); g_string_append (str, "\n\t/GROUPS="); @@ -443,6 +443,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1), dict_view, test_variables_treeview, insert_source_row_into_tree_view, + NULL, NULL); psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1), @@ -452,7 +453,8 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2), dict_view, tt_d.groups_entry, insert_source_row_into_entry, - is_currently_in_entry); + is_currently_in_entry, + NULL); g_signal_connect_swapped (tt_d.define_groups_button, "clicked", G_CALLBACK (run_define_groups), &tt_d); diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c index ba27cf2d..f92a32f9 100644 --- a/src/ui/gui/t-test-one-sample.c +++ b/src/ui/gui/t-test-one-sample.c @@ -60,7 +60,7 @@ generate_syntax (const struct tt_one_sample_dialog *d) g_string_append (str, "\n\t/VARIABLES="); - append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview)); + append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview), 0); tt_options_dialog_append_syntax (d->opt, str); @@ -164,6 +164,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector), dict_view, tt_d.vars_treeview, insert_source_row_into_tree_view, + NULL, NULL); diff --git a/src/ui/gui/t-test.glade b/src/ui/gui/t-test.glade index 4ddf65be..0ee5f118 100644 --- a/src/ui/gui/t-test.glade +++ b/src/ui/gui/t-test.glade @@ -43,12 +43,15 @@ 3 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_SPREAD - + True + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Define Groups @@ -58,21 +61,53 @@ - + True True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Options... + False + False 1 - 1 2 + 2 + 3 + GTK_FILL + 5 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + + GTK_EXPAND + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + 1 2 + @@ -120,43 +155,12 @@ - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - 1 - 2 - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - - GTK_EXPAND - - - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_SPREAD - + True - True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Define Groups @@ -166,26 +170,22 @@ - + True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Options... - False - False 1 + 1 2 - 2 - 3 - GTK_FILL - 5 + 1 + 2 + @@ -232,77 +232,63 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True True - radiobutton3 - 2 - 3 - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Use specified values: + 2 + 2 + 5 + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Group_2 value: True - 1 - 2 - + 1 + 2 + - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Cut point: + Group_1 value: True + + + - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - - - - 1 2 - 2 - 3 - - 5 + 1 + 2 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 - 5 - 5 - True True @@ -313,62 +299,76 @@ 2 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 2 1 2 + GTK_EXPAND - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Group_1 value: + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Cut point: True - - - - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Group_2 value: - True - 1 - 2 - + 1 1 2 - 1 - 2 - GTK_EXPAND + 2 + 3 + + 5 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Use specified values: + True + + + 1 + 2 + + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True True + radiobutton3 + 2 + 3 + @@ -502,42 +502,82 @@ 2 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.059999998658895493 - 0 + 5 + + + 3 + 4 + + - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - 5 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Test Variable(s): + True + + label_item + - 1 - 2 - 2 + 2 + 3 - + True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Options... + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + + - 3 - 4 - 1 2 - 5 5 @@ -581,7 +621,64 @@ - + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Options... + + + 3 + 4 + 1 + 2 + + 5 + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0.059999998658895493 + 0 + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 5 + + + + + 1 + 2 + 2 + + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Paired Samples T Test + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -589,32 +686,56 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_ETCHED_IN - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0.059999998658895493 + 0 + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 5 - 2 - 5 - 5 + False + False + 1 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_SHADOW_NONE - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -622,11 +743,11 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_ETCHED_IN - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + False @@ -634,7 +755,7 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Test Variable(s): @@ -645,20 +766,45 @@ + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Options... + + + - 2 - 3 + False + False + 1 + + + + + 2 + + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - 3 - 4 + False + False + GTK_PACK_END + 1 diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c index 2c16c18d..3a1f3a93 100644 --- a/src/ui/gui/transpose-dialog.c +++ b/src/ui/gui/transpose-dialog.c @@ -84,13 +84,15 @@ transpose_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1), source, dest, insert_source_row_into_tree_view, + NULL, NULL); psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2), source, new_name_entry, insert_source_row_into_entry, - is_currently_in_entry); + is_currently_in_entry, + NULL); g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml); @@ -145,7 +147,7 @@ generate_syntax (PsppireDict *dict, GladeXML *xml) g_string_append (string, " /VARIABLES = "); - append_variable_names (string, dict, GTK_TREE_VIEW (dest)); + append_variable_names (string, dict, GTK_TREE_VIEW (dest), 0); text = gtk_entry_get_text (GTK_ENTRY (entry)); diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c index faa54a7c..8ad7c7d0 100644 --- a/src/ui/gui/weight-cases-dialog.c +++ b/src/ui/gui/weight-cases-dialog.c @@ -144,7 +144,8 @@ weight_cases_dialog (GObject *o, gpointer data) source, entry, insert_source_row_into_entry, - is_currently_in_entry + is_currently_in_entry, + NULL ); -- 2.30.2