[chronojump/michrolab] overview shows correctly sets on iso/elastic since both modes separated

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

commit 307f7283a765f9e012ae6674611514e285e8b327
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon May 30 17:59:56 2022 +0200

    overview shows correctly sets on iso/elastic since both modes separated

 src/gui/app1/chronojump.cs |  2 +-
 src/gui/overview.cs        |  6 ++++--
 src/sqlite/forceSensor.cs  | 10 ++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 9bc33ccb7..56072f39a 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3223,7 +3223,7 @@ public partial class ChronoJumpWindow
                if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
                        overviewWin = EncoderOverviewWindow.Show (app1, currentEncoderGI, 
currentSession.UniqueID, currentPerson.UniqueID);
                else if(Constants.ModeIsFORCESENSOR (m))
-                       overviewWin = ForceSensorOverviewWindow.Show (app1, currentSession.UniqueID, 
currentPerson.UniqueID);
+                       overviewWin = ForceSensorOverviewWindow.Show (app1, currentSession.UniqueID, 
currentPerson.UniqueID, m);
                else if(m == Constants.Modes.RUNSENCODER)
                        overviewWin = RunEncoderOverviewWindow.Show (app1, currentSession.UniqueID, 
currentPerson.UniqueID);
 
diff --git a/src/gui/overview.cs b/src/gui/overview.cs
index 5c5fc21ca..3bd89ef93 100644
--- a/src/gui/overview.cs
+++ b/src/gui/overview.cs
@@ -337,6 +337,7 @@ public class EncoderOverviewWindow : OverviewWindow
 public class ForceSensorOverviewWindow : OverviewWindow
 {
        static ForceSensorOverviewWindow ForceSensorOverviewWindowBox;
+       private Constants.Modes chronojumpMode;
 
        public ForceSensorOverviewWindow(Gtk.Window parent)
        {
@@ -355,13 +356,14 @@ public class ForceSensorOverviewWindow : OverviewWindow
        }
 
        //if personIDAtStart == -1, there is not currentPerson
-       static public ForceSensorOverviewWindow Show (Gtk.Window parent, int sessionID, int personIDAtStart)
+       static public ForceSensorOverviewWindow Show (Gtk.Window parent, int sessionID, int personIDAtStart, 
Constants.Modes chronojumpMode)
        {
                if (ForceSensorOverviewWindowBox == null)
                        ForceSensorOverviewWindowBox = new ForceSensorOverviewWindow (parent);
 
                ForceSensorOverviewWindowBox.sessionID = sessionID;
                ForceSensorOverviewWindowBox.personIDAtStart = personIDAtStart;
+               ForceSensorOverviewWindowBox.chronojumpMode = chronojumpMode;
 
                ForceSensorOverviewWindowBox.initialize();
 
@@ -383,7 +385,7 @@ public class ForceSensorOverviewWindow : OverviewWindow
 
        protected override ArrayList selectData(treeviewType type)
        {
-               return SqliteForceSensor.SelectSessionOverviewSets(false, sessionID);
+               return SqliteForceSensor.SelectSessionOverviewSets(false, sessionID, chronojumpMode);
        }
 
        protected override void on_button_close_clicked (object o, EventArgs args)
diff --git a/src/sqlite/forceSensor.cs b/src/sqlite/forceSensor.cs
index e76bcd8bd..f264be760 100644
--- a/src/sqlite/forceSensor.cs
+++ b/src/sqlite/forceSensor.cs
@@ -245,15 +245,21 @@ class SqliteForceSensor : Sqlite
                return array;
        }
 
-       public static ArrayList SelectSessionOverviewSets (bool dbconOpened, int sessionID)
+       public static ArrayList SelectSessionOverviewSets (bool dbconOpened, int sessionID, Constants.Modes 
chronojumpMode)
        {
                if(! dbconOpened)
                        Sqlite.Open();
 
+               string elasticStr = "";
+               if (chronojumpMode == Constants.Modes.FORCESENSORISOMETRIC)
+                       elasticStr = " AND " + table + ".stiffness < 0"; //isometric has stiffness -1.0
+               else if (chronojumpMode == Constants.Modes.FORCESENSORELASTIC)
+                       elasticStr = " AND " + table + ".stiffness > 0"; //elastic has stiffness > 0
+
                dbcmd.CommandText =
                        "SELECT person77.uniqueID, person77.name, person77.sex, forceSensorExercise.name, 
COUNT(*)" +
                        " FROM person77, personSession77, forceSensorExercise, forceSensor" +
-                       " WHERE person77.uniqueID == forceSensor.personID AND personSession77.personID == 
forceSensor.personID AND personSession77.sessionID == forceSensor.sessionID AND 
forceSensorExercise.uniqueID==forceSensor.exerciseID AND forceSensor.sessionID == " + sessionID +
+                       " WHERE person77.uniqueID == forceSensor.personID AND personSession77.personID == 
forceSensor.personID AND personSession77.sessionID == forceSensor.sessionID AND 
forceSensorExercise.uniqueID==forceSensor.exerciseID AND forceSensor.sessionID == " + sessionID + elasticStr +
                        " GROUP BY forceSensor.personID, exerciseID" +
                        " ORDER BY person77.name";