put all R handling to pyscript; add view for showing graphics (plots) from tmp files created by R
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2041 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
parent
3f55fe3161
commit
714cc67541
3 changed files with 10 additions and 3 deletions
|
@ -43,7 +43,10 @@ class PlotView(object):
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def __call__(self):
|
def __call__(self):
|
||||||
path = str('/' + os.path.join(*self.traverse_subpath))
|
if self.traverse_subpath:
|
||||||
|
path = str('/' + os.path.join(*self.traverse_subpath))
|
||||||
|
else:
|
||||||
|
path = self.request.form.get('image')
|
||||||
# TODO: keep path in temporary dictionary with hashed keys.
|
# TODO: keep path in temporary dictionary with hashed keys.
|
||||||
self.setHeaders(path)
|
self.setHeaders(path)
|
||||||
f = open(path, 'rb')
|
f = open(path, 'rb')
|
||||||
|
|
|
@ -43,7 +43,7 @@ class RWrapper(object):
|
||||||
return RWrapper(value)
|
return RWrapper(value)
|
||||||
|
|
||||||
|
|
||||||
r = RWrapper(r)
|
rx = RWrapper(r)
|
||||||
|
|
||||||
with_mode = RWrapper(rpy.with_mode)
|
with_mode = RWrapper(rpy.with_mode)
|
||||||
#as_py = RWrapper(rpy.as_py)
|
#as_py = RWrapper(rpy.as_py)
|
||||||
|
|
|
@ -38,7 +38,9 @@ from zope.traversing.api import getParent, getPath
|
||||||
|
|
||||||
from cybertools.pyscript.interfaces import IPythonScript, IScriptContainer
|
from cybertools.pyscript.interfaces import IPythonScript, IScriptContainer
|
||||||
try:
|
try:
|
||||||
from cybertools.pyscript.rstat import r, rpy
|
#from cybertools.pyscript.rstat import r, rpy
|
||||||
|
import rpy
|
||||||
|
from rpy import r
|
||||||
HAS_R = True
|
HAS_R = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
HAS_R = False
|
HAS_R = False
|
||||||
|
@ -191,4 +193,6 @@ class ScriptContainer(BTreeContainer):
|
||||||
if HAS_R:
|
if HAS_R:
|
||||||
from cybertools.pyscript import rstat
|
from cybertools.pyscript import rstat
|
||||||
globs['rstat'] = rstat
|
globs['rstat'] = rstat
|
||||||
|
globs['r'] = r
|
||||||
|
globs['rpy'] = rpy
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue