[chronojump] DB 2.21 preferences: runsEvolutionShowTime

[Xavier de Blas <xaviblas src gnome org>]

commit 3ebc6509f03c1b80325b568569312337898d9886
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Apr 28 14:44:21 2021 +0200

    DB 2.21 preferences: runsEvolutionShowTime

 src/gui/app1/chronojump.cs          |  1 +
 src/gui/app1/jumpsRunsEvolution.cs  |  5 ++++-
 src/gui/cairo/jumpsRunsEvolution.cs |  6 +++++-
 src/preferences.cs                  |  1 +
 src/sqlite/main.cs                  | 11 ++++++++++-
 src/sqlite/preferences.cs           |  5 +++++
 6 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index e7903a08..c9fe22e9 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -1004,6 +1004,7 @@ public partial class ChronoJumpWindow
 
                //---- runs ----
                check_runs_evolution_only_best_in_session.Active = preferences.runsEvolutionOnlyBestInSession;
+               check_runs_evolution_show_time.Active = preferences.runsEvolutionShowTime;
 
                //---- video ----
 
diff --git a/src/gui/app1/jumpsRunsEvolution.cs b/src/gui/app1/jumpsRunsEvolution.cs
index 854e687b..c94daa55 100644
--- a/src/gui/app1/jumpsRunsEvolution.cs
+++ b/src/gui/app1/jumpsRunsEvolution.cs
@@ -37,7 +37,6 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.ComboBox combo_select_jumps_evolution;
        [Widget] Gtk.Button button_jumps_evolution_save_image;
        [Widget] Gtk.CheckButton check_jumps_evolution_only_best_in_session;
-       [Widget] Gtk.CheckButton check_runs_evolution_show_time;
 
        JumpsEvolution jumpsEvolution;
        JumpsEvolutionGraph jumpsEvolutionGraph;
@@ -178,6 +177,7 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.ComboBox combo_select_runs_evolution;
        [Widget] Gtk.Button button_runs_evolution_save_image;
        [Widget] Gtk.CheckButton check_runs_evolution_only_best_in_session;
+       [Widget] Gtk.CheckButton check_runs_evolution_show_time;
 
        RunsEvolution runsEvolution;
        RunsEvolutionGraph runsEvolutionGraph;
@@ -217,6 +217,9 @@ public partial class ChronoJumpWindow
        private void on_check_runs_evolution_show_time_clicked (object o, EventArgs args)
        {
                runsEvolutionDo(true);
+
+               SqlitePreferences.Update(SqlitePreferences.RunsEvolutionShowTime,
+                               check_runs_evolution_show_time.Active, false);
        }
 
        private void runsEvolutionDo (bool calculateData)
diff --git a/src/gui/cairo/jumpsRunsEvolution.cs b/src/gui/cairo/jumpsRunsEvolution.cs
index eb1db5a6..77c00e33 100644
--- a/src/gui/cairo/jumpsRunsEvolution.cs
+++ b/src/gui/cairo/jumpsRunsEvolution.cs
@@ -190,7 +190,11 @@ public class RunsEvolutionGraph : EvolutionGraph
                this.colorBackground = colorFromGdk(Config.ColorBackground); //but note if we are using 
system colors, this will not match
 
                xVariable = dateStr;
-               yVariable = speedStr;
+               if(showTime)
+                       yVariable = timeStr;
+               else
+                       yVariable = speedStr;
+
                xUnits = "";
                if(showTime)
                        yUnits = "s";
diff --git a/src/preferences.cs b/src/preferences.cs
index 6c940060..b22696c7 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -210,6 +210,7 @@ public class Preferences
 
        //runs
        public bool runsEvolutionOnlyBestInSession;
+       public bool runsEvolutionShowTime;
 
        //encoder
        public Constants.EncoderAutoSaveCurve encoderAutoSaveCurve;
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index b80bdc92..fb5a184b 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -129,7 +129,7 @@ class Sqlite
        /*
         * Important, change this if there's any update to database
         */
-       static string lastChronojumpDatabaseVersion = "2.20";
+       static string lastChronojumpDatabaseVersion = "2.21";
 
        public Sqlite()
        {
@@ -2990,6 +2990,14 @@ class Sqlite
 
                                currentVersion = updateVersion("2.20");
                        }
+                       if(currentVersion == "2.20")
+                       {
+                               LogB.SQL("Inserted into preferences: runsEvolutionShowTime");
+
+                               SqlitePreferences.Insert (SqlitePreferences.RunsEvolutionShowTime, "False");
+
+                               currentVersion = updateVersion("2.21");
+                       }
 
 
 
@@ -3212,6 +3220,7 @@ class Sqlite
 //just testing: 1.79 - 1.80 Converted DB to 1.80 Created table ForceSensorElasticBandGlue and moved 
stiffnessString records there
 
 
+               //2.20 - 2.21 Converted DB to 2.21 Inserted into preferences: runsEvolutionShowTime
                //2.19 - 2.20 Converted DB to 2.20 Inserted into preferences: runsEvolutionOnlyBestInSession
                //2.18 - 2.19 Converted DB to 2.19 Doing alter table encoderExercise ADD COLUMN type TEXT ...
                //2.17 - 2.18 Converted DB to 2.18 Person77 ALTER TABLE added field: linkServerImage (for 
networks)
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index 6cdd0436..326a59ef 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -48,7 +48,9 @@ class SqlitePreferences : Sqlite
        public const string JumpsFVProfileOnlyBestInWeight = "jumpsFVProfileOnlyBestInWeight";
        public const string JumpsFVProfileShowFullGraph = "jumpsFVProfileShowFullGraph";
        public const string JumpsEvolutionOnlyBestInSession = "jumpsEvolutionOnlyBestInSession";
+
        public const string RunsEvolutionOnlyBestInSession = "runsEvolutionOnlyBestInSession";
+       public const string RunsEvolutionShowTime = "runsEvolutionShowTime";
 
        //encoder
        public const string EncoderCaptureInfinite = "encoderCaptureInfinite";
@@ -220,6 +222,7 @@ class SqlitePreferences : Sqlite
 
                                //runs
                                SqlitePreferences.Insert (RunsEvolutionOnlyBestInSession, "False", dbcmdTr);
+                               SqlitePreferences.Insert (RunsEvolutionShowTime, "False", dbcmdTr);
 
                                //encoder
                                Insert ("encoderCaptureTime", "60", dbcmdTr);
@@ -524,6 +527,8 @@ class SqlitePreferences : Sqlite
                                preferences.jumpsEvolutionOnlyBestInSession = reader[1].ToString() == "True";
                        else if(reader[0].ToString() == RunsEvolutionOnlyBestInSession)
                                preferences.runsEvolutionOnlyBestInSession = reader[1].ToString() == "True";
+                       else if(reader[0].ToString() == RunsEvolutionShowTime)
+                               preferences.runsEvolutionShowTime = reader[1].ToString() == "True";
                        //encoder capture
                        else if(reader[0].ToString() == "encoderCaptureTime")
                                preferences.encoderCaptureTime = Convert.ToInt32(reader[1].ToString());