[chronojump/FS-TFT-Menu] DB: 2.36 Inserted into preferences: encoderRepetitionCriteriaGravitatory, encoderRepetitionCriteriaI

[Xavier Padullés <xpadulles src gnome org>]

commit 0b4ae9c9bb864ead6996f3f4a1a8fada815882a8
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Apr 5 16:52:51 2022 +0200

    DB: 2.36 Inserted into preferences: encoderRepetitionCriteriaGravitatory, 
encoderRepetitionCriteriaInertial

 src/preferences.cs        |  3 +++
 src/sqlite/main.cs        | 16 +++++++++++++++-
 src/sqlite/preferences.cs | 13 ++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/src/preferences.cs b/src/preferences.cs
index 2a280b3fe..841590a6f 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -103,6 +103,9 @@ 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;
        
        //encoder other
        public bool encoderPropulsive;
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index 01c207cd1..a4ca3b65c 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -131,7 +131,7 @@ class Sqlite
        /*
         * Important, change this if there's any update to database
         */
-       static string lastChronojumpDatabaseVersion = "2.35";
+       static string lastChronojumpDatabaseVersion = "2.36";
 
        public Sqlite()
        {
@@ -3211,6 +3211,19 @@ class Sqlite
 
                                currentVersion = updateVersion("2.35");
                        }
+                       if(currentVersion == "2.35")
+                       {
+                               LogB.SQL("Inserted into preferences: encoderRepetitionCriteriaGravitatory, 
encoderRepetitionCriteriaInertial");
+
+                               SqlitePreferences.Insert (
+                                               SqlitePreferences.EncoderRepetitionCriteriaGravitatoryStr,
+                                               Preferences.EncoderRepetitionCriteria.CON.ToString());
+                               SqlitePreferences.Insert (
+                                               SqlitePreferences.EncoderRepetitionCriteriaInertialStr,
+                                               Preferences.EncoderRepetitionCriteria.CON.ToString());
+
+                               currentVersion = updateVersion("2.36");
+                       }
 
                        /*
                        if(currentVersion == "1.79")
@@ -3432,6 +3445,7 @@ class Sqlite
                //changes [from - to - desc]
 //just testing: 1.79 - 1.80 Converted DB to 1.80 Created table ForceSensorElasticBandGlue and moved 
stiffnessString records there
 
+               //2.35 - 2.36 Converted DB to 2.36 Inserted into preferences: 
encoderRepetitionCriteriaGravitatory, encoderRepetitionCriteriaInertial
                //2.34 - 2.35 Converted DB to 2.35 Ensure maxForceRAW is converted to maxForceRaw
                //2.33 - 2.34 Converted DB to 2.34 Fixed duplicated names of exercises on encoder, 
forceSensor, raceAnalyzer caused by import bug
                //2.32 - 2.33 Converted DB to 2.33 RunEncoderExercise segmentMeters but now is in cm
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index d9f170df9..516799eca 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Copyright (C) 2004-2021   Xavier de Blas <xaviblas gmail com> 
+ * Copyright (C) 2004-2022   Xavier de Blas <xaviblas gmail com>
  */
 
 using System;
@@ -96,6 +96,8 @@ class SqlitePreferences : Sqlite
        public const string EncoderCaptureFeedbackEccon = "encoderCaptureFeedbackEccon";
        public const string EncoderCaptureInertialEccOverloadMode = "encoderCaptureInertialEccOverloadMode";
        public const string EncoderCaptureShowLoss = "encoderCaptureShowLoss";
+       public const string EncoderRepetitionCriteriaGravitatoryStr = "encoderRepetitionCriteriaGravitatory";
+       public const string EncoderRepetitionCriteriaInertialStr = "encoderRepetitionCriteriaInertial";
 
        //forceSensor
        public const string ForceSensorCaptureWidthSeconds = "forceSensorCaptureWidthSeconds";
@@ -290,6 +292,8 @@ class SqlitePreferences : Sqlite
                                Insert ("encoderSmoothEccCon", "0.6", dbcmdTr);
                                Insert ("encoderSmoothCon", "0.7", dbcmdTr);
                                Insert ("encoder1RMMethod", Constants.Encoder1RMMethod.WEIGHTED2.ToString(), 
dbcmdTr);
+                               Insert (EncoderRepetitionCriteriaGravitatoryStr, 
Preferences.EncoderRepetitionCriteria.CON.ToString(), dbcmdTr);
+                               Insert (EncoderRepetitionCriteriaInertialStr, 
Preferences.EncoderRepetitionCriteria.CON.ToString(), dbcmdTr);
 
                                ArrayList encoderExercises =
                                        SqliteEncoder.SelectEncoderExercises(true, -1, true, 
Constants.EncoderGI.ALL);
@@ -657,6 +661,13 @@ class SqlitePreferences : Sqlite
                        else if(reader[0].ToString() == "encoderCaptureCutByTriggers")
                                preferences.encoderCaptureCutByTriggers = (Preferences.TriggerTypes)
                                        Enum.Parse(typeof(Preferences.TriggerTypes), reader[1].ToString());
+                       else if(reader[0].ToString() == EncoderRepetitionCriteriaGravitatoryStr)
+                               preferences.encoderRepetitionCriteriaGravitatory = 
(Preferences.EncoderRepetitionCriteria)
+                                       Enum.Parse(typeof(Preferences.EncoderRepetitionCriteria), 
reader[1].ToString());
+                       else if(reader[0].ToString() == EncoderRepetitionCriteriaInertialStr)
+                               preferences.encoderRepetitionCriteriaInertial = 
(Preferences.EncoderRepetitionCriteria)
+                                       Enum.Parse(typeof(Preferences.EncoderRepetitionCriteria), 
reader[1].ToString());
+
                        //encoder other
                        else if(reader[0].ToString() == "encoderPropulsive")
                                preferences.encoderPropulsive = reader[1].ToString() == "True";