[chronojump] Encoder: Fixed int / list in capture

[Xavier de Blas <xaviblas src gnome org>]

commit 001835720255c5638cc98a62e63bbc17a5081522
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Feb 15 17:13:47 2013 +0100

    Encoder: Fixed int / list in capture

 encoder/pyserial_pyper.py         |    6 +++++-
 encoder/pyserial_pyper_windows.py |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/encoder/pyserial_pyper.py b/encoder/pyserial_pyper.py
index 3cefa09..efe6357 100644
--- a/encoder/pyserial_pyper.py
+++ b/encoder/pyserial_pyper.py
@@ -191,7 +191,11 @@ def calculate_all_in_r(temp, top_values, bottom_values, direction_now, smoothing
                myR.run('power <- force*speed$y')
                myR.run('meanPower <- mean(abs(power))')
                myR.run('peakPower <- max(power)')
-               myR.run('peakPowerT=which(power == peakPower)')
+               
+               #without the 'min', if there's more than one value it returns a list and this make crash 
later in
+               #this code:  pp_ppt = peakPower / peakPowerT
+               myR.run('peakPowerT=min(which(power == peakPower))') 
+               
                meanSpeed = myR.get('mean(abs(speed$y))')
                if direction_now == 1:
                        maxSpeed = myR.get('min(speed$y)')
diff --git a/encoder/pyserial_pyper_windows.py b/encoder/pyserial_pyper_windows.py
index e1c7164..876d52c 100644
--- a/encoder/pyserial_pyper_windows.py
+++ b/encoder/pyserial_pyper_windows.py
@@ -194,7 +194,11 @@ def calculate_all_in_r(temp, top_values, bottom_values, direction_now, smoothing
                myR.run('power <- force*speed$y')
                myR.run('meanPower <- mean(abs(power))')
                myR.run('peakPower <- max(power)')
-               myR.run('peakPowerT=which(power == peakPower)')
+               
+               #without the 'min', if there's more than one value it returns a list and this make crash 
later in
+               #this code:  pp_ppt = peakPower / peakPowerT
+               myR.run('peakPowerT=min(which(power == peakPower))') 
+
                meanSpeed = myR.get('mean(abs(speed$y))')
                if direction_now == 1:
                        maxSpeed = myR.get('min(speed$y)')