[chronojump/FS-TFT-Menu] Cleaner code using preferences.GetEncoderRepetitionCriteria()
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/FS-TFT-Menu] Cleaner code using preferences.GetEncoderRepetitionCriteria()
- Date: Wed, 20 Apr 2022 11:59:23 +0000 (UTC)
commit f22cfb4ab7a6d60d40f73874730a0009e6197997
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Apr 6 11:31:30 2022 +0200
Cleaner code using preferences.GetEncoderRepetitionCriteria()
src/gui/app1/encoder.cs | 6 +-----
src/gui/encoderTreeviews.cs | 5 ++---
src/preferences.cs | 8 ++++++++
3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index c1c3b8517..83a20dc60 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -7746,11 +7746,7 @@ public partial class ChronoJumpWindow
return;
}
- Preferences.EncoderRepetitionCriteria repCriteria =
preferences.encoderRepetitionCriteriaGravitatory;
- if(current_mode == Constants.Modes.POWERINERTIAL)
- repCriteria = preferences.encoderRepetitionCriteriaInertial;
-
- uo.Calcule(repCriteria);
+ uo.Calcule (preferences.GetEncoderRepetitionCriteria (current_mode));
/*
* Problems on Json by accents like "Pressió sobre banc"
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index 7cb2f0147..40f40d367 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -427,9 +427,8 @@ public partial class ChronoJumpWindow
bestN);
} else {
//decide if best is by ecc_con average, ecc or con
- Preferences.EncoderRepetitionCriteria repCriteria =
preferences.encoderRepetitionCriteriaGravitatory;
- if( current_mode == Constants.Modes.POWERINERTIAL)
- repCriteria = preferences.encoderRepetitionCriteriaInertial;
+ Preferences.EncoderRepetitionCriteria repCriteria =
+ preferences.GetEncoderRepetitionCriteria (current_mode);
EncoderSignal encoderSignal = new
EncoderSignal(treeviewEncoderCaptureCurvesGetCurves(AllEccCon.ALL));
if(saveOption == Constants.EncoderAutoSaveCurve.BEST)
diff --git a/src/preferences.cs b/src/preferences.cs
index 841590a6f..b9a268c0e 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -103,9 +103,17 @@ public class Preferences
public bool encoderShowStartAndDuration;
public enum TriggerTypes { NO_TRIGGERS, START_AT_CAPTURE, START_AT_FIRST_ON};
public TriggerTypes encoderCaptureCutByTriggers;
+
public enum EncoderRepetitionCriteria { ECC_CON, ECC, CON };
public EncoderRepetitionCriteria encoderRepetitionCriteriaGravitatory;
public EncoderRepetitionCriteria encoderRepetitionCriteriaInertial;
+ public EncoderRepetitionCriteria GetEncoderRepetitionCriteria (Constants.Modes mode)
+ {
+ if (mode == Constants.Modes.POWERINERTIAL)
+ return encoderRepetitionCriteriaInertial;
+ else
+ return encoderRepetitionCriteriaGravitatory;
+ }
//encoder other
public bool encoderPropulsive;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]