[chronojump] Fixed crash since last commits (needed laterality)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed crash since last commits (needed laterality)
- Date: Tue, 21 Jul 2015 14:44:27 +0000 (UTC)
commit c0ead5933ee51dbf8e3263aaa27ff25bb7816a4f
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jul 21 16:43:58 2015 +0200
Fixed crash since last commits (needed laterality)
encoder/graph.R | 6 ++++--
src/gui/encoderTreeviews.cs | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 13426fd..4108aa6 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2893,7 +2893,8 @@ doProcess <- function(options)
if(op$Analysis == "curves" || writeCurves) {
#this columns are going to be removed from paf:
- pafCurves <- subset( paf, select = -c(mass, massBody, massExtra, laterality,
inertiaMomentum) )
+ pafCurves <- subset( paf, select = -c(mass, massBody, massExtra, inertiaMomentum) )
+
if(singleFile)
pafCurves = cbind(
@@ -2921,7 +2922,8 @@ doProcess <- function(options)
"meanSpeed","maxSpeed","maxSpeedT",
"meanPower","peakPower","peakPowerT",
"pp_ppt",
- "meanForce", "maxForce", "maxForceT"
+ "meanForce", "maxForce", "maxForceT",
+ "laterality"
)
write.csv(pafCurves, op$OutputData1, quote=FALSE)
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index c05ca61..03260df 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -553,7 +553,7 @@ public partial class ChronoJumpWindow
cells[0],
cells[1], //seriesName
exerciseName,
- cells[21], //laterality
+ cells[18], //laterality
Convert.ToDouble(Util.ChangeDecimalSeparator(cells[4])),
totalMass,
cells[5], cells[6], cells[7],
@@ -1213,9 +1213,12 @@ public partial class ChronoJumpWindow
int pp_ppt = 14;
cells[pp_ppt] =
Util.TrimDecimals(Convert.ToDouble(Util.ChangeDecimalSeparator(cells[pp_ppt])),1);
+ //meanForce, maxForce, maxForceT
for(int i=15; i <= 17; i++)
cells[i] =
Util.TrimDecimals(Convert.ToDouble(Util.ChangeDecimalSeparator(cells[i])),3);
+ //cells[18] laterality
+
return cells;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]