Menu
▾
▴
rkward-cvs
|
From: Yuri C. <yu...@uk...> - 2015-01-08 08:13:06
|
Git commit bae82f98551d257e6648420d409f8980941d0609 by Yuri Chornoivan. Committed on 08/01/2015 at 08:12. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/00saveload/import/import_csv.rkh M +1 -1 rkward/plugins/00saveload/import/import_csv.xml M +4 -4 rkward/plugins/00saveload/save/write_csv.rkh M +1 -1 rkward/plugins/data/one_var_tabulation.rkh M +2 -2 rkward/plugins/plots/histogram_options.rkh M +2 -2 rkward/plugins/plots/plot_options.rkh M +1 -1 rkward/plugins/plots/plot_stepfun_options.rkh M +4 -4 rkward/plugins/rkwarddev_scripts/write_csv.R M +1 -1 rkward/plugins/x11device/export.rkh M +1 -1 rkward/plugins/x11device/export.xml M +1 -1 rkward/plugins/x11device/grid.rkh http://commits.kde.org/rkward/bae82f98551d257e6648420d409f8980941d0609 diff --git a/rkward/plugins/00saveload/import/import_csv.rkh b/rkward/plugins/00saveload/import/import_csv.rkh index 44a8c30..89d100e 100644 --- a/rkward/plugins/00saveload/import/import_csv.rkh +++ b/rkward/plugins/00saveload/import/import_csv.rkh @@ -11,7 +11,7 @@ Choose the CSV file to import. An R object containing the data will be created. <settings> <caption id="tab_general"/> <setting id="file">The filename of the file to import</setting> - <setting id="quick">Select from one of the predefined (most common formats), or select "custom", to specify field separator and decimal separtor, below.</setting> + <setting id="quick">Select from one of the predefined (most common formats), or select "custom", to specify field separator and decimal separator, below.</setting> <setting id="header">Whether the first row of the file contains should be interpreted as column names</setting> <setting id="dec">Decimal character used in the imported file</setting> <setting id="custom_dec">If you selected "other" above, specify the character, here.</setting> diff --git a/rkward/plugins/00saveload/import/import_csv.xml b/rkward/plugins/00saveload/import/import_csv.xml index 7f5fe1e..64aa0d0 100644 --- a/rkward/plugins/00saveload/import/import_csv.xml +++ b/rkward/plugins/00saveload/import/import_csv.xml @@ -65,7 +65,7 @@ <browser id="file" type="file" label="File name"/> <dropdown id="quick" label="Data format" > <option value="csv" label="Comma separated values (CSV)" checked="true" /> - <option value="csv2" label="Semicolo separated values, comma as decimal separator (CSV2)" /> + <option value="csv2" label="Semicolon separated values, comma as decimal separator (CSV2)" /> <option value="delim" label="Tab separated values (TAB)" /> <option value="delim2" label="Tab separated values, comma as decimal separator (TAB2)" /> <option value="table" label="Custom"/> diff --git a/rkward/plugins/00saveload/save/write_csv.rkh b/rkward/plugins/00saveload/save/write_csv.rkh index 2924036..94f872a 100644 --- a/rkward/plugins/00saveload/save/write_csv.rkh +++ b/rkward/plugins/00saveload/save/write_csv.rkh @@ -28,17 +28,17 @@ Should existing files be overwritten or the data appended? If this is greyed out, the selected preset sets this for you. </setting> <setting id="quick"> - Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with resonable defaults. Use the custom format if you need more control. + Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with reasonable defaults. Use the custom format if you need more control. </setting> <caption id="frm_rDPPCCCOFT" /> <setting id="dec"> - Specify the desirend decimal point character. If this is greyed out, the selected preset sets this for you. + Specify the desired decimal point character. If this is greyed out, the selected preset sets this for you. </setting> <setting id="custom_dec"> Use this value as the custom decimal point character. </setting> <setting id="sep"> - Specify the desirend field separator character. If this is greyed out, the selected preset sets this for you. + Specify the desired field separator character. If this is greyed out, the selected preset sets this for you. </setting> <setting id="custom_sep"> Use this value as the custom field separator character. @@ -71,7 +71,7 @@ Check this to have all string values quoted. </setting> <setting id="qmethod"> - Controls how existing quotes in values are handled -- they can either be escaped or double qouted. If this is greyed out, the selected preset sets this for you. + Controls how existing quotes in values are handled -- they can either be escaped or double quoted. If this is greyed out, the selected preset sets this for you. </setting> <setting id="na"> Set the character to indicate missing data. diff --git a/rkward/plugins/data/one_var_tabulation.rkh b/rkward/plugins/data/one_var_tabulation.rkh index 18a9eca..9e2f4a8 100644 --- a/rkward/plugins/data/one_var_tabulation.rkh +++ b/rkward/plugins/data/one_var_tabulation.rkh @@ -1,7 +1,7 @@ <!DOCTYPE rkhelp> <document> <summary> - Generic tabulation plugin (single outcome vector). This plugin is designed to be embeded into other plugins. + Generic tabulation plugin (single outcome vector). This plugin is designed to be embedded into other plugins. </summary> <usage> diff --git a/rkward/plugins/plots/histogram_options.rkh b/rkward/plugins/plots/histogram_options.rkh index d1f0b24..de42216 100644 --- a/rkward/plugins/plots/histogram_options.rkh +++ b/rkward/plugins/plots/histogram_options.rkh @@ -4,7 +4,7 @@ This plugin provides various options for <b>hist</b> or <b>plot.histogram</b>. </summary> <usage> - This plugin is mostly used as an embeded plugin. All the GUI elements here set various parameters to either hist or plot.histogram functions. For parameter specific help see the respective R references. Few parameter combinations might not produce any sensible plot, so read the R references to make a judicious choice of parameters. + This plugin is mostly used as an embedded plugin. All the GUI elements here set various parameters to either hist or plot.histogram functions. For parameter specific help see the respective R references. Few parameter combinations might not produce any sensible plot, so read the R references to make a judicious choice of parameters. </usage> <settings> <setting id="addtoplot">Check this box if the histogram is to be added to the current plot. This is the <i>add</i> parameter.</setting> @@ -25,7 +25,7 @@ <setting id="angle">This is the <i>angle</i> parameter.</setting> <caption id="frame_histfilloptions"/> <setting id="usefillcol">Check this box to use a fill color for the histogram bars.</setting> - <setting id="histfillcol">This is the <i>col</i> parameter. The embeding plugin might set a default color. If it is empty, then <i>col</i> is not used in the code, otherwise the chosen color is used to fill the bars.</setting> + <setting id="histfillcol">This is the <i>col</i> parameter. The embedding plugin might set a default color. If it is empty, then <i>col</i> is not used in the code, otherwise the chosen color is used to fill the bars.</setting> </settings> <related> <ul> diff --git a/rkward/plugins/plots/plot_options.rkh b/rkward/plugins/plots/plot_options.rkh index 652f47c..fe16fa4 100644 --- a/rkward/plugins/plots/plot_options.rkh +++ b/rkward/plugins/plots/plot_options.rkh @@ -1,7 +1,7 @@ <!DOCTYPE rkhelp> <document> <summary> - Generic plot options plugin. More often than not, this plugin is embeded into other plugins. As a result, not all the features explained here are available in a specific embeded situation. When a particular feature is available, it is explained as below. + Generic plot options plugin. More often than not, this plugin is embedded into other plugins. As a result, not all the features explained here are available in a specific embedded situation. When a particular feature is available, it is explained as below. </summary> <usage> @@ -68,7 +68,7 @@ <li><i>allow_ylim</i>: Setting this to "true" ("false") enables (disables) the display of 'Min Y value' and 'Max Y value' input boxes.</li> <li><i>allow_type</i>: Setting this to "true" ("false") enables (disables) the display of the 'Points / Lines' tab.</li> <li><i>allow_aspect</i>: Setting this to "true" ("false") enables (disables) the display of the 'Aspect ratio' tab.</li> - <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the 'Grid' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embeded using an id="plot_options" then the following call:<br> + <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the 'Grid' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embedded using an id="plot_options" then the following call:<br> printIndented ("\t", getRK_val ("plot_options.code.calculate"));</br><br> after the plotting function should do the job.</br></li> </ul> diff --git a/rkward/plugins/plots/plot_stepfun_options.rkh b/rkward/plugins/plots/plot_stepfun_options.rkh index 10e7c8c..3384f4a 100644 --- a/rkward/plugins/plots/plot_stepfun_options.rkh +++ b/rkward/plugins/plots/plot_stepfun_options.rkh @@ -4,7 +4,7 @@ Various graphical parameters for <b>plot.stepfun</b>. For detailed description of the individual parameters see the R reference on 'plot.stepfun'. </summary> <usage> - This is supposed to be used as an embeded plugin. All the elements are arguments to the plot.stepfun function. This plugin is useful in constructing <b>ecdf</b> plots. + This is supposed to be used as an embedded plugin. All the elements are arguments to the plot.stepfun function. This plugin is useful in constructing <b>ecdf</b> plots. </usage> <settings> <setting id="addtoplot">This is the <i>add</i> argument. This option might be disabled by the embedding plugin.</setting> diff --git a/rkward/plugins/rkwarddev_scripts/write_csv.R b/rkward/plugins/rkwarddev_scripts/write_csv.R index 69290be..ff5e8aa 100644 --- a/rkward/plugins/rkwarddev_scripts/write_csv.R +++ b/rkward/plugins/rkwarddev_scripts/write_csv.R @@ -75,7 +75,7 @@ etc.drop.format <- rk.XML.dropdown("File format", "Custom"=c(val="table") ), id.name="quick", - help="Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with resonable defaults. Use the custom format if you need more control." + help="Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with reasonable defaults. Use the custom format if you need more control." ) etc.frame.characters <- rk.XML.frame( @@ -88,7 +88,7 @@ etc.frame.characters <- rk.XML.frame( etc.radio.decimal.opt.other <- rk.XML.option("Custom (specify below)", val="other", id.name="decOther") ), id.name="dec", - help="Specify the desirend decimal point character. If this is greyed out, the selected preset sets this for you." + help="Specify the desired decimal point character. If this is greyed out, the selected preset sets this for you." ), rk.XML.stretch(), etc.input.decimal <- rk.XML.input("", required=TRUE, id="custom_dec", @@ -105,7 +105,7 @@ etc.frame.characters <- rk.XML.frame( etc.radio.field.opt.other <- rk.XML.option("Custom (specify below)", val="other", id.name="sepOther") ), id.name="sep", - help="Specify the desirend field separator character. If this is greyed out, the selected preset sets this for you." + help="Specify the desired field separator character. If this is greyed out, the selected preset sets this for you." ), rk.XML.stretch(), etc.input.field <- rk.XML.input("", required=TRUE, id="custom_sep", @@ -126,7 +126,7 @@ etc.frame.specialChars <- rk.XML.frame( etc.radio.quote.opt.double <- rk.XML.option("Double", val="double", id.name="qmethodDbl") ), id.name="qmethod", - help="Controls how existing quotes in values are handled -- they can either be escaped or double qouted. If this is greyed out, the selected preset sets this for you." + help="Controls how existing quotes in values are handled -- they can either be escaped or double quoted. If this is greyed out, the selected preset sets this for you." ) ), rk.XML.col( diff --git a/rkward/plugins/x11device/export.rkh b/rkward/plugins/x11device/export.rkh index 009ce46..db67e33 100644 --- a/rkward/plugins/x11device/export.rkh +++ b/rkward/plugins/x11device/export.rkh @@ -35,7 +35,7 @@ <setting id="ps_horiz">Available only for Postscript/Ghostscript exporting, this is the <i>horizontal</i> parameter.</setting> <setting id="family">This is the <i>family</i> parameter to <b>postscript</b>. Be sure to choose a family that is available on the machine. The 'URW' class of font families require ghostscript. When in doubt leave this as 'Default', the default family (Helvectica) will be used. See the R reference on postscript for more details.</setting> <setting id="encoding">This is the <i>encoding</i> parameter to <b>postscript</b>. Be sure to choose an encoding compatible with the chosen font family. When in doubt leave this as 'Default', the default encoding (ISOLatin1) will be used. See the R reference on postscript for more details.</setting> - <setting id="autotitle">Uncheck this box, to specify a custom title to the graphics file. Note that this is not displayed on the plot, but rather it is embeded inside the graphics file. This is the <i>title</i> parameter to <b>postscript</b>.</setting> + <setting id="autotitle">Uncheck this box, to specify a custom title to the graphics file. Note that this is not displayed on the plot, but rather it is embedded inside the graphics file. This is the <i>title</i> parameter to <b>postscript</b>.</setting> <caption id="frame_gsoptions"/> <setting id="gsformat">File format to use. Only the most common ones are listed, but many more are supported by ghostscript. Select "Other" and see the option below to use these formats.</setting> diff --git a/rkward/plugins/x11device/export.xml b/rkward/plugins/x11device/export.xml index 0351585..eddc129 100644 --- a/rkward/plugins/x11device/export.xml +++ b/rkward/plugins/x11device/export.xml @@ -162,7 +162,7 @@ </dropdown> </row> </frame> - <frame id="title_properties" label="Title embeded in file"> + <frame id="title_properties" label="Title embedded in file"> <row> <column> <checkbox id="autotitle" value="1" value_unchecked="0" checked="true" label="Default Title"/> diff --git a/rkward/plugins/x11device/grid.rkh b/rkward/plugins/x11device/grid.rkh index 30c1417..94f1951 100644 --- a/rkward/plugins/x11device/grid.rkh +++ b/rkward/plugins/x11device/grid.rkh @@ -4,7 +4,7 @@ Various parameters for the <b>grid</b>. For detailed description of the individual parameters see the R reference on 'grid'. Note that this works only when standard (traditional S) graphics functions (see library(help="graphics")) are used to construct the plot. This does not work for trellis graphics devices (see <link href="rkward://rhelp/Lattice"/> for some information). </summary> <usage> - This may or may not be used as an embeded plugin. When used on a trellis device the produced error message is displayed. + This may or may not be used as an embedded plugin. When used on a trellis device the produced error message is displayed. </usage> <settings> <setting id="nx">This is the <i>nx</i> argument. The default is NULL, in which case, the vertical lines are drawn at the xaxis ticks. Select None to not draw the vertical lines. Select 'Specify below' to provide a specified (to be specified below) number of vertical lines in the grid.</setting> |
|
From: Yuri C. <yu...@uk...> - 2015-01-09 18:46:48
|
Git commit 0cdfb702a5b72ec006986ba1932c1a6e762e20dc by Yuri Chornoivan. Committed on 09/01/2015 at 18:45. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/00saveload/import/import_stata.rkh M +1 -1 rkward/plugins/00saveload/save/write_csv.rkh M +1 -1 rkward/plugins/plots/histogram_options.rkh M +1 -1 rkward/plugins/plots/plot_options.xml M +1 -1 rkward/plugins/plots/plot_stepfun_options.rkh http://commits.kde.org/rkward/0cdfb702a5b72ec006986ba1932c1a6e762e20dc diff --git a/rkward/plugins/00saveload/import/import_stata.rkh b/rkward/plugins/00saveload/import/import_stata.rkh index 68210c7..287cd53 100644 --- a/rkward/plugins/00saveload/import/import_stata.rkh +++ b/rkward/plugins/00saveload/import/import_stata.rkh @@ -8,7 +8,7 @@ Import STATA data files. </summary> <usage> -Choose the STATA data file to import. Usually those files have the ending '*.dta. An R object containing the STATA data will be created. STATA files other than data files (i. e.:*.log, *.smcl, *.do, *.ado) are not supported. +Choose the STATA data file to import. Usually those files have the ending '*.dta'. An R object containing the STATA data will be created. STATA files other than data files (i. e.:*.log, *.smcl, *.do, *.ado) are not supported. </usage> <settings> diff --git a/rkward/plugins/00saveload/save/write_csv.rkh b/rkward/plugins/00saveload/save/write_csv.rkh index 94f872a..7289614 100644 --- a/rkward/plugins/00saveload/save/write_csv.rkh +++ b/rkward/plugins/00saveload/save/write_csv.rkh @@ -9,7 +9,7 @@ Export data to CSV or similar file formats. </summary> <usage> - Select a tabular data object (like a data frame or matrix) and chose a file to save to. All other options allow you to define the file format, handling of column and row names as well as special character handling. + Select a tabular data object (like a data frame or matrix) and choose a file to save to. All other options allow you to define the file format, handling of column and row names as well as special character handling. </usage> <!-- <section id="sct_EDITORDE" title="EDIT OR DELETE ME"> EDIT OR DELETE ME diff --git a/rkward/plugins/plots/histogram_options.rkh b/rkward/plugins/plots/histogram_options.rkh index de42216..6af40a8 100644 --- a/rkward/plugins/plots/histogram_options.rkh +++ b/rkward/plugins/plots/histogram_options.rkh @@ -13,7 +13,7 @@ <setting id="rightclosed">This is the <i>right</i> parameter.</setting> <setting id="include_lowest">This is the <i>include.lowest</i> parameter.</setting> <caption id="frame_breaks"/> - <setting id="histbreaksFunction">This is the <i>breaks</i> parameter to <b>hist</b>, unless either 'Integer numbers' or 'Vector of break points' is chosen. The 'Integer numbers' options sets the break points as the integers between the minimum and the maximum of the variable. The 'Vector of break points' options sets equally spaced break points in the range of the variable. The number of break points in this case is provided by 'Vector length' (see below).</setting> + <setting id="histbreaksFunction">This is the <i>breaks</i> parameter to <b>hist</b>, unless either 'Integer numbers' or 'Vector of break points' is chosen. The 'Integer numbers' option sets the break points as the integers between the minimum and the maximum of the variable. The 'Vector of break points' option sets equally spaced break points in the range of the variable. The number of break points in this case is provided by 'Vector length' (see below).</setting> <setting id="histbreaks_ncells">If 'A single number' is chosen in the above field, then this provides a suggestion to the number of cells. This is the <i>breaks</i> parameter with a single number argument.</setting> <setting id="histbreaks_veclength">If 'Vector of break points' is chosen in the above field, then this provides the length of the vector of equally spaced break points in the range of the variable. This is the <i>breaks</i> parameter with a vector argument. The actual sequence is calculated by an inline function call (see the generated code). The range of the variable is extended by 10% before obtaining the sequence, so that both the minimum and maximum points are included.</setting> <caption id="frame_histborderoptions"/> diff --git a/rkward/plugins/plots/plot_options.xml b/rkward/plugins/plots/plot_options.xml index fb60e7d..997450d 100644 --- a/rkward/plugins/plots/plot_options.xml +++ b/rkward/plugins/plots/plot_options.xml @@ -133,7 +133,7 @@ <option value="3" label="Always vertical " /> </dropdown> <row> - <input id="cexaxis" label="Tick label scale (relative to cex))" /> + <input id="cexaxis" label="Tick label scale (relative to cex)" /> </row> <stretch/> </frame> diff --git a/rkward/plugins/plots/plot_stepfun_options.rkh b/rkward/plugins/plots/plot_stepfun_options.rkh index 3384f4a..62d65de 100644 --- a/rkward/plugins/plots/plot_stepfun_options.rkh +++ b/rkward/plugins/plots/plot_stepfun_options.rkh @@ -30,7 +30,7 @@ <ul> <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the 'Add to current plot' checkbox.</li> <li><i>default_dopoints</i>: Setting this to "true" ("false") toggles the state of the 'Draw points' checkbox.</li> - <li><i>default_verticals</i>: Setting this to "true" ("false") toggles the state of the 'Draw verticals' checkbox.</li> + <li><i>default_verticals</i>: Setting this to "true" ("false") toggles the state of the 'Draw vertical lines' checkbox.</li> <li><i>allow_col01line</i>: Setting this to "true" ("false") enables (disables) the display of the two frames ('For y = 0 line' and 'For y = 1 line') for <i>col.01line</i> option to ecdf.</li> </ul> </technical> |
|
From: Yuri C. <yu...@uk...> - 2015-01-10 06:55:01
|
Git commit d0ef58ca71cf6ab396691ff28e51d419c0c88e3c by Yuri Chornoivan. Committed on 10/01/2015 at 06:54. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/plots.pluginmap M +1 -1 rkward/plugins/plots/barplot.js M +1 -1 rkward/plugins/plots/box_plot.rkh http://commits.kde.org/rkward/d0ef58ca71cf6ab396691ff28e51d419c0c88e3c diff --git a/rkward/plugins/plots.pluginmap b/rkward/plugins/plots.pluginmap index 39e9e7a..79ae5d8 100644 --- a/rkward/plugins/plots.pluginmap +++ b/rkward/plugins/plots.pluginmap @@ -4,7 +4,7 @@ <include file="pluginmap_meta.inc"/> <about name="Plots" - shortinfo="Plugins for procuding various plots. Part of the official RKWard distribution" + shortinfo="Plugins for producing various plots. Part of the official RKWard distribution" version="0.6.3" license="GPL" url="http://rkward.kde.org"> diff --git a/rkward/plugins/plots/barplot.js b/rkward/plugins/plots/barplot.js index ed00f8c..f987205 100644 --- a/rkward/plugins/plots/barplot.js +++ b/rkward/plugins/plots/barplot.js @@ -26,7 +26,7 @@ function doPrintout (full) { echo (getValue ('tabulate_options.code.calculate')); } else { echo ('x <- ' + varname + "\n"); - comment ('barplot is a bit picky about attributes, so we need to convert to vector explicitely'); + comment ('barplot is a bit picky about attributes, so we need to convert to vector explicitly'); echo ('if(!is.matrix(x)) x <- as.vector(x)\n'); echo ('if(!is.matrix(x) && is.data.frame(x)) x <- data.matrix(x)\n'); } diff --git a/rkward/plugins/plots/box_plot.rkh b/rkward/plugins/plots/box_plot.rkh index ad34db3..65c78e4 100644 --- a/rkward/plugins/plots/box_plot.rkh +++ b/rkward/plugins/plots/box_plot.rkh @@ -14,7 +14,7 @@ Choose numerical data to be plotted. Data can be organized in separate vectors, <setting id="x">For separate variables mode: Select one or more numerical vectors.</setting> <setting id="outcome">For single(grouped) variable mode: Select one numerical vectors as the outcome variable.</setting> <setting id="groups">For single(grouped) variable mode: Select one or more vectors by which to group the outcome variable. Group variables should have the same length as the outcome variable.</setting> - <setting id="dodges">For single(grouped) variable mode: Doding boxes within one or more groups can be a nice option when the outcome is split by several group variables. This allows you to select, across how many group variables, boxes should be doged ("0" for no dodging, "1" to dodge only the first group variable).</setting> + <setting id="dodges">For single(grouped) variable mode: Dodging boxes within one or more groups can be a nice option when the outcome is split by several group variables. This allows you to select, across how many group variables, boxes should be dodged ("0" for no dodging, "1" to dodge only the first group variable).</setting> <setting id="names_mode">Method for assigning labels to the plot. "default" means, the labels are chosen automatically. If no labels are available, this will generally print the values. The other options allow you to specify the labels as literal string, or as an R statement (e.g. if the names are stored in a different variable in the workspace).</setting> <setting id="boxwex">Allows to change the width of the boxes, relative to the entire plot.</setting> <caption id="tab_options"/> |
|
From: Yuri C. <yu...@uk...> - 2015-01-11 07:05:29
|
Git commit fec2dd70121749eb01b766ac76d285bac92879a4 by Yuri Chornoivan. Committed on 11/01/2015 at 07:04. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/analysis/irt/dichotomous/par_est_lltm.rkh M +1 -1 rkward/plugins/analysis/irt/polytomous/par_est_gpcm.xml M +1 -1 rkward/plugins/analysis/irt/polytomous/par_est_lpcm.rkh M +1 -1 rkward/plugins/analysis/irt/polytomous/par_est_lrsm.rkh M +1 -1 rkward/plugins/x11device/export.rkh M +1 -1 rkward/plugins/x11device/export.xml http://commits.kde.org/rkward/fec2dd70121749eb01b766ac76d285bac92879a4 diff --git a/rkward/plugins/analysis/irt/dichotomous/par_est_lltm.rkh b/rkward/plugins/analysis/irt/dichotomous/par_est_lltm.rkh index b266902..bf59ec4 100644 --- a/rkward/plugins/analysis/irt/dichotomous/par_est_lltm.rkh +++ b/rkward/plugins/analysis/irt/dichotomous/par_est_lltm.rkh @@ -19,7 +19,7 @@ If repeated measurement applies, specify how many are represented in the data matrix (defaults to 1). This will divide the columns in the matrix into equally sized subsets of data. </setting> <setting id="groups"> - If you want to compute group contrasts, a vector determing the group membership of each subject must be given. By default no group contrasts are imposed. + If you want to compute group contrasts, a vector determining the group membership of each subject must be given. By default no group contrasts are imposed. </setting> <caption id="tab_options"/> diff --git a/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.xml b/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.xml index b457a31..8deb76c 100644 --- a/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.xml +++ b/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.xml @@ -34,7 +34,7 @@ <row id="options_row"> <varselector id="vars2" /> <column id="opt_var_col"> - <radio label="Should parameters be fixed (constrainted)?" id="constraint"> + <radio label="Should parameters be fixed (constrained)?" id="constraint"> <option label="Each item has its one discrimination parameter" value="gpcm" checked="true" /> <option label="Equal discrimination parameter across items" value="1PL" /> <option label="Discrimination parameter fixed at 1 across items" value="rasch" /> diff --git a/rkward/plugins/analysis/irt/polytomous/par_est_lpcm.rkh b/rkward/plugins/analysis/irt/polytomous/par_est_lpcm.rkh index 4f5bad9..b49d5f4 100644 --- a/rkward/plugins/analysis/irt/polytomous/par_est_lpcm.rkh +++ b/rkward/plugins/analysis/irt/polytomous/par_est_lpcm.rkh @@ -19,7 +19,7 @@ If repeated measurement applies, specify how many are represented in the data matrix (defaults to 1). This will divide the columns in the matrix into equally sized subsets of data. </setting> <setting id="groups"> - If you want to compute group contrasts, a vector determing the group membership of each subject must be given. By default no group contrasts are imposed. + If you want to compute group contrasts, a vector determining the group membership of each subject must be given. By default no group contrasts are imposed. </setting> <caption id="tab_options"/> diff --git a/rkward/plugins/analysis/irt/polytomous/par_est_lrsm.rkh b/rkward/plugins/analysis/irt/polytomous/par_est_lrsm.rkh index 979b83e..7ac48f8 100644 --- a/rkward/plugins/analysis/irt/polytomous/par_est_lrsm.rkh +++ b/rkward/plugins/analysis/irt/polytomous/par_est_lrsm.rkh @@ -19,7 +19,7 @@ If repeated measurement applies, specify how many are represented in the data matrix (defaults to 1). This will divide the columns in the matrix into equally sized subsets of data. </setting> <setting id="groups"> - If you want to compute group contrasts, a vector determing the group membership of each subject must be given. By default no group contrasts are imposed. + If you want to compute group contrasts, a vector determining the group membership of each subject must be given. By default no group contrasts are imposed. </setting> <caption id="tab_options"/> diff --git a/rkward/plugins/x11device/export.rkh b/rkward/plugins/x11device/export.rkh index db67e33..a6e3416 100644 --- a/rkward/plugins/x11device/export.rkh +++ b/rkward/plugins/x11device/export.rkh @@ -4,7 +4,7 @@ Export the current contents of a graphics device to a postscript/pdf/png/jpeg file either using the native functions or using ghostscript. </summary> <usage> - Choose an exporting function and a filename to save to. Additional options for size and resolution etc. are also available (see below). Exporting is done using <b>dev.print</b>. For exporting using ghostscript, <b>dev2bitmap</b> is used, which needs Ghostscript. Most of the exporting parameters are directly sent to the exporting function (<b>postscript</b>, <b>pdf</b>, <b>svg</b>, <b>png</b>, or <b>jpeg</b>) by dev.print. Note that there are no 'color' options (like background or foreground color) in this plugin. This is because dev.print simply prints the current graphics (mostly on X11) to the spedified file in the chosen format. To set background (or foreground) colors, these will need to be provided when calling the plotting function, mostly using <b>par</b>(). Note that all the parameters to postscript are also valid parameters to dev2bitmap. + Choose an exporting function and a filename to save to. Additional options for size and resolution etc. are also available (see below). Exporting is done using <b>dev.print</b>. For exporting using ghostscript, <b>dev2bitmap</b> is used, which needs Ghostscript. Most of the exporting parameters are directly sent to the exporting function (<b>postscript</b>, <b>pdf</b>, <b>svg</b>, <b>png</b>, or <b>jpeg</b>) by dev.print. Note that there are no 'color' options (like background or foreground color) in this plugin. This is because dev.print simply prints the current graphics (mostly on X11) to the specified file in the chosen format. To set background (or foreground) colors, these will need to be provided when calling the plotting function, mostly using <b>par</b>(). Note that all the parameters to postscript are also valid parameters to dev2bitmap. This plugin is only available in the context of a graphics device. </usage> diff --git a/rkward/plugins/x11device/export.xml b/rkward/plugins/x11device/export.xml index eddc129..761fe4d 100644 --- a/rkward/plugins/x11device/export.xml +++ b/rkward/plugins/x11device/export.xml @@ -172,7 +172,7 @@ </column> </row> </frame> - <frame id="frame_gsoptions" label="Ghostscript specific options"> + <frame id="frame_gsoptions" label="Ghostscript specific options"> <row> <dropdown id="gsformat" label="GS Output device" > <option value="pdfwrite" label="PDF" /> |
|
From: Yuri C. <yu...@uk...> - 2015-01-13 18:36:58
|
Git commit d3ba84222d0e3b68e7786404872c2fce6eb5f867 by Yuri Chornoivan. Committed on 13/01/2015 at 06:39. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/analysis/power/Poweranalysis.js M +5 -5 rkward/plugins/analysis/power/Poweranalysis.rkh M +6 -6 rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R http://commits.kde.org/rkward/d3ba84222d0e3b68e7786404872c2fce6eb5f867 diff --git a/rkward/plugins/analysis/power/Poweranalysis.js b/rkward/plugins/analysis/power/Poweranalysis.js index 18aba7c..00b16c8 100644 --- a/rkward/plugins/analysis/power/Poweranalysis.js +++ b/rkward/plugins/analysis/power/Poweranalysis.js @@ -170,7 +170,7 @@ function printout(){ var drpPwrStat = getValue("drp_pwr_stat"); var radPwrParam = getValue("rad_pwr_param"); - echo("\t# Catch errors due to unsuitable data\n" + "\tif(class(pwr.result) == \"try-error\"){\n" + "\t\trk.print(\"Power anaylsis not possible with the data you provided\")\n" + "\t\treturn()\n\t}\n\n" + "\t# Prepare printout\n" + "\tnote <- pwr.result[[\"note\"]]\n" + "\tparameters <- list(\"Target measure\"=\"" + radPwrParam + "\")\n" + "\tif(!is.null(pwr.result[[\"alternative\"]])){\n\t\tparameters[[\"alternative\"]] <- pwr.result[[\"alternative\"]]\n\t}\n\n" + "\trk.header(pwr.result[[\"method\"]], parameters=parameters)\n" + "\tpwr.result[c(\"method\", \"note\", \"alternative\")] <- NULL\n" + "\tpwr.result <- as.data.frame(unlist(pwr.result))\n" + "\tcolnames(pwr.result) <- \"Parameters\"\n\n" + "\trk.results(pwr.result)\n" + "\tif(!is.null(note)){\n\t\trk.print(paste(\"<strong>Note:</strong> \", note))\n\t}\n\n"); + echo("\t# Catch errors due to unsuitable data\n" + "\tif(class(pwr.result) == \"try-error\"){\n" + "\t\trk.print(\"Power analysis not possible with the data you provided\")\n" + "\t\treturn()\n\t}\n\n" + "\t# Prepare printout\n" + "\tnote <- pwr.result[[\"note\"]]\n" + "\tparameters <- list(\"Target measure\"=\"" + radPwrParam + "\")\n" + "\tif(!is.null(pwr.result[[\"alternative\"]])){\n\t\tparameters[[\"alternative\"]] <- pwr.result[[\"alternative\"]]\n\t}\n\n" + "\trk.header(pwr.result[[\"method\"]], parameters=parameters)\n" + "\tpwr.result[c(\"method\", \"note\", \"alternative\")] <- NULL\n" + "\tpwr.result <- as.data.frame(unlist(pwr.result))\n" + "\tcolnames(pwr.result) <- \"Parameters\"\n\n" + "\trk.results(pwr.result)\n" + "\tif(!is.null(note)){\n\t\trk.print(paste(\"<strong>Note:</strong> \", note))\n\t}\n\n"); if(drpPwrStat == "pwr.t.test" | drpPwrStat == "pwr.norm.test") { echo("\trk.print(\"Interpretation of effect size <strong>d</strong> (according to Cohen):\")\n" + "\trk.results(data.frame(small=0.2, medium=0.5, large=0.8))\n"); } diff --git a/rkward/plugins/analysis/power/Poweranalysis.rkh b/rkward/plugins/analysis/power/Poweranalysis.rkh index 838ec81..fd40680 100644 --- a/rkward/plugins/analysis/power/Poweranalysis.rkh +++ b/rkward/plugins/analysis/power/Poweranalysis.rkh @@ -6,7 +6,7 @@ Power analysis </title> <summary> - Perform power anaylsis for a variety of statistcal methods. + Perform power analysis for a variety of statistical methods. </summary> <usage> Given three of the parameters 'power of test', @@ -49,15 +49,15 @@ <caption id="frm_Knwnmsrs" /> <caption id="frm_spnbPP0801" /> <setting id="spn_Power"> - Targetted power of test (1 minus Type II error probability) + Targeted power of test (1 minus Type II error probability) </setting> <caption id="frm_sD301D3011" /> <setting id="pwr_spin_df"> - Only shown for chi-square statistics: Targetted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, + Only shown for chi-square statistics: Targeted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, and (cells − 1) for a test of goodness of fit. </setting> <setting id="pwr_spin_dfu"> - Only shown for general linear model: Targetted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1. + Only shown for general linear model: Targeted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1. </setting> <setting id="pwr_spin_dfv"> Only shown for general linear model: Available denominator degrees of freedom / degrees of freedom of the error term. @@ -76,7 +76,7 @@ </setting> <caption id="frm_spnSS00501" /> <setting id="spn_Sgnfcncl"> - Targetted level of significance + Targeted level of significance </setting> </settings> <related> diff --git a/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R b/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R index f73b9fb..0c5e34f 100644 --- a/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R +++ b/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R @@ -82,12 +82,12 @@ pwr.proptype.drop <- rk.XML.dropdown("Samples", ), help=FALSE, # In the help file, same as t.test dropdown id.name="drp_pwr_proptype") -pwr.input.power <- rk.XML.spinbox(label="Power", min=0, max=1, initial=0.8, help="Targetted power of test (1 minus Type II error probability)") +pwr.input.power <- rk.XML.spinbox(label="Power", min=0, max=1, initial=0.8, help="Targeted power of test (1 minus Type II error probability)") pwr.input.df <- rk.XML.spinbox(label="Degrees of freedom", id.name="pwr_spin_df", min=1, real=FALSE, initial=30, - help="Only shown for chi-square statistics: Targetted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, + help="Only shown for chi-square statistics: Targeted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, and (cells − 1) for a test of goodness of fit.") pwr.input.dfu <- rk.XML.spinbox(label="Degrees of freedom for numerator", id.name="pwr_spin_dfu", min=1, real=FALSE, initial=30, - help="Only shown for general linear model: Targetted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1.") + help="Only shown for general linear model: Targeted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1.") pwr.input.dfv <- rk.XML.spinbox(label="Degrees of freedom for denominator", id.name="pwr_spin_dfv", min=1, real=FALSE, initial=30, help="Only shown for general linear model: Available denominator degrees of freedom / degrees of freedom of the error term. As a reminder, this is the total number of observations minus numerator degrees of freedom minus 1, or total number of observations minus number of groups/samples.") @@ -118,7 +118,7 @@ pwr.txt.effect.e2 <- rk.XML.text("Measure for selected method is <b>Eta<sup>2</s pwr.txt.effect.f2 <- rk.XML.text("Measure for selected method is <b>Cohen's f<sup>2</sup></b>", id.name="pwr_txt_efct_f2") pwr.txt.effect.w <- rk.XML.text("Measure for selected method is <b>Cohen's w</b>", id.name="pwr_txt_efct_w") pwr.txt.effect.h <- rk.XML.text("Measure for selected method is <b>Cohen's h</b>", id.name="pwr_txt_efct_h") -pwr.input.signif <- rk.XML.spinbox(label="Significance level", min=0, max=1, initial=0.05, help="Targetted level of significance") +pwr.input.signif <- rk.XML.spinbox(label="Significance level", min=0, max=1, initial=0.05, help="Targeted level of significance") save.results.pwr <- rk.XML.saveobj("Save results to workspace", initial="pwr.result", @@ -466,7 +466,7 @@ pwr.js.print <- rk.paste.JS( echo( "\t# Catch errors due to unsuitable data\n", "\tif(class(pwr.result) == \"try-error\"){\n", - "\t\trk.print(\"Power anaylsis not possible with the data you provided\")\n", + "\t\trk.print(\"Power analysis not possible with the data you provided\")\n", "\t\treturn()\n\t}\n\n", "\t# Prepare printout\n", "\tnote <- pwr.result[[\"note\"]]\n", @@ -508,7 +508,7 @@ pwr.js.print <- rk.paste.JS( ############ ## help file -pwr.rkh.summary <- rk.rkh.summary("Perform power anaylsis for a variety of statistcal methods.") +pwr.rkh.summary <- rk.rkh.summary("Perform power analysis for a variety of statistcal methods.") pwr.rkh.usage <- rk.rkh.usage("Given three of the parameters 'power of test', 'sample size', 'effect size', and 'significance level', this plugin will |
Thanks for helping keep SourceForge clean.
X