[chronojump] force sensor load assigns correctly the captureOption
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] force sensor load assigns correctly the captureOption
- Date: Mon, 9 Sep 2019 11:46:14 +0000 (UTC)
commit 1ee962ff5e9e19132a7b8ff0c7b929fdcb97d763
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Sep 9 13:46:00 2019 +0200
force sensor load assigns correctly the captureOption
src/forceSensor.cs | 4 ++++
src/gui/forceSensor.cs | 17 ++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index 5278da67..a7d9fa4d 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -119,6 +119,10 @@ public class ForceSensor
{
get { return filename; }
}
+ public CaptureOptions CaptureOption
+ {
+ get { return captureOption; }
+ }
public string Laterality
{
get { return laterality; }
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index d9d713fa..69d9b1a6 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -1304,6 +1304,7 @@ LogB.Information(" re R ");
lastForceSensorFullPath = fs.FullURL;
combo_force_sensor_exercise.Active = UtilGtk.ComboMakeActive(combo_force_sensor_exercise,
Catalog.GetString(fs.ExerciseName));
+ setForceSensorCaptureOptions(fs.CaptureOption);
setLaterality(fs.Laterality);
textview_force_sensor_capture_comment.Buffer.Text = fs.Comments;
@@ -2106,6 +2107,7 @@ LogB.Information(" re R ");
// -------------------------------- options, laterality and comment stuff -------------
+ //note: Standard capture, Absolute values, Inverted values are on glade: app1
combo_force_sensor_capture_options
private ForceSensor.CaptureOptions getForceSensorCaptureOptions()
{
string option = UtilGtk.ComboGetActive(combo_force_sensor_capture_options);
@@ -2113,9 +2115,22 @@ LogB.Information(" re R ");
return ForceSensor.CaptureOptions.ABS;
else if(option == Catalog.GetString("Inverted values"))
return ForceSensor.CaptureOptions.INVERTED;
- else
+ else //"Standard capture"
return ForceSensor.CaptureOptions.NORMAL;
}
+ private void setForceSensorCaptureOptions(ForceSensor.CaptureOptions co)
+ {
+ LogB.Information("setForceSensorCaptureOptions " + co.ToString());
+ if(co == ForceSensor.CaptureOptions.ABS)
+ combo_force_sensor_capture_options.Active = UtilGtk.ComboMakeActive(
+ combo_force_sensor_capture_options, Catalog.GetString("Absolute
values"));
+ else if(co == ForceSensor.CaptureOptions.INVERTED)
+ combo_force_sensor_capture_options.Active = UtilGtk.ComboMakeActive(
+ combo_force_sensor_capture_options, Catalog.GetString("Inverted
values"));
+ else
+ combo_force_sensor_capture_options.Active = UtilGtk.ComboMakeActive(
+ combo_force_sensor_capture_options, Catalog.GetString("Standard
capture"));
+ }
private string getLaterality(bool translated)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]