[chronojump] encoder curvesPlot working on concentric-eccentric
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] encoder curvesPlot working on concentric-eccentric
- Date: Thu, 18 Jul 2013 12:37:48 +0000 (UTC)
commit efbb3eaefa74f5a3ab60b5106849b64c55cdeca0
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jul 18 14:37:26 2013 +0200
encoder curvesPlot working on concentric-eccentric
encoder/graph.R | 74 +++++++++++++++++++++++++++++++++++++--------------
src/encoder.cs | 4 ++-
src/gui/encoder.cs | 17 +++++++++---
3 files changed, 69 insertions(+), 26 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 9968f45..2d3a558 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -42,7 +42,7 @@
#concentric, eccentric-concentric, repetitions of eccentric-concentric
#currently only used "c" and "ec". no need of ec-rep because c and ec are repetitive
#"ecS" is like ec but eccentric and concentric phases are separated, used in findCurves, this is good for
treeview to know power... on the 2 phases
-eccons=c("c","ec","ecS")
+eccons=c("c","ec","ecS","ce","ceS")
g = 9.81
smoothingAll= 0.1
@@ -127,12 +127,25 @@ findCurves <- function(rawdata, eccon, min_height, draw, title) {
}
i=i+1; j=j+1
}
- } else { #ec, ecS
+ } else { #ec, ecS, ce, ceS
row=1; i=1; j=2
+
+ referenceindex=0
+ if(eccon=="ec" || eccon=="ecS") {
+ referenceindex=b$maxindex
+ } else {
+ referenceindex=b$minindex
+ }
+
#when saved a row with ec-con, and there's only this curve, extrema doesn't find maxindex
- if(length(b$maxindex) == 0) {
+ if(length(referenceindex) == 0) {
start[1] =1
- end[1] = mean(which(a == min(a)))
+
+ if(eccon=="ec" || eccon=="ecS")
+ end[1] = mean(which(a == min(a)))
+ else
+ end[1] = mean(which(a == max(a)))
+
startH[1]=a[1]
start[2] =end[1]+1
end[2] =length(a)
@@ -142,19 +155,26 @@ findCurves <- function(rawdata, eccon, min_height, draw, title) {
#if a person starts stand up and goes down, extrema maxindex don't find the initial position
#if this person does 3 squats, only 2 will be found
#add first value of all the serie (1ms time) to maxindex to help to detect this first curve
- b$maxindex = rbind(c(1,1),b$maxindex)
-
- while(j <= length(b$maxindex[,1])) {
- tempStart = mean(c(b$maxindex[i,1],b$maxindex[i,2]))
- tempEnd = mean(c(b$maxindex[j,1],b$maxindex[j,2]))
- bottom=min(a[tempStart:tempEnd]) #find min value between the two tops
- mintop=min(c(a[tempStart],a[tempEnd])) #find wich top is lower
- height=mintop-bottom
+ referenceindex = rbind(c(1,1),referenceindex)
+
+ while(j <= length(referenceindex[,1])) {
+ tempStart = mean(c(referenceindex[i,1],referenceindex[i,2]))
+ tempEnd = mean(c(referenceindex[j,1],referenceindex[j,2]))
+
+ if(eccon=="ec" || eccon=="ecS") {
+ opposite=min(a[tempStart:tempEnd]) #find min value between the two tops
+ mintop=min(c(a[tempStart],a[tempEnd])) #find wich top is lower
+ height=mintop-opposite
+ } else {
+ opposite=max(a[tempStart:tempEnd]) #find max value between the two bottoms
+ maxbottom=max(c(a[tempStart],a[tempEnd])) #find wich bottom is higher
+ height=abs(maxbottom-opposite)
+ }
if(height >= min_height) {
- if(eccon == "ecS") {
+ if(eccon == "ecS" || eccon == "ceS") {
start[row] = tempStart
- end[row] = mean(which(a[tempStart:tempEnd] == bottom) + tempStart)
- startH[row] = a[b$maxindex[i,1]] #height at start
+ end[row] = mean(which(a[tempStart:tempEnd] == opposite) + tempStart)
+ startH[row] = a[referenceindex[i,1]] #height at start
row=row+1
start[row] = end[(row-1)] + 1
end[row] = tempEnd
@@ -164,13 +184,19 @@ findCurves <- function(rawdata, eccon, min_height, draw, title) {
} else {
start[row] = tempStart
end[row] = tempEnd
- startH[row] = a[b$maxindex[i,1]] #height at start
+ startH[row] = a[referenceindex[i,1]] #height at start
row=row+1
i=j
}
} else {
- if(a[tempEnd] >= a[tempStart]) {
- i=j
+ if(eccon=="ec" || eccon=="ecS") {
+ if(a[tempEnd] >= a[tempStart]) {
+ i=j
+ }
+ } else {
+ if(a[tempEnd] <= a[tempStart]) {
+ i=j
+ }
}
}
j=j+1
@@ -1466,14 +1492,20 @@ doProcess <- function(options) {
myLabel = i
myY = min(rawdata.cumsum)/10
adjVert = 0
- if(Eccon=="ecS") {
+ if(Eccon=="ceS")
+ adjVert = 1
+
+ if(Eccon=="ecS" || Eccon=="ceS") {
myEc=c("c","e")
- #if(analysisCurves[1] == "curvesRI")
- # myEc=c("e","c")
+ if(Eccon=="ceS")
+ myEc=c("e","c")
+
myLabel = paste(trunc((i+1)/2),myEc[((i%%2)+1)],sep="")
myY = rawdata.cumsum[curves[i,1]]/10
if(i%%2 == 1) {
adjVert = 1
+ if(Eccon=="ceS")
+ adjVert = 0
}
}
text(x=((curves[i,1]+curves[i,2])/2/1000), #/1000 ms -> s
diff --git a/src/encoder.cs b/src/encoder.cs
index 8367560..eb132d1 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -314,8 +314,10 @@ public class EncoderSQL
if(eccon == "c")
ecconLong = Catalog.GetString("Concentric");
- else
+ else if(eccon == "ec" || eccon == "ecS")
ecconLong = Catalog.GetString("Eccentric-concentric");
+ else
+ ecconLong = Catalog.GetString("Concentric-eccentric");
}
public string GetDate(bool pretty) {
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index b29df29..1aacfb3 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2157,12 +2157,21 @@ Log.WriteLine(str);
if(Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_eccon),
encoderEcconTranslation) == "Concentric")
return "c";
- else {
+ else if(Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_eccon),
+ encoderEcconTranslation) == "Eccentric-concentric")
+ {
if(forceEcconSeparated || ! check_encoder_analyze_eccon_together.Active)
return "ecS";
else
return "ec";
}
+ else
+ {
+ if(forceEcconSeparated || ! check_encoder_analyze_eccon_together.Active)
+ return "ceS";
+ else
+ return "ce";
+ }
}
/* encoder exercise stuff */
@@ -2194,11 +2203,11 @@ Log.WriteLine(str);
combo_encoder_exercise.Changed += new EventHandler (on_combo_encoder_exercise_changed);
//create combo eccon
- string [] comboEcconOptions = { "Concentric", "Eccentric-concentric" };
+ string [] comboEcconOptions = { "Concentric", "Eccentric-concentric", "Concentric-eccentric"
};
string [] comboEcconOptionsTranslated = {
- Catalog.GetString("Concentric"), Catalog.GetString("Eccentric-concentric") };
+ Catalog.GetString("Concentric"), Catalog.GetString("Eccentric-concentric"),
Catalog.GetString("Concentric-eccentric") };
encoderEcconTranslation = new String [comboEcconOptions.Length];
- for(int j=0; j < 2 ; j++)
+ for(int j=0; j < 3 ; j++)
encoderEcconTranslation[j] = comboEcconOptions[j] + ":" +
comboEcconOptionsTranslated[j];
combo_encoder_eccon = ComboBox.NewText ();
UtilGtk.ComboUpdate(combo_encoder_eccon, comboEcconOptionsTranslated, "");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
