[rkward-cvs] SF.net SVN: rkward: [1999] branches/release_branch_0.4.8
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Thu Sep 27 12:21:42 UTC 2007
Revision: 1999
http://rkward.svn.sourceforge.net/rkward/?rev=1999&view=rev
Author: tfry
Date: 2007-09-27 05:21:42 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
Merge 1975-1998 from trunk
Modified Paths:
--------------
branches/release_branch_0.4.8/ChangeLog
branches/release_branch_0.4.8/NOTES
branches/release_branch_0.4.8/TODO
branches/release_branch_0.4.8/debian/changelog
branches/release_branch_0.4.8/debian/rkward.menu
branches/release_branch_0.4.8/po/el.po
branches/release_branch_0.4.8/po/es.po
branches/release_branch_0.4.8/rkward/pages/Makefile.am
branches/release_branch_0.4.8/rkward/pages/rkward_console.rkh
branches/release_branch_0.4.8/rkward/pages/rkward_for_new_users.rkh
branches/release_branch_0.4.8/rkward/pages/rkward_for_r_users.rkh
branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.php
branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.rkh
branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.xml
branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.rkh
branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.xml
branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/kpss_test.rkh
branches/release_branch_0.4.8/rkward/plugins/plots/barplot.php
branches/release_branch_0.4.8/rkward/plugins/plots/barplot.rkh
branches/release_branch_0.4.8/rkward/plugins/plots/barplot.xml
branches/release_branch_0.4.8/rkward/plugins/plots/barplot_embed.xml
branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.php
branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.rkh
branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.xml
branches/release_branch_0.4.8/rkward/plugins/plots/piechart.php
branches/release_branch_0.4.8/rkward/plugins/plots/piechart.rkh
branches/release_branch_0.4.8/rkward/plugins/plots/piechart.xml
branches/release_branch_0.4.8/rkward/rbackend/rembedinternal.cpp
branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/internal.R
branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/public.R
branches/release_branch_0.4.8/rkward/rkconsole.cpp
branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.cpp
branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.h
branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleobjectbrowser.h
Added Paths:
-----------
branches/release_branch_0.4.8/rkward/pages/rkward_workspace_browser.rkh
Modified: branches/release_branch_0.4.8/ChangeLog
===================================================================
--- branches/release_branch_0.4.8/ChangeLog 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/ChangeLog 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,3 +1,5 @@
+- commands run through the console from the script editor will now be added to the command history (this can be turned off in the settings)
+- fixed: promise objects (created by delayedAssign()) directly in globalenv() would be forced early
- make wrapper script work, when konsole is not installed
- correct syntax highlighting for ::: and NA_integer_ and others
- silence some GCC 4.2 warnings
Modified: branches/release_branch_0.4.8/NOTES
===================================================================
--- branches/release_branch_0.4.8/NOTES 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/NOTES 2007-09-27 12:21:42 UTC (rev 1999)
@@ -2,5 +2,6 @@
*** From 0.4.7a to 0.4.8 ***
- With the addition of the new filesystem browser, the shortcuts to show/hide the main tool windows have changed. The filesystem browser window can be toggled using Alt+2, the shortcuts for command log, pending jobs, console, and help search are now Alt+3 through 6, respectively, instead of Alt+2 through 5.
+- All commands run through the console are now added to the command history of the console, by default. This setting can be changed back to the old behavior (only commands *entered* in the console are added to the history) under Settings->Configure RKWard->Console.
*** Changes prior to 0.4.7a not listed in this document. ***
Modified: branches/release_branch_0.4.8/TODO
===================================================================
--- branches/release_branch_0.4.8/TODO 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/TODO 2007-09-27 12:21:42 UTC (rev 1999)
@@ -32,8 +32,12 @@
UI-stuff
- find/create a set of menu icons (https://sourceforge.net/mailarchive/message.php?msg_id=37891606)
- "First-run wizard"
+ - "First-run wizard"
- pre-install R packages
+ - Snippets library
+ - pre-defined snippets to base scripts on
+ - custom snippets
+ - can be categorized by keywords / search
- Check for existence of php binary on startup, not only when loading a plugin
- RKEditorDataFrame
- undo/redo
@@ -70,6 +74,7 @@
- Allow pasting at other positions than line end
- Prevent cursor from venturing into lines other than the last line
- When inside a string, should offer tab-completion for system paths (will maybe have to wait for KDE4, when we get better clues, what context we are currently in)
+ - Allow multi-line command editing?
- Script editor:
- new action "Run Toplevel expression" (see https://sourceforge.net/mailarchive/forum.php?thread_id=31463482&forum_id=12970)
- new action "Source file"
Modified: branches/release_branch_0.4.8/debian/changelog
===================================================================
--- branches/release_branch_0.4.8/debian/changelog 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/debian/changelog 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,3 +1,11 @@
+rkward (0.4.8-1) unstable; urgency=low
+
+ * new upstream release
+ closes: #417519 TODO: check that it really still does, before uploading
+ * adjust rkward.menu to new naming policy
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net> Xxx, XX Xxx 2007 13:30:00 +0200
+
rkward (0.4.7a-2) unstable; urgency=low
* force gcc 4.2 to match r-base-core
Modified: branches/release_branch_0.4.8/debian/rkward.menu
===================================================================
--- branches/release_branch_0.4.8/debian/rkward.menu 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/debian/rkward.menu 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1 +1 @@
-?package(rkward):needs="x11" section="Apps/Math" title="RKWard" command="/usr/bin/rkward"
+?package(rkward):needs="x11" section="Applications/Science/Mathematics" title="RKWard" command="/usr/bin/rkward"
Modified: branches/release_branch_0.4.8/po/el.po
===================================================================
--- branches/release_branch_0.4.8/po/el.po 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/po/el.po 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,16 +1,17 @@
-# translation of el.po to Ελληνικά
+# translation of el.po to Greek
# Greek translation of Rkward.
# This file is put in the public domain.
#
# Ilias Soumpasis <isoumpasis at gmail.com>, 2006, 2007.
+# Ilias <nono.231 at gmail.com>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-19 21:39+0200\n"
-"PO-Revision-Date: 2007-04-01 21:01+0300\n"
-"Last-Translator: Ilias Soumpasis <isoumpasis at gmail.com>\n"
-"Language-Team: Ελληνικά <el at li.org>\n"
+"PO-Revision-Date: 2007-09-19 23:10+0100\n"
+"Last-Translator: Ilias <nono.231 at gmail.com>\n"
+"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -166,8 +167,7 @@
msgstr "Διαγραφή αυτής της σειράς (%1)"
#: agents/rksaveagent.cpp:60
-msgid ""
-"No filename given. Your data was NOT saved. Do you still want to proceed?"
+msgid "No filename given. Your data was NOT saved. Do you still want to proceed?"
msgstr ""
"Δεν δόθηκε όνομα αρχείου. Τα δεδομένα σας δεν αποθηκεύτηκαν. Θέλετε να "
"συνεχίσετε;"
@@ -336,8 +336,7 @@
msgstr "Αφαίρεση αντικειμένου;"
#: core/rkmodificationtracker.cpp:62
-msgid ""
-"Do you really want to remove the object '%1'? There's no way to get it back."
+msgid "Do you really want to remove the object '%1'? There's no way to get it back."
msgstr ""
"Θέλετε πραγματικά να διαγράψετε το αντικείμενο '%1'; Δεν θα υπάρχει τρόπος "
"να το ανακτήσετε."
@@ -412,12 +411,11 @@
"Packages will typically be blacklisted, if they contain huge amount of data, "
"that would take too long to load. To unlist the package, visit Settings-"
">Configure RKWard->Workspace."
-msgstr ""
+msgstr "Το πακέτο '%1' (πιθανόν μόλις το έχετε φορτώσει) είναι προσωρινά μπλοκαρισμένο για την λήψη πληροφοριών για την δομή του. Πρακτικά αυτό σημαίνει ότι τα αντικείμενα αυτού του πακέτου δεν θα εμφανιστούν στον χώρο εργασίας και καμία λειτουργία συμπλήρωσης του ονόματος του αντικειμένου ή τονισμού των μεταβλητών των συναρτήσεων για αυτό το πακέτο δεν θα είναι διαθέσιμη.\n Τα πακέτα τυπικά θα μπλοκάρονται εάν περιέχουν τεράστιο ποσό δεδομένων τα οποία θα έκαναν πολύ ώρα να φορτωθούν. Για να ξεμπλοκάρετε το πακέτο επισκεφθείτε το Ρυθμίσεις ->Ρύθμιση RKWard->Χώρος εργασίας"
#: core/renvironmentobject.cpp:91
-#, fuzzy
msgid "Package blacklisted"
-msgstr "Το πακέτο δεν είναι διαθέσιμο"
+msgstr "Το πακέτο είναι μπλοκαρισμένο"
#: windows/rkcommandeditorwindowpart.cpp:51
msgid "Run all"
@@ -637,7 +635,6 @@
msgstr "Αδυναμία ανοίγματος του φακέλου εντολών"
#: windows/rkworkplace.cpp:260
-#, fuzzy
msgid ""
"You are about to edit object \"%1\", which is very large (%2 fields). RKWard "
"is not optimized to handle very large objects in the built in data editor. "
@@ -652,7 +649,7 @@
msgstr ""
"Πρόκειται να επεξεργαστείτε το αντικείμενο \"%1\", το οποίο είναι πολύ "
"μεγάλο (%2 πεδία). Το RKWard δεν είναι βελτιστοποιημένο να χειρίζεται πολύ "
-"μεγάλα αντικείμενα στο ενσωματωμένο επεξεργαστή. Αυτό θα χρησιμοποιήσει πολύ "
+"μεγάλα αντικείμενα στο ενσωματωμένο επεξεργαστή δεδομένων. Αυτό θα χρησιμοποιήσει πολύ "
"μνήμη και-ανάλογα με το σύστημά σας- μπορεί να γίνει πολύ αργό. Για μεγάλα "
"αντικείμενα συνίσταται γενικά να τα επεξεργαστείτε μέσω της γραμμής εντολών "
"ή να τα χωρίσετε σε μικρότερα κομμάτια πριν τα επεξεργαστείτε. Από την άλλη "
@@ -758,13 +755,11 @@
#: windows/rkwindowcatcher.cpp:240
msgid "Specify the R object name, you want to save the graph to"
-msgstr ""
-"Επιλέξτε το όνομα του αντικειμένου R με το οποίο θέλετε να σώσετε τ\xCE\xBF γράφημα"
+msgstr "Επιλέξτε το όνομα του αντικειμένου R με το οποίο θέλετε να σώσετε το γράφημα"
#: windows/rkwindowcatcher.cpp:251
msgid "Save contents of graphics device number %1 to object '%2'"
-msgstr ""
-"Αποθήκευση περιεχομένων της συσκευής γραφικών νούμερο %1 στο αντικείμενο '%2'"
+msgstr "Αποθήκευση περιεχομένων της συσκευής γραφικών νούμερο %1 στο αντικείμενο '%2'"
#: windows/rkwindowcatcher.cpp:260
msgid "Duplicate graphics device number %1"
@@ -835,9 +830,8 @@
msgstr "Εμφάνιση/Απόκρυψη του περιηγητή του χώρου εργασίας"
#: windows/rktoplevelwindowgui.cpp:63
-#, fuzzy
msgid "Show/Hide Filesystem Browser"
-msgstr "Εμφάνιση/Απόκρυψη του περιηγητή του χώρου εργασίας"
+msgstr "Εμφάνιση/Απόκρυψη τ\xCE\xBFυ περιηγητή αρχείων του συστήματος"
#: windows/rktoplevelwindowgui.cpp:64
msgid "Show/Hide Command Log"
@@ -1116,15 +1110,15 @@
#: settings/rksettingsmoduleobjectbrowser.cpp:76
msgid "Never fetch the structure of these packages:"
-msgstr ""
+msgstr "Να μην γίνεται ανάκτηση ποτέ της δομής αυτών των πακέτων"
#: settings/rksettingsmoduleobjectbrowser.cpp:101
msgid "Add exclusion"
-msgstr ""
+msgstr "Προσθέστε εξαίρεση"
#: settings/rksettingsmoduleobjectbrowser.cpp:101
msgid "Add the name of the package that no structure should be fetched for"
-msgstr ""
+msgstr "Προσθέστε το όνομα του πακέτου για το οποίο δεν μπόρεσε να βρεθεί η δομή"
#: settings/rksettingsmoduleobjectbrowser.cpp:128 rkward.cpp:214
msgid "Workspace"
@@ -1324,7 +1318,7 @@
#: settings/rksettingsmoduler.cpp:90
msgid "Maximum number of elements shown in print"
-msgstr ""
+msgstr "Μέγιστος αριθμός εμφάνισης στοιχείων στην εντολή print"
#: settings/rksettingsmoduler.cpp:96
msgid "Maximum length of warnings/errors to print"
@@ -1384,8 +1378,7 @@
#: settings/rksettingsmoduler.cpp:294
msgid "R Library locations (where libraries get installed to, locally)"
-msgstr ""
-"Τοποθεσίες βιβλιοθηκών R (εκεί όπου οι βιβλιοθήκες εγκαθιστώνται τοπικά)"
+msgstr "Τοποθεσίες βιβλιοθηκών R (εκεί όπου οι βιβλιοθήκες εγκαθιστώνται τοπικά)"
#: settings/rksettingsmoduler.cpp:299
msgid ""
@@ -1487,8 +1480,7 @@
#: settings/rksettingsmodulewatch.cpp:147
msgid "Maximum number of paragraphs/lines to display in the Command Log"
-msgstr ""
-"Μέγιστος αριθμός παραγράφων/γραμμών προβολής στο αρχείο καταγραφής εντολών"
+msgstr "Μέγιστος αριθμός παραγράφων/γραμμών προβολής στο αρχείο καταγραφής εντολών"
#: settings/rksettings.cpp:63
msgid "Settings"
@@ -1751,8 +1743,7 @@
#: misc/xmlhelper.cpp:260
msgid "Illegal attribute value. Allowed values are one of '%1', only."
-msgstr ""
-"Μη επιτρεπόμενη τιμής ιδιότητας. Επιτρεπόμενες τιμές είναι μόνο μία από '%1'."
+msgstr "Μη επιτρεπόμενη τιμής ιδιότητας. Επιτρεπόμενες τιμές είναι μόνο μία από '%1'."
#: misc/xmlhelper.cpp:274
msgid "Illegal attribute value. Only integer numbers are allowed."
@@ -1760,8 +1751,7 @@
#: misc/xmlhelper.cpp:290
msgid "Illegal attribute value. Only real numbers are allowed."
-msgstr ""
-"Μη επιτρεπόμενη τιμής ιδιότητας. Μόνο πραγματικοί αριθμοί επιτρέπονται."
+msgstr "Μη επιτρεπόμενη τιμής ιδιότητας. Μόνο πραγματικοί αριθμοί επιτρέπονται."
#: misc/xmlhelper.cpp:308
msgid "Illegal attribute value. Allowed values are '%1' or '%2', only."
@@ -1774,8 +1764,7 @@
msgstr "Ανάλυση XML '%1' "
#: misc/rkprogresscontrol.cpp:203
-msgid ""
-"<b>There have been errors and / or warnings! See below for a transcript</b>"
+msgid "<b>There have been errors and / or warnings! See below for a transcript</b>"
msgstr ""
"<b>Υπήρξαν σφάλματα ή / και προειδοποιήσεις! Δείτε παρακάτω για μια "
"περιγραφή</b>"
@@ -1888,7 +1877,6 @@
"υποστήριξης PHP)"
#: scriptbackends/phpbackend.cpp:197
-#, fuzzy
msgid ""
"There has been an error\n"
"(\"%1\")\n"
@@ -1896,11 +1884,10 @@
"in RKWard or a problem with your PHP installation. Check the settings "
"(Settings->Configure Settings->PHP backend) and try again."
msgstr ""
-"Υπήρξε σφάλμα\n"
+"Υπήρξε ένα σφάλμα\n"
"(\"%1\")\n"
"κατά την ένα\xCF\x81ξη της μηχανής υποστήριξης PHP. Το πιο πιθανόν είναι να "
-"οφείλεται σε bug του rkward ή σε μη έγκυρη ρύθμιση της τοποθεσίας των "
-"βοηθητικών αρχείων της PHP. Ελέγξτε τις ρυθμίσεις (Ρυθμίσεις->Ρύθμιση-"
+"οφείλεται είτε σε σφάλμα (bug) του RKWard ή σε πρόβλημα στην εγκατάσταση της PHP. Ελέγξτε τις ρυθμίσεις (Ρυθμίσεις->Ρύθμιση-"
">Μηχανή υποστήριξης PHP) και προσπαθήστε ξανά."
#: scriptbackends/phpbackend.cpp:227
@@ -2157,7 +2144,7 @@
#: main.cpp:77
msgid "Disable R C stack checking"
-msgstr ""
+msgstr "Απενεργοποίηση ελέγχου R C σωρού"
#: main.cpp:84
msgid "Project leader / main developer"
@@ -2245,7 +2232,7 @@
#: rkward.cpp:219
msgid "File-system Browser"
-msgstr ""
+msgstr "Περιηγητής σ\xCF\x85στήματος αρχείων"
#: rkward.cpp:222
msgid "Pending Jobs"
@@ -2379,8 +2366,7 @@
#: rkward.cpp:569 robjectbrowser.cpp:173 robjectbrowser.cpp:207
msgid "The name you specified was already in use or not valid. Renamed to %1"
-msgstr ""
-"Το όνομα που δώσατε ήδη υπάρχει ή δεν είναι έγκυρο. Μετονομάστηκε σε %1"
+msgstr "Το όνομα που δώσατε ήδη υπάρχει ή δεν είναι έγκυρο. Μετονομάστηκε σε %1"
#: rkward.cpp:569 robjectbrowser.cpp:173 robjectbrowser.cpp:207
msgid "Invalid Name"
@@ -2460,27 +2446,25 @@
msgstr "Παράκαμψη τερματικού"
#: robjectviewer.cpp:70
-#, fuzzy
msgid ""
"\n"
"Result of 'summary (%1)':\n"
msgstr ""
"\n"
-"Αποτέλεσμα του print ("
+"Αποτέλεσμα του 'summary (%1)':\n"
#: robjectviewer.cpp:72 robjectviewer.cpp:84 robjectviewer.cpp:109
#: robjectviewer.cpp:120
msgid "Hide"
-msgstr ""
+msgstr "Απόκρυψη"
#: robjectviewer.cpp:82
-#, fuzzy
msgid ""
"\n"
"Result of 'print (%1)':\n"
msgstr ""
"\n"
-"Αποτέλεσμα του print ("
+"Αποτέλεσμα του print (%1)':\n"
#: robjectviewer.cpp:93
msgid "Object Viewer: "
@@ -2488,21 +2472,19 @@
#: robjectviewer.cpp:111 robjectviewer.cpp:122
msgid "Show"
-msgstr ""
+msgstr "Προβολή"
#: robjectviewer.cpp:137
-#, fuzzy
msgid "Fetching information"
-msgstr "Ανάκτηση λίστας"
+msgstr "Ανάκτηση πληροφοριών"
#: robjectviewer.cpp:162
msgid "<b>Object was deleted!</b>"
-msgstr ""
+msgstr "<b>Το αντικείμενο έχει διαγραφεί!</b>"
#: robjectviewer.cpp:175
-#, fuzzy
msgid "Ready"
-msgstr "Έτοιμο."
+msgstr "Έτοιμο"
#: _translatorinfo.cpp:1
msgid ""
@@ -2580,64 +2562,3 @@
msgid "Show Hidden Objects"
msgstr "Εμφάνιση κρυφών αντικειμένων"
-#~ msgid ""
-#~ "The R-backend has reported one or more error(s) while processing the "
-#~ "plugin '%1'.\n"
-#~ "This may lead to an incorrect output and is likely due to a bug in the "
-#~ "plugin.\n"
-#~ "A transcript of the error message(s) is shown below."
-#~ msgstr ""
-#~ "Η μηχανή υποστήριξης R ανέφερε ένα ή περισσότερα σφάλματα κατά τη "
-#~ "διάρκεια επεξεργασίας του προσθέτου '%1'.\n"
-#~ "Αυτό μπορεί να οδηγήσει σε λάθος αποτελέσματα και πιθανόν να οφείλετε σε "
-#~ "κάποιο bug στο πρόσθετο.\n"
-#~ "Μία περιγραφή του σφάλματος φαίνεται παρακάτω. "
-
-#~ msgid "R-Error"
-#~ msgstr "Σφάλμα R"
-
-#~ msgid "Syntax error"
-#~ msgstr "Σφάλμα σύνταξης"
-
-#~ msgid "command incomplete"
-#~ msgstr "μη ολοκληρωμένη εντολή "
-
-#~ msgid "Browse"
-#~ msgstr "Εξερεύνηση"
-
-#~ msgid "Object name: "
-#~ msgstr "Όνομα αντικειμένου: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Full location: "
-#~ msgstr ""
-#~ "\n"
-#~ "Πλήρης διαδρομή τοποθεσίας: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Class(es): "
-#~ msgstr ""
-#~ "\n"
-#~ "Κλάσεις: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Dimensions: "
-#~ msgstr ""
-#~ "\n"
-#~ "Διαστάσεις: "
-
-#~ msgid ")':\n"
-#~ msgstr ")':\n"
-
-#~ msgid " - Waiting for results from R..."
-#~ msgstr " - Αναμονή αποτελεσμάτων από το R..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Some errors occurred: "
-#~ msgstr ""
-#~ "\n"
-#~ "Υπήρξαν κάποια σφάλματα: "
Modified: branches/release_branch_0.4.8/po/es.po
===================================================================
--- branches/release_branch_0.4.8/po/es.po 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/po/es.po 2007-09-27 12:21:42 UTC (rev 1999)
@@ -12,7 +12,7 @@
"Project-Id-Version: rkward\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-19 21:39+0200\n"
-"PO-Revision-Date: 2007-06-18 13:32-0500\n"
+"PO-Revision-Date: 2007-09-23 18:01-0500\n"
"Last-Translator: Germán Márquez Mejía <gmarquez at javeriana.edu.co>\n"
"Language-Team: español <es at li.org>\n"
"MIME-Version: 1.0\n"
@@ -169,8 +169,7 @@
msgstr "Borrar esta fila (%1)"
#: agents/rksaveagent.cpp:60
-msgid ""
-"No filename given. Your data was NOT saved. Do you still want to proceed?"
+msgid "No filename given. Your data was NOT saved. Do you still want to proceed?"
msgstr ""
"No se ha indicado un nombre de archivo. Sus datos NO han sido guardados. "
"¿Aun así desea continuar?"
@@ -331,8 +330,7 @@
msgstr "¿Eliminar objeto?"
#: core/rkmodificationtracker.cpp:62
-msgid ""
-"Do you really want to remove the object '%1'? There's no way to get it back."
+msgid "Do you really want to remove the object '%1'? There's no way to get it back."
msgstr ""
"¿Realmente desea eliminar el objeto «%1»? Esta operación no se puede "
"deshacer."
@@ -408,11 +406,12 @@
"that would take too long to load. To unlist the package, visit Settings-"
">Configure RKWard->Workspace."
msgstr ""
+"El paquete «%1» (probablemente lo acaba de cargar) está en lista negra para obtener información de su estructura. En la práctica, esto significa que los objetos que contiene no aparecerán en el navegador de objetos, y que no habrá completado de nombres o ayuda con los argumentos de funciones para los objetos en este paquete.\n"
+"Comúnmente, los paquetes están en lista negra si contienen una gran cantidad de datos que tomaría mucho tiempo cargar. Para sacar el paquete de esta lista visite Preferencias->Configurar RKWard->Espacio de trabajo."
#: core/renvironmentobject.cpp:91
-#, fuzzy
msgid "Package blacklisted"
-msgstr "Paquete no disponible"
+msgstr "Paquete en lista negra"
#: windows/rkcommandeditorwindowpart.cpp:51
msgid "Run all"
@@ -630,7 +629,6 @@
msgstr "No se pudo abrir el archivo de comandos"
#: windows/rkworkplace.cpp:260
-#, fuzzy
msgid ""
"You are about to edit object \"%1\", which is very large (%2 fields). RKWard "
"is not optimized to handle very large objects in the built in data editor. "
@@ -648,10 +646,10 @@
"de datos incorporado. Esto hace uso de mucha memoria, y -dependiendo de su "
"sistema- puede ser muy lento. Para objetos grandes, generalmente se "
"recomienda la edición por línea de comandos o separar los datos en porciones "
-"más pequeñas antes de editar. Por otro lado, si usted cuenta con suficiente "
+"más pequeñas antes de editar. Por otro lado, si cuenta con suficiente "
"memoria, o los datos son lo bastante simples (los datos numéricos son más "
"fáciles de manejar que los factores), editarlos no ha de representar un "
-"problema. PUede configurar/desactivar este aviso en Preferencias->Configurar "
+"problema. Puede configurar este aviso (o desactivarlo completamente) en Preferencias->Configurar "
"RKWard->General.\n"
"¿Realmente desea editar el objeto?"
@@ -689,8 +687,7 @@
#: windows/rkcommandlog.cpp:177
msgid "An unspecified error occurred while running the command.\n"
-msgstr ""
-"Ha ocurrido un error no especificado durante la ejecución del comando.\n"
+msgstr "Ha ocurrido un error no especificado durante la ejecución del comando.\n"
#: windows/rkwindowcatcher.cpp:60
msgid ""
@@ -823,9 +820,8 @@
msgstr "Mostrar/ocultar navegador del espacio de trabajo"
#: windows/rktoplevelwindowgui.cpp:63
-#, fuzzy
msgid "Show/Hide Filesystem Browser"
-msgstr "Mostrar/ocultar navegador del espacio de trabajo"
+msgstr "Mostrar/ocultar navegador de archivos"
#: windows/rktoplevelwindowgui.cpp:64
msgid "Show/Hide Command Log"
@@ -1103,15 +1099,15 @@
#: settings/rksettingsmoduleobjectbrowser.cpp:76
msgid "Never fetch the structure of these packages:"
-msgstr ""
+msgstr "No obtener nunca la estructura de estos paquetes:"
#: settings/rksettingsmoduleobjectbrowser.cpp:101
msgid "Add exclusion"
-msgstr ""
+msgstr "Añadir exclusión"
#: settings/rksettingsmoduleobjectbrowser.cpp:101
msgid "Add the name of the package that no structure should be fetched for"
-msgstr ""
+msgstr "Añadir el nombre del paquete del cual no se debe obtener la estructura"
#: settings/rksettingsmoduleobjectbrowser.cpp:128 rkward.cpp:214
msgid "Workspace"
@@ -1119,8 +1115,7 @@
#: settings/rksettingsmodulegeneral.cpp:49
msgid "Settings marked with (*) do not take effect until you restart RKWard"
-msgstr ""
-"Los ajustes marcados con (*) no tienen efecto hasta que se reinicia RKWard"
+msgstr "Los ajustes marcados con (*) no tienen efecto hasta que se reinicia RKWard"
#: settings/rksettingsmodulegeneral.cpp:53
msgid "Directory where the logfiles should be kept (*)"
@@ -1223,7 +1218,7 @@
#: settings/rksettingsmoduleplugins.cpp:68
msgid "Code shown by default"
-msgstr "Mostrar código por defecto"
+msgstr "Mostrar el código por defecto"
#: settings/rksettingsmoduleplugins.cpp:73
msgid "Default height of code display (pixels)"
@@ -1312,7 +1307,7 @@
#: settings/rksettingsmoduler.cpp:90
msgid "Maximum number of elements shown in print"
-msgstr ""
+msgstr "Número máximo de elementos mostrados en print()"
#: settings/rksettingsmoduler.cpp:96
msgid "Maximum length of warnings/errors to print"
@@ -1474,8 +1469,7 @@
#: settings/rksettingsmodulewatch.cpp:147
msgid "Maximum number of paragraphs/lines to display in the Command Log"
-msgstr ""
-"Número máximo de párrafos/renglones a mostrar en la bitácora de comandos"
+msgstr "Número máximo de párrafos/renglones a mostrar en la bitácora de comandos"
#: settings/rksettings.cpp:63
msgid "Settings"
@@ -1681,7 +1675,7 @@
"\"Configure Repositories\"-button to set up a writable directory to install "
"packages to)."
msgstr ""
-"No tiene permiso de escritura en el directorio donde intenta instalar (%1) . "
+"No tiene permiso de escritura en el directorio donde intenta instalar (%1). "
"Si usted es el(la) administrador(a) de este equipo puede intentar instalar "
"los paquetes como root (se le solicitará la contraseña de administrador(a)). "
"De lo contrario, deberá seleccionar una ubicación diferente para la "
@@ -1754,10 +1748,8 @@
msgstr "Procesando XML «%1» "
#: misc/rkprogresscontrol.cpp:203
-msgid ""
-"<b>There have been errors and / or warnings! See below for a transcript</b>"
-msgstr ""
-"<b>¡Se han encontrado errores y/o avisos! Mire el reporte más abajo</b>"
+msgid "<b>There have been errors and / or warnings! See below for a transcript</b>"
+msgstr "<b>¡Se han encontrado errores y/o avisos! Mire el reporte más abajo</b>"
#: misc/rkprogresscontrol.cpp:213
msgid "Show Output"
@@ -1867,7 +1859,6 @@
">Motor PHP)"
#: scriptbackends/phpbackend.cpp:197
-#, fuzzy
msgid ""
"There has been an error\n"
"(\"%1\")\n"
@@ -1878,8 +1869,7 @@
"Ha ocurrido un error\n"
"(«%1»)\n"
"mientras se iniciaba el motor PHP. Probablemente se deba a un error en "
-"RKWard o a una configuración no válida de la ubicación de los archivos de "
-"soporte de PHP. Compruebe la configuración (Preferencias->Configurar RKWard-"
+"RKWard o a un problema con su instalación de PHP. Compruebe la configuración (Preferencias->Configurar RKWard-"
">Motor PHP) e intente nuevamente."
#: scriptbackends/phpbackend.cpp:227
@@ -2133,7 +2123,7 @@
#: main.cpp:77
msgid "Disable R C stack checking"
-msgstr ""
+msgstr "Deshabilitar verificación de pila C de R"
#: main.cpp:84
msgid "Project leader / main developer"
@@ -2220,7 +2210,7 @@
#: rkward.cpp:219
msgid "File-system Browser"
-msgstr ""
+msgstr "Navegador de archivos"
#: rkward.cpp:222
msgid "Pending Jobs"
@@ -2433,27 +2423,25 @@
msgstr "Obviar la consola"
#: robjectviewer.cpp:70
-#, fuzzy
msgid ""
"\n"
"Result of 'summary (%1)':\n"
msgstr ""
"\n"
-"Resultado de «print("
+"Resultado de «summary (%1)»:\n"
#: robjectviewer.cpp:72 robjectviewer.cpp:84 robjectviewer.cpp:109
#: robjectviewer.cpp:120
msgid "Hide"
-msgstr ""
+msgstr "Ocultar"
#: robjectviewer.cpp:82
-#, fuzzy
msgid ""
"\n"
"Result of 'print (%1)':\n"
msgstr ""
"\n"
-"Resultado de «print("
+"Resultado de «print (%1)»:\n"
#: robjectviewer.cpp:93
msgid "Object Viewer: "
@@ -2461,37 +2449,31 @@
#: robjectviewer.cpp:111 robjectviewer.cpp:122
msgid "Show"
-msgstr ""
+msgstr "Mostrar"
#: robjectviewer.cpp:137
-#, fuzzy
msgid "Fetching information"
-msgstr "Obteniendo la lista"
+msgstr "Obteniendo información"
#: robjectviewer.cpp:162
msgid "<b>Object was deleted!</b>"
-msgstr ""
+msgstr "<b>¡El objeto fue borrado!</b>"
#: robjectviewer.cpp:175
-#, fuzzy
msgid "Ready"
-msgstr "Preparado."
+msgstr "Preparado"
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
-"Marcelino Villarino\n"
-"Germán Márquez Mejía"
+msgstr "Marcelino Villarino, Germán Márquez Mejía"
#: _translatorinfo.cpp:3
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
-"mvillarino at users.sourceforge.net\n"
-"gmarquez at javeriana.edu.co"
+msgstr "mvillarino at users.sourceforge.net, gmarquez at javeriana.edu.co"
#: robjectbrowser.cpp:114
msgid "Objects in the R workspace"
Modified: branches/release_branch_0.4.8/rkward/pages/Makefile.am
===================================================================
--- branches/release_branch_0.4.8/rkward/pages/Makefile.am 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/pages/Makefile.am 2007-09-27 12:21:42 UTC (rev 1999)
@@ -7,5 +7,6 @@
rkward_help.css \
rkward_shortcuts.rkh \
rkward_trouble_shooting.rkh \
- rkward_output.rkh
+ rkward_output.rkh \
+ rkward_workspace_browser.rkh
Modified: branches/release_branch_0.4.8/rkward/pages/rkward_console.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/pages/rkward_console.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/pages/rkward_console.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -59,6 +59,7 @@
<li><b>Maximum length command history</b>: Only this many lines are kept in the <link href="#command_history">command history</link>.</li>
<li><b>Maximum number of paragraphs/lines to display in the console</b>: No more than this many total lines (commands and output) will be shown in the console. When this number of lines is exceeded, lines will be removed at the top of the console window. To clear the console entirely, chose "Clear" from the context menu or the Edit menu.</li>
<li><b>Run commands from script editor throught the console</b>: Commands coming from script editors may be sent through the console, i.e. the commands and their results will be shown in the console. If this option is not checked, the commands will only be visible in the Command log, but not in the console.</li>
+ <li><b>Also add those commands to console history</b>: If the above option is checked, this affects, whether such commands are also added to the console history. Turning off this option may help to keep the console history "clean".</li>
<li><b>Command history is context sensitive by default</b>: If this is checked, the context sensitive mode of navigating the <link href="#command_history">command history</link> is the default, i.e. available with Up/Down without Shift. Else the key binding for this is Shift+Up/Down.</li>
</ul>
</section>
Modified: branches/release_branch_0.4.8/rkward/pages/rkward_for_new_users.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/pages/rkward_for_new_users.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/pages/rkward_for_new_users.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -11,7 +11,7 @@
R - and hence RKWard - can deal with a large number of different types of data: The well known spreadsheets, but also single vectors of data (like a column in a spreadsheet), so called "list"s of different vectors or other objects that may have different lengths, single data points, etc. Even most of the language itself, the functions, are stored just like data and can also be edited.
-At the same time, R is not confined to working with just one piece of data at a time, but rather you have a "Workspace", where all your different variables, tables, etc. are accessible. You can have many data.frames at once, and additional data of other types. At the left side of the application window, there should be an icon labelled "Workspace". You can click on this to see all the objects present in your workspace. All the objects you create or modify will be visible inside the ".GlobalEnv". Most other objects are predefined in libraries, such as "package:base".
+At the same time, R is not confined to working with just one piece of data at a time, but rather you have a "Workspace", where all your different variables, tables, etc. are accessible. You can have many data.frames at once, and additional data of other types. At the left side of the application window, there should be an icon labelled "Workspace". You can click on this to see all the objects present in your workspace. All the objects you create or modify will be visible inside the ".GlobalEnv". Most other objects are predefined in libraries, such as "package:base". See <link href="rkward://page/rkward_workspace_browser"/> for details.
You do not need to worry about all these details. To create a new spreadsheet (data.frame), chose File->New->Dataset from the menu. All you need to do is to assign a name to this table, then you can start editing. To work with pre-existing data, chose File->Import->Load data, to load data in CSV (comma separated value) format.
</section>
@@ -42,6 +42,7 @@
<li><link href="rkward://page/rkward_shortcuts"/></li>
<li><link href="rkward://page/rkward_trouble_shooting"/></li>
<li><link href="rkward://page/rkward_output"/></li>
+ <li><link href="rkward://page/rkward_workspace_browser"/></li>
</ul>
</related>
</document>
Modified: branches/release_branch_0.4.8/rkward/pages/rkward_for_r_users.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/pages/rkward_for_r_users.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/pages/rkward_for_r_users.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -28,7 +28,7 @@
<section title="Workspace View" id="workspace_browser">
RKWard comes with a "workspace view" or "object browser". By default this is available by clicking on "Workspace" on the left side of the application window. This allows you to examine and manipulate all objects in the R workspace. In case you are not familiar with this aspect of R (usually not directly visible): All the symbols you create are children of the so-called ".GlobalEnv" environment (see <link href="rkward://rhelp/.GlobalEnv"/>). Symbols defined in loaded libraries are located in their own environments.
- The object browser provides function to select with types of object are shown (on the top). Hovering the mouse over an item will show some additional information on the symbol. Right-clicking on an item will show available actions.
+ The object browser provides function to select with types of object are shown (on the top). Hovering the mouse over an item will show some additional information on the symbol. Right-clicking on an item will show available actions. See <link href="rkward://page/rkward_workspace_browser"/> for details.
</section>
<section title="R Help" id="rhelp">
By default R help pages are shown as HTML, inside RKWard. You can invoke the help in the usual way by running e.g. "?print" or "help (print)" or "help.start ()" in the console. Additionally, there is a tool window to search your installed R help pages. This is accessible using a button located at the bottom of the window (next to the console button). To view a help page found using this tool, double click on it.
@@ -56,6 +56,8 @@
<related>
<ul>
+ <li><link href="rkward://page/rkward_workspace_browser"/></li>
+ <li><link href="rkward://page/rkward_console"/></li>
<li><link href="rkward://page/rkward_for_new_users"/> For an introduction to some more basic concepts</li>
<li><link href="rkward://page/rkward_shortcuts"/></li>
</ul>
Copied: branches/release_branch_0.4.8/rkward/pages/rkward_workspace_browser.rkh (from rev 1998, trunk/rkward/rkward/pages/rkward_workspace_browser.rkh)
===================================================================
--- branches/release_branch_0.4.8/rkward/pages/rkward_workspace_browser.rkh (rev 0)
+++ branches/release_branch_0.4.8/rkward/pages/rkward_workspace_browser.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -0,0 +1,53 @@
+<!DOCTYPE rkhelp>
+<document>
+ <title>Workspace Browser</title>
+
+ <summary>
+ The workspace browser allows to view and manipulate R objects. This includes both your own objects (data, functions), and so-called "package environments". As a rough analogy, this is similar to a regular file-system browser, expect you browser R objects in your workspace, instead of files on your computer.
+
+ The workspace browser can be invoked using Windows->Activate->Show / Hide Workspace Browser (default shortcut is Alt+1), or by clicking on the "Workspace" icon, which is located on the top of the left window border, by default.
+ </summary>
+
+ <section title="What is shown" id="introduction">
+ Literally hundreds or even thousands of objects are present in a typical R session. This can be overwhelming at first, therefore the workspace browser offers to show only a certain subset of objects. The options here are "Show Hidden Objects", "All vs. Non-Functions vs. Functions", and "Show All Environments" (available at the top of the browser window, or chosing "Show Objects" from the context menu).
+
+ The first should be obvious. It controls whether objects whose name start with a dot ('.') are shown or not. Those are often used for internal objects, which are not meant for direct use, so it's generally safe to hide them from view.
+
+ The second allows to select by the type of object. "All" does not filter, while "Functions" shows only functions, and "Non-Functions" shows all other objects (typically data).
+
+ The "Show All Environments" option controls, whether package environments and their objects are shown. Roughly speaking, if you turn off this option, only your "own" objects are shown, while with the option turned on, all pre-defined objects are also shown. More technically speaking, when the option is turned off, only the .GlobalEnv (see <link href="rkward://rhelp/globalenv"/>) is shown, which is the environment, in which you create and edit your data.
+
+ Note that objects are organized in a hierarchy, i.e. some types of objects contain further "child" objects. This is indicated by a "+" symbol to the left of the object name. Clicking on this will expand the view to show all the children of the object.
+
+ Hovering the mouse pointer over an object will show a short summary of the objects' basic properties.
+ </section>
+
+ <section title="Available actions" id="actions">
+ Several actions are available from the context menu (by right-clicking on one of the objects), however some of these actions are only available for some types of objects. The most important actions for objects in package environments:
+
+ <ul>
+ <li><b>Search Help</b>: This will try to locate and show a relevant R help page on the object.</li>
+ <li><b>View</b>: Open a window with detailed information about the object. This will, among others, use the R commands <link href="rkward://rhelp/print">print</link> and <link href="rkward://rhelp/summary">summary</link> to show more information.</li>
+ <li><b>Copy to new symbol / Copy to .GlobalEnv</b>: In order to manipulate objects, you need to copy them to the .GlobalEnv. For instance, you could copy an object from the environment "package:datasets" into the .GlobalEnv, and in a second step, edit it.</li>
+ </ul>
+
+ Further actions available for objects in the .GlobalEnv:
+
+ <ul>
+ <li><b>Edit</b>: Open the object in a data editor. Currently editing is only supported for data.frames.</li>
+ <li><b>Rename / Delete</b>: These should be obvious.</li>
+ </ul>
+ </section>
+
+ <section title="Configurable Settings" id="settings">
+ Some default settings for the Workspace Browser can be configured using Settings->Configure RKWard->Workspace, or by selecting "Configure Defaults" from the context menu:
+
+ <ul>
+ <li><b>Show hidden objects / show all environments</b>: See <link href="#introduction">above</link>. In contrast to the settings made directly in the workspace browser, these configure the <i>default</i> settings in the workspace browser (i.e. those that are effectively after restarting RKWard).</li>
+ <li><b>Show objects with children</b>: Controls whether objects with children (such as environments, lists) are shown, even if they do not correspond to the current filter.</li>
+ <li><b>Show variables / functions</b>: Equivalent to the "All vs. Non-Function vs. Functions" control described <link href="#introduction">above</link>.</li>
+ <li><b>Label field / Type field / Class field</b>: Which columns are shown for each object?</li>
+ <li><b>Never fetch the structure of these packages</b>: Some (few) R packages contain <b>very</b> many small objects (tens of thousands). In the worst case, trying to fetch structure information on those (i.e. fetching the information to be shown in the workspace browser) can consume a lot of resources and make RKWard unresponsive. Package "GO" is one such package, and is "blacklisted" by default. If you note that loading a package takes exceedingly long, you may consider adding it to this list.</li>
+ </ul>
+ </section>
+</document>
\ No newline at end of file
Modified: branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.php
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.php 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.php 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,44 +1,21 @@
<?
function preprocess () { ?>
require(xtable)
-<? }
+<?
+}
function calculate () {
+ $vars = str_replace ("\n", " + ", trim (getRK_val ("x")));
+ if (!getRK_val ("intercept.state.numeric")) $intercept = "0 + ";
?>
-# This can be used in a later fase to give the user the option to choose
-# precision. For the moment is stable 5 (In summary.lm is 4).
-n=5
-results <- summary.lm (lm (<? getRK ("y"); ?> ~ <? getRK ("x"); ?>) )
-# Here we get the quantiles of the residuals and place them in a matrix
-# and we name them in order to use xtable
-quarlm<-matrix(quantile(residuals(results)),nrow=1, ncol=5)
-colnames(quarlm)<-c("Min","1Q","Median","2Q","Max")
-# We extract the coefficients
-coeflm<-coef(results)
-# the Residual standard error
-siglm<-results$sigma
-# the maximum degrees of fredom
-maxdflm<-(max(results$df))
-# the r squared and the adjusted r squared
-rsq<-results$r.squared
-arsq<-results$adj.r.squared
-# the fstatistic, we put it into a matrix and we name it in order to use xtable
-fslm<-matrix(results$fstatistic,nrow=1,ncol=3)
-colnames(fslm)<-names(results$fstatistic)
+results <- summary.lm (lm (<? getRK ("y"); ?> ~ <? echo ($intercept . $vars); ?>))
<?
}
function printout () {
?>
rk.header ("Linear Regression")
-rk.print("Residuals")
-rk.results(xtable(quarlm))
-rk.print("Coefficients")
-rk.results(xtable(coeflm))
-rk.print(c("Residual standard error: ", round(siglm,n), " on ", maxdflm, " degrees of fredom"))
-rk.print(c("Multiple R-Squared: ", round(rsq,n), ", Adjusted R-squared: ", round(arsq,n)))
-rk.print("F-statistic")
-rk.results(xtable(fslm))
+rk.print(results)
<?
}
?>
Modified: branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,23 +1,21 @@
<!DOCTYPE rkhelp>
<document>
<summary>
- This test performs the Ansari-Bradley two-sample test to test for a difference in scale parameters.
+ Perform a simple linear regression. Currently, this plugin provides only basic functionality. For more options refer to <link href="rkward://rhelp/lm"/>.
</summary>
<usage>
- Select two data sets for the Ansari-Bradley two-sample test. For this test the samples need to be numeric vectors (see below for details).
+ Select the variable to be predicted (dependent), and one or more independent variables.
</usage>
<settings>
- <caption id="tab_variables"/>
- <setting id="x">Select the data to be computed. The vectors need to be numeric.</setting>
- <setting id="y">Select the data to be computed. The vectors need to be numeric.</setting>
- <caption id="tab_options"/>
+ <setting id="y">The dependent variable. This must be numeric.</setting>
+ <setting id="x">One or more independent variables, each of the same length as the dependent. Note that factor variables are treated as categorial predictors, while numeric variables are treated as continuous predictors, automatically.</setting>
+ <setting id="intercept">Should an intercept term be included in the model?</setting>
</settings>
<related>
<ul>
<li><link href="rkward://rhelp/lm"/></li>
</ul>
-
</related>
</document>
Modified: branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.xml
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.xml 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/analysis/regression/linear_regression.xml 2007-09-27 12:21:42 UTC (rev 1999)
@@ -4,20 +4,15 @@
<help file="linear_regression.rkh"/>
<dialog label="Fitting Linear Models">
- <tabbook>
- <tab label="Basic settings" id="tab_variables">
- <row>
- <varselector id="vars"/>
- <column>
- <varslot type="numeric" id="y" source="vars" required="true" label="dependent variable"/>
- <varslot type="numeric" id="x" source="vars" required="true" label="independent variable"/>
- <stretch/>
- </column>
- </row>
- </tab>
- <tab label="Options" id="tab_options">
- </tab>
- </tabbook>
+ <row>
+ <varselector id="vars"/>
+ <column>
+ <varslot type="numeric" id="y" source="vars" required="true" label="dependent variable"/>
+ <varslot type="numeric" id="x" source="vars" required="true" multi="true" label="independent variables"/>
+ <checkbox id="intercept" label="include intercept" checked="true"/>
+ <stretch/>
+ </column>
+ </row>
</dialog>
</document>
Modified: branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,16 +1,17 @@
<!DOCTYPE rkhelp>
<document>
<summary>
- This test computes Box–Pierce or Ljung–Box test statistic for examining the null hypothesis of independence in a given time series.
+ This test computes Box-Pierce or Ljung-Box test statistic for examining the null hypothesis of independence in a given time series.
</summary>
<usage>
- Select the data sets for which you want to perform the Box–Pierce or Ljung–Box test. For this test the samples need to be numeric vectors (see below for details).
+ Select the data sets for which you want to perform the Box-Pierce or Ljung-Box test. For this test the samples need to be numeric vectors (see below for details).
</usage>
<settings>
<caption id="tab_variables"/>
<setting id="x">Select the data to be computed. The vectors need to be numeric, and can be of different length.</setting>
+ <setting id="lag">Number of autocorrelation coefficients to base the test on.</setting>
<setting id="type">Define type of test. Either Ljung-Box or Box-Pierce can be used.</setting>
<caption id="tab_options"/>
<setting id="narm">Exclude missing values from calculation?</setting>
@@ -18,6 +19,7 @@
</settings>
<related>
<ul>
+ <li><link href="rkward://component/kpss_test"/></li>
<li><link href="rkward://rhelp/Box.test"/></li>
</ul>
</related>
Modified: branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.xml
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.xml 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/Box_test.xml 2007-09-27 12:21:42 UTC (rev 1999)
@@ -12,7 +12,7 @@
<varselector id="vars"/>
<column>
<varslot type="numeric" id="x" multi="true" source="vars" required="true" label="variable(s):"/>
- <spinbox type="real" label="lag" id="lag" min="0" initial="1" max="99" />
+ <spinbox type="integer" label="lag" id="lag" min="0" initial="1" max="99" />
<frame label="Type of test">
<radio id="type" label="test to be performed">
<option label="Box-Pierce" value="Box-Pierce"/>
Modified: branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/kpss_test.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/kpss_test.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/analysis/time_series/kpss_test.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -19,6 +19,7 @@
</settings>
<related>
<ul>
+ <li><link href="rkward://component/Box_test"/></li>
<li><link href="rkward://rhelp/kpss.test"/></li>
</ul>
</related>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/barplot.php
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/barplot.php 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/barplot.php 2007-09-27 12:21:42 UTC (rev 1999)
@@ -17,12 +17,13 @@
function doPrintout ($final) {
$var = getRK_val ("x");
+ $names_mode = getRK_val ("names_mode");
$tabulate = getRK_val ("tabulate");
if ($tabulate) {
- $tabulate_header = '"Tabulate:", "No"';
+ $tabulate_header = '"Tabulate", "Yes"';
} else {
- $tabulate_header = '"Tabulate:", "Yes"';
+ $tabulate_header = '"Tabulate", "No"';
}
$barplot_header = getRK_val ("barplot_embed.code.preprocess");
@@ -36,10 +37,16 @@
<? } else { ?>
# barplot is a bit picky about attributes, so we need to convert to vector explicitely
if(!is.matrix(x)) x <- as.vector(x)
-<? }
+<? }
+ if ($names_mode == "rexp") {
+ echo ("names(x) <- " . getRK_val ("names_exp") . "\n");
+ } else if ($names_mode == "custom") {
+ echo ("names(x) <- c (\"" . str_replace (";", "\", \"", trim (getRK_val ("names_custom"))) . "\")\n");
+ }
+
if ($final) { ?>
-rk.header ("Barplot", parameters=list (<? echo ($tabulate_header . $barplot_header); ?>))
+rk.header ("Barplot", parameters=list ("Variable", rk.get.description (<? echo ($var); ?>), <? echo ($tabulate_header . $barplot_header); ?>))
rk.graph.on ()
<? }
@@ -47,6 +54,7 @@
try ({
<?
printIndented ("\t", $barplot_main);
+
?>
})
<? if ($final) { ?>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/barplot.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/barplot.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/barplot.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -12,6 +12,7 @@
<caption id="tab_variables"/>
<setting id="x">Select a data matrix, a vector or a factor to be plotted.</setting>
<setting id="tabulate">Use tabulate option mainly for factor variables or wherever else applicable</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>
<caption id="tab_options"/>
<setting id="barplot_embed" title="Barplot Options">Since these settings are reused in further plugins, they are documented on a page of their own: See <link href="rkward://component/barplot_embed"/>.</setting>
</settings>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/barplot.xml
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/barplot.xml 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/barplot.xml 2007-09-27 12:21:42 UTC (rev 1999)
@@ -1,27 +1,44 @@
-<!DOCTYPE rkplugin>
-<document>
- <code file="barplot.php" />
- <help file="barplot.rkh" />
- <logic>
- <set id="barplot_embed.xvar" to="x"/>
- </logic>
- <dialog label="Barplot" >
- <tabbook>
- <tab label="Variables" id="tab_variables">
- <row>
- <varselector id="vars"/>
- <column>
- <varslot min_vars="1" id="x" source="vars" required="true" label="Matrix, Vector or Factor"/>
- <checkbox id="tabulate" label="Tabulate" value="1" value_unchecked="0" checked="false" />
- <stretch/>
- <preview id="preview"/>
- </column>
- </row>
- </tab>
- <tab label="Options" id="tab_options">
- <embed id="barplot_embed" component="rkward::barplot_embed"/>
- </tab>
- </tabbook>
- </dialog>
-
-</document>
+ <!DOCTYPE rkplugin>
+ <document>
+ <code file="barplot.php" />
+ <help file="barplot.rkh" />
+ <logic>
+ <set id="barplot_embed.xvar" to="x"/>
+
+ <convert id="custom_names" mode="equals" sources="names_mode.string" standard="custom"/>
+ <convert id="rexp_names" mode="equals" sources="names_mode.string" standard="rexp"/>
+ <connect client="names_custom.visible" governor="rexp_names.not"/>
+ <connect client="names_custom.enabled" governor="custom_names"/>
+ <connect client="names_exp.visible" governor="rexp_names"/>
+ <connect client="names_exp.required" governor="rexp_names"/>
+ </logic>
+ <dialog label="Barplot" >
+ <tabbook>
+ <tab label="Variables" id="tab_variables">
+ <row>
+ <varselector id="vars"/>
+ <column>
+ <varslot min_vars="1" id="x" source="vars" required="true" label="Matrix, Vector or Factor"/>
+ <checkbox id="tabulate" label="Tabulate" value="1" value_unchecked="0" checked="false" />
+ <stretch/>
+ <frame label="Labels">
+ <radio id="names_mode" label="Labeling" >
+ <option value="default" label="Default labels" checked="true"/>
+ <option value="custom" label="Custom labels"/>
+ <option value="rexp" label="From R expression"/>
+ </radio>
+ <input id="names_exp" label="Expression to use for labels" initial="names (x)"/>
+ <input id="names_custom" label="Labels (separated by ';')" initial="First label;Second label"/>
+ </frame>
+ <preview id="preview"/>
+ </column>
+ </row>
+ </tab>
+ <tab label="Options" id="tab_options">
+
+ <embed id="barplot_embed" component="rkward::barplot_embed"/>
+ </tab>
+ </tabbook>
+ </dialog>
+
+ </document>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/barplot_embed.xml
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/barplot_embed.xml 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/barplot_embed.xml 2007-09-27 12:21:42 UTC (rev 1999)
@@ -16,8 +16,8 @@
<dialog label="Barplot Options">
<checkbox id="legend" label="Draw Legend" value="1" value_unchecked="0" checked="false"/>
<radio id="colors" label="Colors" >
- <option value="default" label="Default (grayscale)"/>
- <option value="rainbow" label="Rainbow colors" checked="true"/>
+ <option value="default" label="Default (grayscale)" checked="true" />
+ <option value="rainbow" label="Rainbow colors" />
</radio>
<radio id="type" label="Type" >
<option value="juxtaposed" label="Juxtaposed" checked="true"/>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.php
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.php 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.php 2007-09-27 12:21:42 UTC (rev 1999)
@@ -17,7 +17,14 @@
function doPrintout ($final) {
$vars = getRK_val ("x");
+ $names_mode = getRK_val ("names_mode");
$tabulate= getRK_val ("tabulate")=="TRUE";
+ $tabulate= getRK_val ("tabulate");
+ if ($tabulate) {
+ $tabulate_header = '"Tabulate", "Yes"';
+ } else {
+ $tabulate_header = '"Tabulate", "No"';
+ }
$options = getRK_val ("plotoptions.code.printout");
@@ -35,13 +42,18 @@
<? } ?>
<? if ($final) { ?>
-rk.header ("Dot chart", list ("Variable", rk.get.description (<? echo ($vars); ?>)))
+rk.header ("Dot chart", parameters=list ("Variable", rk.get.description (<? echo ($vars); ?>), <? echo ($tabulate_header); ?>))
rk.graph.on ()
<? }
?>
try ({
-<? if (!empty ($plotpre)) printIndented ("\t", $plotpre); ?>
+<? if ($names_mode == "rexp") {
+ echo ("names(x) <- " . getRK_val ("names_exp") . "\n");
+ } else if ($names_mode == "custom") {
+ echo ("names(x) <- c (\"" . str_replace (";", "\", \"", trim (getRK_val ("names_custom"))) . "\")\n");
+ }
+ if (!empty ($plotpre)) printIndented ("\t", $plotpre); ?>
dotchart(x<? echo ($options); ?>)
<? if (!empty ($plotpost)) printIndented ("\t", $plotpost); ?>
})
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -12,6 +12,7 @@
<caption id="tab_variables"/>
<setting id="x">Matrix, vector or a factor. Data needs to be numeric unless the tabulate option is checked, below.</setting>
<setting id="tabulate">Use tabulate option mainly for factor variables or wherever else applicable.</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>
<caption id="tab_options"/>
<setting id="plotoptions">Generic plot options. See <link href="rkward://component/plot_options"/>.</setting>
</settings>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.xml
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.xml 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/dotchart.xml 2007-09-27 12:21:42 UTC (rev 1999)
@@ -3,6 +3,13 @@
<code file="dotchart.php" />
<help file="dotchart.rkh" />
<logic>
+ <convert id="custom_names" mode="equals" sources="names_mode.string" standard="custom"/>
+ <convert id="rexp_names" mode="equals" sources="names_mode.string" standard="rexp"/>
+ <connect client="names_custom.visible" governor="rexp_names.not"/>
+ <connect client="names_custom.enabled" governor="custom_names"/>
+ <connect client="names_exp.visible" governor="rexp_names"/>
+ <connect client="names_exp.required" governor="rexp_names"/>
+
<set id="plotoptions.allow_ylim" to="false"/>
<set id="plotoptions.allow_log" to="false"/>
<set id="plotoptions.allow_type" to="false"/>
@@ -14,7 +21,16 @@
<varselector id="vars"/>
<column>
<varslot min_vars="1" id="x" source="vars" required="true" label="Variable"/>
- <checkbox id="tabulate" label="Tabulate" value="TRUE" value_unchecked="FALSE" checked="false" />
+ <checkbox id="tabulate" label="Tabulate" value="1" value_unchecked="0" checked="false" />
+ <frame label="Labels">
+ <radio id="names_mode" label="Labeling" >
+ <option value="default" label="Default labels" checked="true"/>
+ <option value="custom" label="Custom labels"/>
+ <option value="rexp" label="From R expression"/>
+ </radio>
+ <input id="names_exp" label="Expression to use for labels" initial="names (x)"/>
+ <input id="names_custom" label="Labels (separated by ';')" initial="First label;Second label"/>
+ </frame>
<stretch/>
<preview id="preview"/>
</column>
@@ -22,7 +38,7 @@
</tab>
<tab label="Options" id="tab_options">
<stretch/>
- <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="false" label="Plot Options"/>
</tab>
</tabbook>
</dialog>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/piechart.php
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/piechart.php 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/piechart.php 2007-09-27 12:21:42 UTC (rev 1999)
@@ -17,18 +17,34 @@
function doPrintout ($final) {
$vars = getRK_val ("x");
- $tabulate= getRK_val ("tabulate")=="TRUE";
+ $tabulate= getRK_val ("tabulate");
+ if ($tabulate) {
+ $tabulate_header = '"Tabulate", "Yes"';
+ } else {
+ $tabulate_header = '"Tabulate", "No"';
+ }
$radius = getRK_val ("radius");
$angle = getRK_val ("angle");
+ $angle_inc = getRK_val ("angle_inc");
$density = getRK_val ("density");
+ $density_inc = getRK_val ("density_inc");
$col = getRK_val ("colors");
$clockwise = getRK_val ("clockwise");
+ if ($clockwise) {
+ $clockwise_header = '"Clockwise", "Yes"';
+ } else {
+ $clockwise_header = '"Clockwise", "No"';
+ }
$names_mode = getRK_val ("names_mode");
$options = "";
$options .= ", clockwise =" . $clockwise;
- if ($density >= 0) $options .= ", density =" . $density;
- $options .= ", angle =" . $angle;
+ if (($density >= 0) || ($density_inc != 0)) $options .= ", density =" . $density;
+ if ($density_inc != 0) $options .= "+ $density_inc * 0:length (x)";
+ if (($density > 0) || $density_inc != 0) {
+ $options .= ", angle =" . $angle;
+ if ($angle_inc != 0) $options .= "+ $angle_inc * 0:length (x)";
+ }
if ($radius != 0.8) $options .= ", radius=" . $radius;
if ($col == "rainbow") $options .= ", col=rainbow (if(is.matrix(x)) dim(x) else length(x))";
else if ($col == "grayscale") $options .= ", col=gray.colors (if(is.matrix(x)) dim(x) else length(x))";
@@ -48,7 +64,7 @@
<? } ?>
<? if ($final) { ?>
-rk.header ("Pie chart", list ("Variable", rk.get.description (<? echo ($vars); ?>)))
+rk.header ("Pie chart", parameters=list ("Variable", rk.get.description (<? echo ($vars); ?>), <? echo ($tabulate_header); ?>, <? echo ($clockwise_header); ?>))
rk.graph.on ()
<? }
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/piechart.rkh
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/piechart.rkh 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/piechart.rkh 2007-09-27 12:21:42 UTC (rev 1999)
@@ -15,10 +15,12 @@
<caption id="tab_options"/>
<setting id="colors">Type of colors to use.</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="clockwise">Define if slices should be drawn clockwise or counter clockwise.</setting>
<setting id="radius">Radius of the pie. For long labels it may be necessary to make the pie smaller than the default.</setting>
- <setting id="angle">Slope of shading lines, given as an angle in degrees (counter-clockwise).</setting>
<setting id="density">Density of shading lines (lines per inch). The default value of -1 means no shading lines are drawn.</setting>
- <setting id="clockwise">Define if slices should be drawn clockwise or counter clockwise.</setting>
+ <setting id="density_inc">The density of shading lines can be varied per pie slice. Set this to values other than 0 to get different densities of shading lines for each slice.</setting>
+ <setting id="angle">Slope of shading lines, given as an angle in degrees (counter-clockwise). This option is only available, if shading lines are drawn, as controlled by the density options above.</setting>
+ <setting id="angle_inc">The slope of shading lines can be varied per pie slice. Set this to values other than 0 to get different slopes of shading lines for each slice. This option is only available, if shading lines are drawn, as controlled by the density options above.</setting>
<setting id="plotoptions">Generic plot options. See <link href="rkward://component/plot_options"/>.</setting>
</settings>
<related>
Modified: branches/release_branch_0.4.8/rkward/plugins/plots/piechart.xml
===================================================================
--- branches/release_branch_0.4.8/rkward/plugins/plots/piechart.xml 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/plugins/plots/piechart.xml 2007-09-27 12:21:42 UTC (rev 1999)
@@ -7,13 +7,17 @@
<set id="plotoptions.allow_xlim" to="false"/>
<set id="plotoptions.allow_type" to="false"/>
<set id="plotoptions.allow_log" to="false"/>
-
+
<convert id="custom_names" mode="equals" sources="names_mode.string" standard="custom"/>
<convert id="rexp_names" mode="equals" sources="names_mode.string" standard="rexp"/>
<connect client="names_custom.visible" governor="rexp_names.not"/>
<connect client="names_custom.enabled" governor="custom_names"/>
<connect client="names_exp.visible" governor="rexp_names"/>
<connect client="names_exp.required" governor="rexp_names"/>
+
+ <convert id="density_0" mode="range" sources="density.real;density_inc.real" max="0"/>
+ <connect client="angle.enabled" governor="density_0.not"/>
+ <connect client="angle_inc.enabled" governor="density_0.not"/>
</logic>
<dialog label="Pie chart" >
<tabbook>
@@ -21,35 +25,43 @@
<row>
<varselector id="vars"/>
<column>
- <varslot min_vars="1" id="x" source="vars" required="true" label="Variable"/>
- <checkbox id="tabulate" label="Tabulate" value="TRUE" value_unchecked="FALSE" checked="false" />
- <stretch/>
- <preview id="preview"/>
+ <varslot min_vars="1" id="x" source="vars" required="true" label="Variable"/>
+ <checkbox id="tabulate" label="Tabulate" value="1" value_unchecked="0" checked="false" />
+ <frame label="Labels">
+ <radio id="names_mode" label="Labeling" >
+ <option value="default" label="Default labels" checked="true"/>
+ <option value="custom" label="Custom labels"/>
+ <option value="rexp" label="From R expression"/>
+ </radio>
+ <input id="names_exp" label="Expression to use for labels" initial="names (x)"/>
+ <input id="names_custom" label="Labels (separated by ';')" initial="First label;Second label"/>
+ </frame>
+ <stretch/>
+ <preview id="preview"/>
</column>
</row>
</tab>
<tab label="Options" id="tab_options">
<row>
<radio id="colors" label="Colors" >
- <option value="default" label="Default (pastel)"/>
+ <option value="default" label="Default (pastel)" checked="true"/>
<option value="grayscale" label="Grayscale"/>
- <option value="rainbow" label="Rainbow colors" checked="true"/>
+ <option value="rainbow" label="Rainbow colors"/>
</radio>
- <column label="Labels">
- <radio id="names_mode" label="Labeling" >
- <option value="default" label="Default labels" checked="true"/>
- <option value="custom" label="Custom labels"/>
- <option value="rexp" label="From R expression"/>
- </radio>
- <input id="names_exp" label="Expression to use for labels" initial="names (x)"/>
- <input id="names_custom" label="Labels (separated by ';')" initial="First label;Second label"/>
- </column>
+
</row>
- <checkbox id="clockwise" label="clockwise" value="TRUE" value_unchecked="FALSE" checked="false" />
+ <checkbox id="clockwise" label="clockwise" value="1" value_unchecked="0" checked="false" />
<spinbox id="radius" type="real" min="0.01" max="1" initial="0.8" label="Radius"/>
-<!-- TODO: density and angle are a bit pointless, when given as a single option. Rather those should allow to enter/specify a vector! -->
- <spinbox id="density" type="real" min="-1" max="10000" initial="-1" label="density" default_precision="0"/>
- <spinbox id="angle" type="real" min="0" initial="45" max="360" label="angle"/>
+ <frame label="Shading">
+ <row>
+ <spinbox id="density" type="real" min="-1" max="10000" initial="-1" label="density" default_precision="0"/>
+ <spinbox id="density_inc" type="real" min="-10000" initial="0" max="10000" default_precision="0" label="increment in density"/>
+ </row>
+ <row>
+ <spinbox id="angle" type="real" min="0" initial="45" max="360" label="angle" default_precision="0"/>
+ <spinbox id="angle_inc" type="real" min="-360" initial="0" max="360" default_precision="0" label="increment in angle"/>
+ </row>
+ </frame>
<embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options"/>
</tab>
</tabbook>
Modified: branches/release_branch_0.4.8/rkward/rbackend/rembedinternal.cpp
===================================================================
--- branches/release_branch_0.4.8/rkward/rbackend/rembedinternal.cpp 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/rbackend/rembedinternal.cpp 2007-09-27 12:21:42 UTC (rev 1999)
@@ -670,6 +670,17 @@
return R_MakeExternalPtr (ret, RKWard_RData_Tag, R_NilValue);
}
+/** copy a symbol without touching it (esp. not forcing any promises) */
+SEXP doCopyNoEval (SEXP name, SEXP fromenv, SEXP toenv) {
+ RK_TRACE (RBACKEND);
+
+ if(!isString (name) || length (name) != 1) error ("name is not a single string");
+ if(!isEnvironment (fromenv)) error ("fromenv is not an environment");
+ if(!isEnvironment (toenv)) error ("toenv is not an environment");
+ defineVar (Rf_install (CHAR (STRING_ELT (name, 0))), findVar (Rf_install (CHAR (STRING_ELT (name, 0))), fromenv), toenv);
+ return (R_NilValue);
+}
+
bool REmbedInternal::registerFunctions (const char *library_path) {
RK_TRACE (RBACKEND);
@@ -682,6 +693,7 @@
{ "rk.do.command", (DL_FUNC) &doSubstackCall, 1 },
{ "rk.update.locale", (DL_FUNC) &doUpdateLocale, 0 },
{ "rk.get.structure", (DL_FUNC) &doGetStructure, 4 },
+ { "rk.copy.no.eval", (DL_FUNC) &doCopyNoEval, 3 },
{ 0, 0, 0 }
};
R_registerRoutines (info, NULL, callMethods, NULL, NULL);
Modified: branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/internal.R 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/internal.R 2007-09-27 12:21:42 UTC (rev 1999)
@@ -191,7 +191,8 @@
".rk.watch.symbol" <- function (k) {
f <- .rk.make.watch.f (k)
- assign (k, get (k, envir=globalenv ()), envir=.rk.watched.symbols)
+ .Call ("rk.copy.no.eval", k, globalenv(), .rk.watched.symbols);
+ #assign (k, get (k, envir=globalenv ()), envir=.rk.watched.symbols)
rm (list=k, envir=globalenv ())
base::makeActiveBinding (k, f, globalenv ())
Modified: branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/public.R
===================================================================
--- branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/public.R 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/rbackend/rpackages/rkward/R/public.R 2007-09-27 12:21:42 UTC (rev 1999)
@@ -29,13 +29,14 @@
}
# make a short name from the given arg (a character string)
+# e.g. return "b" for a[["b"]] (but 'a::"b"' for a::"b"
".rk.make.short.name" <- function (x) {
- splt <- strsplit (x, "\"")[[1]]
+ splt <- strsplit (x, "[[\"", fixed=TRUE)[[1]]
spltlen <- length (splt)
if (spltlen == 1) {
splt[1]
} else {
- splt[spltlen - 1]
+ strsplit (splt[spltlen], "\"]]", fixed=TRUE)[[1]][1]
}
}
Modified: branches/release_branch_0.4.8/rkward/rkconsole.cpp
===================================================================
--- branches/release_branch_0.4.8/rkward/rkconsole.cpp 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/rkconsole.cpp 2007-09-27 12:21:42 UTC (rev 1999)
@@ -824,7 +824,13 @@
} else {
QString command_string = command->command ();
QString text = command_string;
- text.replace ("\n", QString ("\n") + iprefix);
+ if (RKSettingsModuleConsole::addPipedCommandsToHistory()) {
+ QStringList lines = QStringList::split ('\n', text);
+ for (QStringList::const_iterator it = lines.constBegin (); it != lines.constEnd (); ++it) {
+ addCommandToHistory (*it);
+ }
+ }
+ text.replace ('\n', QString ("\n") + iprefix);
doc->insertText (doc->numLines () - 1, QString (nprefix).length (), text + '\n');
command->addReceiver (this);
command->addTypeFlag (RCommand::Console);
Modified: branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.cpp
===================================================================
--- branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.cpp 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.cpp 2007-09-27 12:21:42 UTC (rev 1999)
@@ -35,6 +35,7 @@
uint RKSettingsModuleConsole::max_history_length;
uint RKSettingsModuleConsole::max_console_lines;
bool RKSettingsModuleConsole::pipe_user_commands_through_console;
+bool RKSettingsModuleConsole::add_piped_commands_to_history;
bool RKSettingsModuleConsole::context_sensitive_history_by_default;
RKSettingsModuleConsole::RKSettingsModuleConsole (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
@@ -66,6 +67,12 @@
connect (pipe_user_commands_through_console_box, SIGNAL (stateChanged (int)), this, SLOT (changedSetting (int)));
vbox->addWidget (pipe_user_commands_through_console_box);
+ add_piped_commands_to_history_box = new QCheckBox (i18n ("Also add those commands to console history"), this);
+ add_piped_commands_to_history_box->setChecked (add_piped_commands_to_history);
+ connect (add_piped_commands_to_history_box, SIGNAL (stateChanged (int)), this, SLOT (changedSetting (int)));
+ add_piped_commands_to_history_box->setEnabled (pipe_user_commands_through_console_box->isChecked ());
+ vbox->addWidget (add_piped_commands_to_history_box);
+
vbox->addSpacing (2*RKGlobals::spacingHint ());
reverse_context_mode_box = new QCheckBox (i18n ("Command history is context sensitive by default"), this);
@@ -83,6 +90,8 @@
void RKSettingsModuleConsole::changedSetting (int) {
RK_TRACE (SETTINGS);
change ();
+
+ add_piped_commands_to_history_box->setEnabled (pipe_user_commands_through_console_box->isChecked ());
}
//static
@@ -102,6 +111,7 @@
config->writeEntry ("max history length", max_history_length);
config->writeEntry ("max console lines", max_console_lines);
config->writeEntry ("pipe user commands through console", pipe_user_commands_through_console);
+ config->writeEntry ("add piped commands to history", add_piped_commands_to_history);
config->writeEntry ("command history defaults to context sensitive", context_sensitive_history_by_default);
}
@@ -114,6 +124,7 @@
max_history_length = config->readNumEntry ("max history length", 100);
max_console_lines = config->readNumEntry ("max console lines", 500);
pipe_user_commands_through_console = config->readBoolEntry ("pipe user commands through console", true);
+ add_piped_commands_to_history = config->readBoolEntry ("add piped commands to history", true);
context_sensitive_history_by_default = config->readBoolEntry ("command history defaults to context sensitive", false);
}
@@ -152,6 +163,7 @@
max_history_length = max_history_length_spinner->value ();
max_console_lines = max_console_lines_spinner->value ();
pipe_user_commands_through_console = pipe_user_commands_through_console_box->isChecked ();
+ add_piped_commands_to_history = add_piped_commands_to_history_box->isChecked ();
context_sensitive_history_by_default = reverse_context_mode_box->isChecked ();
}
Modified: branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.h
===================================================================
--- branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.h 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleconsole.h 2007-09-27 12:21:42 UTC (rev 1999)
@@ -48,6 +48,7 @@
static uint maxHistoryLength () { return max_history_length; };
static uint maxConsoleLines () { return max_console_lines; };
static bool pipeUserCommandsThroughConsole () { return pipe_user_commands_through_console; };
+ static bool addPipedCommandsToHistory () { return add_piped_commands_to_history; };
/** Given the button state, return whether the command history should be navigated context sensitive or insensitive
@param current_state the current button state
@returns true, if a the search should be context sensitive, false for a normal search */
@@ -66,11 +67,13 @@
static uint max_history_length;
static uint max_console_lines;
static bool pipe_user_commands_through_console;
+ static bool add_piped_commands_to_history;
static bool context_sensitive_history_by_default;
QCheckBox *save_history_box;
QCheckBox *reverse_context_mode_box;
QCheckBox *pipe_user_commands_through_console_box;
+ QCheckBox *add_piped_commands_to_history_box;
KIntSpinBox *max_history_length_spinner;
KIntSpinBox *max_console_lines_spinner;
};
Modified: branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleobjectbrowser.h
===================================================================
--- branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleobjectbrowser.h 2007-09-27 12:15:23 UTC (rev 1998)
+++ branches/release_branch_0.4.8/rkward/settings/rksettingsmoduleobjectbrowser.h 2007-09-27 12:21:42 UTC (rev 1999)
@@ -53,6 +53,8 @@
static bool isSettingActive (RKObjectListViewSettings::Settings setting);
static bool isPackageBlacklisted (const QString &package_name);
+
+ QString helpURL () { return ("rkward://page/rkward_workspace_browser#settings"); };
public slots:
/** called when a checkbox has been changed. Signals change to RKSettings dialog to enable apply button */
void boxChanged (int);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list