[chronojump] Encoder: Fixed weight bug. Bluished graphs
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder: Fixed weight bug. Bluished graphs
- Date: Tue, 5 Jun 2012 12:12:02 +0000 (UTC)
commit c03ae3ed2492fac53456add628d0c03ac34daf62
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jun 5 00:30:17 2012 +0200
Encoder: Fixed weight bug. Bluished graphs
encoder/graph.R | 8 ++++----
src/gui/encoder.cs | 11 ++++++++++-
2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 3f5daf2..f0fc374 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -439,9 +439,9 @@ paintLoadVSPower <- function (paf, option) {
nums=paste(" ",as.character(1:length(x)))
}
- plot(x,y, xlab="Displaced mass (Kg)", ylab=ylab,pch=21,bg="gold",cex=cexBalls)
+ plot(x,y, xlab="Displaced mass (Kg)", ylab=ylab,pch=21,col="blue",bg="lightblue",cex=cexBalls)
text(x,y,nums,adj=c(adjHor,0.5),cex=cexNums)
- lines(smooth.spline(x,y),col="red")
+ lines(smooth.spline(x,y),col="darkblue")
}
paintForceVSSpeed <- function (paf,option) {
@@ -477,9 +477,9 @@ paintForceVSSpeed <- function (paf,option) {
nums=paste(" ",as.character(1:length(x)))
}
- plot(x,y, xlab=xlab, ylab=ylab,pch=21,bg="gold",cex=cexBalls)
+ plot(x,y, xlab=xlab, ylab=ylab,pch=21,col="blue",bg="lightblue",cex=cexBalls)
text(x,y,nums,adj=c(adjHor,0.5),cex=cexNums)
- lines(smooth.spline(x,y,spar=.5),col="red")
+ lines(smooth.spline(x,y,spar=.5),col="darkblue")
}
find.mfrow <- function(n) {
if(n<=3) return(c(1,n))
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index f1bd4d7..91b8ea5 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -119,6 +119,15 @@ public partial class ChronoJumpWindow
//TODO: single curve, and side, checkbox to show1 param, 2 or three
//TODO: powerbars with checkbox to show1 param, 2 or three
//TODO: on capture (quasi-realtime), show powerbars or curves or both
+ //
+ //TODO: Alert if signal captured is not saved. alert when:
+ // - Change person, load another session, doing another capture, load another signal, closing the software.
+ // - Or autosave every signal after capturing, and put a delete signal button,
+ // and convert the save signal to update signal
+ //
+ //TODO: if a signal is loaded, exercise has to be updated on combo. (use exerciseID in database)
+ //
+ //TODO: do the graphical capturing with pygame
private void encoderInitializeStuff() {
@@ -577,7 +586,7 @@ public partial class ChronoJumpWindow
SqliteEncoder.SelectEncoderExercises(eSQL.exerciseID,false)[0];
mass += bodyMass * ex.percentBodyWeight / 100.0;
- writer.WriteLine(ex.name + "," + mass.ToString() + "," +
+ writer.WriteLine(ex.name + "," + Util.ConvertToPoint(mass).ToString() + "," +
Util.ConvertToPoint(eSQL.smooth) + "," + eSQL.GetDate(true) + "," +
eSQL.url + Path.DirectorySeparatorChar + eSQL.filename + "," +
eSQL.eccon //this is the eccon of every curve
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]