[chronojump] preferences method to know wich variables to plot on runEncoder graph
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] preferences method to know wich variables to plot on runEncoder graph
- Date: Wed, 3 Mar 2021 10:44:18 +0000 (UTC)
commit 170072c85a5b7f4fd0fbce49bee60ff3bc523002
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Mar 3 11:41:02 2021 +0100
preferences method to know wich variables to plot on runEncoder graph
src/gui/app1/runEncoder.cs | 28 ++++++----------------------
src/preferences.cs | 25 +++++++++++++++++++++++++
2 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 21551989..5feae744 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1066,25 +1066,6 @@ public partial class ChronoJumpWindow
string title = Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" +
Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_run_encoder_exercise));
- bool plotRawAccel =
- ( Preferences.runEncoderAnalyzeAccel.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlRAW ||
- Preferences.runEncoderAnalyzeAccel.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
- bool plotFittedAccel =
- ( Preferences.runEncoderAnalyzeAccel.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlFITTED ||
- Preferences.runEncoderAnalyzeAccel.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
- bool plotRawForce =
- ( Preferences.runEncoderAnalyzeForce.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlRAW ||
- Preferences.runEncoderAnalyzeForce.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
- bool plotFittedForce =
- ( Preferences.runEncoderAnalyzeForce.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlFITTED ||
- Preferences.runEncoderAnalyzeForce.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
- bool plotRawPower =
- ( Preferences.runEncoderAnalyzePower.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlRAW ||
- Preferences.runEncoderAnalyzePower.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
- bool plotFittedPower =
- ( Preferences.runEncoderAnalyzePower.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlFITTED ||
- Preferences.runEncoderAnalyzePower.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
-
//create graph
RunEncoderGraph reg = new RunEncoderGraph(
race_analyzer_distance,
@@ -1096,9 +1077,12 @@ public partial class ChronoJumpWindow
title,
currentRunEncoder.DateTimePublic,
preferences.runEncoderMinAccel,
- plotRawAccel, plotFittedAccel,
- plotRawForce, plotFittedForce,
- plotRawPower, plotFittedPower,
+
Preferences.RunEncoderShouldPlotVariable(Preferences.RunEncoderPlotVariables.RAWACCEL),
+
Preferences.RunEncoderShouldPlotVariable(Preferences.RunEncoderPlotVariables.FITTEDACCEL),
+
Preferences.RunEncoderShouldPlotVariable(Preferences.RunEncoderPlotVariables.RAWFORCE),
+
Preferences.RunEncoderShouldPlotVariable(Preferences.RunEncoderPlotVariables.FITTEDFORCE),
+
Preferences.RunEncoderShouldPlotVariable(Preferences.RunEncoderPlotVariables.RAWPOWER),
+
Preferences.RunEncoderShouldPlotVariable(Preferences.RunEncoderPlotVariables.FITTEDPOWER),
triggerListRunEncoder);
reg.CallR(imageWidth, imageHeight);
diff --git a/src/preferences.cs b/src/preferences.cs
index cca6c332..cb837654 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -501,6 +501,31 @@ public class Preferences
get { return UtilGtk.ColorParse(colorBackgroundString); }
}
+ public enum RunEncoderPlotVariables { RAWACCEL, FITTEDACCEL, RAWFORCE, FITTEDFORCE, RAWPOWER,
FITTEDPOWER};
+ public static bool RunEncoderShouldPlotVariable(RunEncoderPlotVariables v)
+ {
+ if(v == RunEncoderPlotVariables.RAWACCEL)
+ return ( runEncoderAnalyzeAccel.SqlCurrentName == runEncoderAnalyzeAFPSqlRAW ||
+ runEncoderAnalyzeAccel.SqlCurrentName == runEncoderAnalyzeAFPSqlBOTH
);
+ else if(v == RunEncoderPlotVariables.FITTEDACCEL)
+ return ( runEncoderAnalyzeAccel.SqlCurrentName == runEncoderAnalyzeAFPSqlFITTED ||
+ runEncoderAnalyzeAccel.SqlCurrentName == runEncoderAnalyzeAFPSqlBOTH
);
+ else if(v == RunEncoderPlotVariables.RAWFORCE)
+ return ( runEncoderAnalyzeForce.SqlCurrentName == runEncoderAnalyzeAFPSqlRAW ||
+ runEncoderAnalyzeForce.SqlCurrentName == runEncoderAnalyzeAFPSqlBOTH
);
+ else if(v == RunEncoderPlotVariables.FITTEDFORCE)
+ return ( runEncoderAnalyzeForce.SqlCurrentName == runEncoderAnalyzeAFPSqlFITTED ||
+ runEncoderAnalyzeForce.SqlCurrentName == runEncoderAnalyzeAFPSqlBOTH
);
+ else if(v == RunEncoderPlotVariables.RAWPOWER)
+ return ( runEncoderAnalyzePower.SqlCurrentName == runEncoderAnalyzeAFPSqlRAW ||
+ runEncoderAnalyzePower.SqlCurrentName == runEncoderAnalyzeAFPSqlBOTH
);
+ else if(v == RunEncoderPlotVariables.FITTEDPOWER)
+ return ( runEncoderAnalyzePower.SqlCurrentName == runEncoderAnalyzeAFPSqlFITTED ||
+ runEncoderAnalyzePower.SqlCurrentName == runEncoderAnalyzeAFPSqlBOTH
);
+
+ return true;
+ }
+
~Preferences() {}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]