[Sciviews-commits] r104 - in komodo/SciViews-K: . content/js templates
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jan 23 19:32:26 CET 2009
Author: phgrosjean
Date: 2009-01-23 19:32:26 +0100 (Fri, 23 Jan 2009)
New Revision: 104
Added:
komodo/SciViews-K/sciviewsk-0.7.0-ko.xpi
komodo/SciViews-K/templates/svGUI_0.9-44.tar.gz
komodo/SciViews-K/templates/svGUI_0.9-44.tgz
komodo/SciViews-K/templates/svGUI_0.9-44.zip
komodo/SciViews-K/templates/svMisc_0.9-47.tar.gz
komodo/SciViews-K/templates/svMisc_0.9-47.tgz
komodo/SciViews-K/templates/svMisc_0.9-47.zip
komodo/SciViews-K/templates/svSocket_0.9-43.tar.gz
komodo/SciViews-K/templates/svSocket_0.9-43.tgz
komodo/SciViews-K/templates/svSocket_0.9-43.zip
Modified:
komodo/SciViews-K/SciViews-K.kpz
komodo/SciViews-K/content/js/prefs.js
komodo/SciViews-K/content/js/sciviews.js
komodo/SciViews-K/content/js/socket.js
komodo/SciViews-K/templates/.Rprofile
Log:
Various fine tunings of SciViews-K plugin. Multiline mode is broken, and string convertion is deactivate (not compatible with Komodo 4.x)?
Modified: komodo/SciViews-K/SciViews-K.kpz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/content/js/prefs.js
===================================================================
--- komodo/SciViews-K/content/js/prefs.js 2009-01-23 11:57:05 UTC (rev 103)
+++ komodo/SciViews-K/content/js/prefs.js 2009-01-23 18:32:26 UTC (rev 104)
@@ -7,6 +7,9 @@
sv.prefs.setString("sciviews.client.socket", "8888", false);
sv.prefs.setString("sciviews.client.id", "SciViewsK", false);
+// Default working directory for R
+sv.prefs.setString("sciviews.session.dir", "~", false);
+
// Where do we want to display R help? In internal browser or not?
sv.prefs.setString("sciviews.r.help", "internal", false);
Modified: komodo/SciViews-K/content/js/sciviews.js
===================================================================
--- komodo/SciViews-K/content/js/sciviews.js 2009-01-23 11:57:05 UTC (rev 103)
+++ komodo/SciViews-K/content/js/sciviews.js 2009-01-23 18:32:26 UTC (rev 104)
@@ -39,8 +39,8 @@
if (typeof(sv) == 'undefined') {
var sv = {
// TODO: set this automatically according to the plugin version
- version: 0.6,
- release: 5,
+ version: 0.7,
+ release: 0,
showVersion: true,
checkVersion: function(version) {
if (this.version < version) {
Modified: komodo/SciViews-K/content/js/socket.js
===================================================================
--- komodo/SciViews-K/content/js/socket.js 2009-01-23 11:57:05 UTC (rev 103)
+++ komodo/SciViews-K/content/js/socket.js 2009-01-23 18:32:26 UTC (rev 104)
@@ -51,10 +51,10 @@
host, port, null);
// Convert output string from unicode to R's charset (Bug #240)
- var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
- .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
- converter.charset = sv.socket.charset;
- outputData = converter.ConvertFromUnicode(outputData);
+// var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+// .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+// converter.charset = sv.socket.charset;
+// outputData = converter.ConvertFromUnicode(outputData);
var outstream = transport.openOutputStream(0, 0, 0);
outstream.write(outputData, outputData.length);
@@ -80,7 +80,7 @@
var chunk = instream.read(count);
// Convert read string to unicode (Bug #240)
- chunk = converter.ConvertToUnicode(chunk);
+// chunk = converter.ConvertToUnicode(chunk);
// Determine if we have a prompt at the end
if (chunk.search(/\+\s+$/) > -1) {
@@ -178,8 +178,6 @@
transport.host + " on port " + transport.port + "\n");
}
-
-
// Then, read data from the client
var inputStream = transport.openInputStream(nsITransport.
OPEN_BLOCKING, 0, 0);
@@ -202,9 +200,8 @@
while (sin.available() > 0)
inputString += sin.read(512);
-
// INTL
- inputString = converter.ConvertToUnicode(inputString);
+// inputString = converter.ConvertToUnicode(inputString);
// Is there data send?
if (inputString == "") {
Added: komodo/SciViews-K/sciviewsk-0.7.0-ko.xpi
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/sciviewsk-0.7.0-ko.xpi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: komodo/SciViews-K/templates/.Rprofile
===================================================================
--- komodo/SciViews-K/templates/.Rprofile 2009-01-23 11:57:05 UTC (rev 103)
+++ komodo/SciViews-K/templates/.Rprofile 2009-01-23 18:32:26 UTC (rev 104)
@@ -1,11 +1,11 @@
### SciViews install begin ###
# SciViews-R installation and startup for running R with Komodo/SciViews-K
-# Version 0.6.6, 2008-09-02 Ph. Grosjean (phgrosjean at sciviews.org)
+# Version 0.7.0, 2009-01-23 Ph. Grosjean (phgrosjean at sciviews.org)
# Make sure we don't process this twice in case of duplicate items in .Rprofile
if (!exists(".SciViewsReady", envir = .GlobalEnv)) {
.SciViewsReady <- FALSE
- minVersion <- c(R = "2.6.0", svMisc = "0.9-45", svSocket = "0.9-42", svGUI = "0.9-43")
+ minVersion <- c(R = "2.6.0", svMisc = "0.9-47", svSocket = "0.9-43", svGUI = "0.9-44")
# First of all, check R version... redefine compareVersion() because it is
# not defined in very old R versions... and thus we don't get an explicit
@@ -21,9 +21,8 @@
}
if (length(b) > length(a)) return(-1) else return(0)
}
- res <- checkVersion(paste(R.Version()$major, R.Version()$minor, sep = "."),
- minVersion["R"])
- rm(checkVersion)
+ rVersion <- paste(R.Version()$major, R.Version()$minor, sep = ".")
+ res <- checkVersion(rVersion, minVersion["R"])
if (res < 0) {
res <- FALSE
cat("R is too old for this version of SciViews (R >=",
@@ -95,6 +94,10 @@
# Make sure tcltk can start: on Mac OS X < 10.5 only,
# that is, darwin < 9, we need to check that X11 is installed
# (optional component!) and started!
+ # But this is not needed any more for R >= 2.8.0. Before we
+ # activate this test, we must find a way to start Tk later,
+ # when tktoplevel() is first invoked!
+ #if (checkVersion(rVersion, "2.8.0") < 0) {
if (regexpr("^darwin[5-8]", R.Version()$os) > -1) {
# First, is the DISPLAY environment variable defined?
dis <- Sys.getenv("DISPLAY")
@@ -121,6 +124,7 @@
}
rm(dis)
}
+ #} # Test if R >= 2.8.0 for setting DISPLAY environment variable
if (res) {
res <- suppressPackageStartupMessages(require(tcltk, quietly = TRUE))
if (!res) {
@@ -131,6 +135,7 @@
}
} else cat("Tcl/Tk is required by SciViews,\nbut it is not supported by this R installation\n")
} else cat("Problem loading standard R packages, check R installation\n")
+ rm(checkVersion, rVersion)
if (res) {
# Load packages svMisc, svSocket & svGUI (possibly after installing
Added: komodo/SciViews-K/templates/svGUI_0.9-44.tar.gz
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svGUI_0.9-44.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svGUI_0.9-44.tgz
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svGUI_0.9-44.tgz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svGUI_0.9-44.zip
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svGUI_0.9-44.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svMisc_0.9-47.tar.gz
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svMisc_0.9-47.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svMisc_0.9-47.tgz
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svMisc_0.9-47.tgz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svMisc_0.9-47.zip
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svMisc_0.9-47.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svSocket_0.9-43.tar.gz
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svSocket_0.9-43.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svSocket_0.9-43.tgz
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svSocket_0.9-43.tgz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: komodo/SciViews-K/templates/svSocket_0.9-43.zip
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/templates/svSocket_0.9-43.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Sciviews-commits
mailing list