From 68c81ed63e18b7f4471b6d5c3a6e109a8cf9787d Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 6 Jul 2016 10:25:13 +0200 Subject: [PATCH] Script execution --- script/camtool.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/camtool.py b/script/camtool.py index 9e33f85..ff2ace7 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -1,6 +1,7 @@ #import ch.psi.pshell.device.DeviceBase as DeviceBase from startup import * import ch.psi.utils.Convert.toBidimensional as mono_to_bidi +import ch.psi.utils.Convert.toDouble as toDouble import org.apache.commons.math3.linear.Array2DRowRealMatrix as Matrix @@ -13,8 +14,8 @@ class CamToolImage(ReadableMatrix): def read(self): raw = self.camtool.data.read() - return Matrix(mono_to_bidi(raw, self.getHeight(), self.getWidth())).transpose().getData() #data is transposed - #return mono_to_bidi(raw, self.getWidth(), self.getHeight()) + #return Matrix(toDouble(mono_to_bidi(raw, self.getHeight(), self.getWidth()))).transpose().getData() #data is transposed + return mono_to_bidi(raw, self.getWidth(), self.getHeight()) def getWidth(self): return self._width