[chronojump] ForceSensor Capture options string shown
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] ForceSensor Capture options string shown
- Date: Tue, 10 Sep 2019 11:40:32 +0000 (UTC)
commit e8b10b26ef86adcbc8a4809f03e01dc6c6f0b02a
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 10 13:40:14 2019 +0200
ForceSensor Capture options string shown
src/forceSensor.cs | 26 ++++++++++++++++++++++++--
src/gui/forceSensor.cs | 22 +++++++++-------------
2 files changed, 33 insertions(+), 15 deletions(-)
---
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index fb9ceafb..46dab2c3 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -26,6 +26,10 @@ using Mono.Unix;
public class ForceSensor
{
public enum CaptureOptions { NORMAL, ABS, INVERTED }
+ public static string CaptureOptionsStringNORMAL = "Standard capture";
+ public static string CaptureOptionsStringABS = "Absolute values";
+ public static string CaptureOptionsStringINVERTED = "Inverted values";
+
public static int AngleUndefined = -1000;
private int uniqueID;
@@ -88,10 +92,16 @@ public class ForceSensor
str[i++] = uniqueID.ToString();
str[i++] = count.ToString();
str[i++] = exerciseName;
- str[i++] = Catalog.GetString(captureOption.ToString());
+ str[i++] = Catalog.GetString(ForceSensor.GetCaptureOptionsString(captureOption));
str[i++] = Catalog.GetString(laterality);
str[i++] = dateTime;
- str[i++] = videoURL;
+
+ //str[i++] = videoURL;
+ if(videoURL != "")
+ str[i++] = Catalog.GetString("Yes");
+ else
+ str[i++] = Catalog.GetString("No");
+
str[i++] = comments;
return str;
@@ -111,6 +121,18 @@ public class ForceSensor
return force;
}
+ public static string GetCaptureOptionsString(CaptureOptions co)
+ {
+ if(co == ForceSensor.CaptureOptions.ABS)
+ return CaptureOptionsStringABS;
+ else if(co == ForceSensor.CaptureOptions.INVERTED)
+ return CaptureOptionsStringINVERTED;
+ else
+ return CaptureOptionsStringNORMAL;
+
+ }
+
+
public string FullURL
{
get { return Util.GetForceSensorSessionDir(sessionID) + Path.DirectorySeparatorChar +
filename; }
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 295cfdb8..2b506653 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -2126,29 +2126,25 @@ 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
+ //note: Standard capture, Absolute values, Inverted values are:
+ //- on glade: app1 combo_force_sensor_capture_options
+ //- on ForceSensorCaptureOptionsString...
private ForceSensor.CaptureOptions getForceSensorCaptureOptions()
{
string option = UtilGtk.ComboGetActive(combo_force_sensor_capture_options);
- if(option == Catalog.GetString("Absolute values"))
+ if(option == Catalog.GetString(ForceSensor.CaptureOptionsStringABS))
return ForceSensor.CaptureOptions.ABS;
- else if(option == Catalog.GetString("Inverted values"))
+ else if(option == Catalog.GetString(ForceSensor.CaptureOptionsStringINVERTED))
return ForceSensor.CaptureOptions.INVERTED;
- else //"Standard capture"
+ else //ForceSensor.CaptureOptionsStringNORMAL
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"));
+ combo_force_sensor_capture_options.Active = UtilGtk.ComboMakeActive(
+ combo_force_sensor_capture_options,
+ Catalog.GetString(ForceSensor.GetCaptureOptionsString(co)));
}
private string getLaterality(bool translated)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]