[chronojump] Shown encoder configuration on load signal/curve
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Shown encoder configuration on load signal/curve
- Date: Wed, 29 Jan 2014 15:01:08 +0000 (UTC)
commit 9abd2c75d10d3553c6bbd3f9fb98fb4f15e4257f
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jan 29 16:00:45 2014 +0100
Shown encoder configuration on load signal/curve
src/encoder.cs | 9 +++++++--
src/gui/encoder.cs | 6 ++++--
2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/encoder.cs b/src/encoder.cs
index 07fa5da..ba8003f 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -368,7 +368,7 @@ public class EncoderSQL
}
public string [] ToStringArray (int count, bool checkboxes, bool video) {
- int all = 8;
+ int all = 9;
if(checkboxes)
all ++;
if(video)
@@ -383,8 +383,13 @@ public class EncoderSQL
str[i++] = count.ToString();
str[i++] = exerciseName;
- str[i++] = ecconLong;
str[i++] = extraWeight;
+
+ EncoderConfiguration econf = new EncoderConfiguration( (Constants.EncoderConfigurationNames)
+ Enum.Parse(typeof(Constants.EncoderConfigurationNames),
encoderConfigurationName) );
+ str[i++] = econf.code.ToString();
+
+ str[i++] = ecconLong;
str[i++] = GetDate(true);
if(video) {
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 168dc3e..1241192 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -678,8 +678,9 @@ public partial class ChronoJumpWindow
Catalog.GetString("Active"), //checkboxes
Catalog.GetString("Curve"),
Catalog.GetString("Exercise"),
- Catalog.GetString("Contraction"),
Catalog.GetString("Extra weight"),
+ Catalog.GetString("Encoder"),
+ Catalog.GetString("Contraction"),
Catalog.GetString("Date"),
Catalog.GetString("Comment")
};
@@ -1037,8 +1038,9 @@ public partial class ChronoJumpWindow
Catalog.GetString("ID"),
Catalog.GetString("Signal"),
Catalog.GetString("Exercise"),
- Catalog.GetString("Contraction"),
Catalog.GetString("Extra weight"),
+ Catalog.GetString("Encoder"),
+ Catalog.GetString("Contraction"),
Catalog.GetString("Date"),
Catalog.GetString("Video"),
Catalog.GetString("Comment")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]