[chronojump] DB:2.03 Added to preferences encoderInertialGraphsX. Done gui/preferences
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] DB:2.03 Added to preferences encoderInertialGraphsX. Done gui/preferences
- Date: Mon, 16 Nov 2020 15:50:13 +0000 (UTC)
commit cc51076dc51cec57c40a80ff07adb96ecd9d38a4
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Nov 16 16:49:33 2020 +0100
DB:2.03 Added to preferences encoderInertialGraphsX. Done gui/preferences
glade/preferences_win.glade | 154 +++++++++++++++++++++++++++++++++++++++++++-
src/gui/preferences.cs | 39 ++++++++++-
src/preferences.cs | 2 +
src/sqlite/main.cs | 11 +++-
src/sqlite/preferences.cs | 5 ++
5 files changed, 205 insertions(+), 6 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index f64a091e..a1131d51 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -3709,6 +3709,156 @@ It starts before and arrives there with some speed.</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">X variable to show on
inertial analyze graphs</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkHBox" id="hbox78">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_encoder_inertial_analyze_equivalent_mass">
+ <property name="label" translatable="yes">Equivalent
mass</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox79">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label129">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">(Recommended)</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_inertial_analyze_eq_mass_help">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <signal name="clicked"
handler="on_button_encoder_inertial_analyze_eq_mass_help_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_inertial_analyze_eq_mass_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_encoder_inertial_analyze_inertia_moment">
+ <property name="label" translatable="yes">Inertia
moment</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">radio_encoder_inertial_analyze_equivalent_mass</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_encoder_inertial_analyze_diameter">
+ <property name="label" translatable="yes">Diameter</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">radio_encoder_inertial_analyze_equivalent_mass</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox77">
<property name="visible">True</property>
@@ -3800,7 +3950,7 @@ It starts before and arrives there with some speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -3925,7 +4075,7 @@ It starts before and arrives there with some speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index bbb239f7..92090aa1 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -162,6 +162,10 @@ public class PreferencesWindow
[Widget] Gtk.CheckButton checkbutton_encoder_propulsive;
[Widget] Gtk.RadioButton radio_encoder_work_kcal;
[Widget] Gtk.RadioButton radio_encoder_work_joules;
+ [Widget] Gtk.RadioButton radio_encoder_inertial_analyze_equivalent_mass;
+ [Widget] Gtk.RadioButton radio_encoder_inertial_analyze_inertia_moment;
+ [Widget] Gtk.RadioButton radio_encoder_inertial_analyze_diameter;
+ [Widget] Gtk.Image image_encoder_inertial_analyze_eq_mass_help;
[Widget] Gtk.SpinButton spin_encoder_smooth_con;
[Widget] Gtk.Label label_encoder_con;
[Widget] Gtk.RadioButton radio_encoder_1RM_nonweighted;
@@ -574,6 +578,7 @@ public class PreferencesWindow
PreferencesWindowBox.image_run_speed_start_help.Pixbuf = pixbuf;
PreferencesWindowBox.image_encoder_inactivity_help.Pixbuf = pixbuf;
PreferencesWindowBox.image_encoder_capture_cut_by_triggers_help.Pixbuf = pixbuf;
+ PreferencesWindowBox.image_encoder_inertial_analyze_eq_mass_help.Pixbuf = pixbuf;
if(menu_mode == Constants.Menuitem_modes.RUNSSIMPLE)
PreferencesWindowBox.notebook_races_double_contacts.CurrentPage = 0;
@@ -682,7 +687,14 @@ public class PreferencesWindow
PreferencesWindowBox.radio_encoder_work_kcal.Active = true;
else
PreferencesWindowBox.radio_encoder_work_joules.Active = true;
-
+
+ if(preferences.encoderInertialGraphsX ==
Preferences.EncoderInertialGraphsXTypes.INERTIA_MOMENT)
+ PreferencesWindowBox.radio_encoder_inertial_analyze_inertia_moment.Active = true;
+ else if(preferences.encoderInertialGraphsX ==
Preferences.EncoderInertialGraphsXTypes.DIAMETER)
+ PreferencesWindowBox.radio_encoder_inertial_analyze_diameter.Active = true;
+ else
+ PreferencesWindowBox.radio_encoder_inertial_analyze_equivalent_mass.Active = true;
+
PreferencesWindowBox.spin_encoder_smooth_con.Value = preferences.encoderSmoothCon;
if(preferences.encoder1RMMethod == Constants.Encoder1RMMethod.NONWEIGHTED)
@@ -1629,7 +1641,11 @@ public class PreferencesWindow
);
}
-
+ private void on_button_encoder_inertial_analyze_eq_mass_help_clicked (object o, EventArgs args)
+ {
+ new DialogMessage(Constants.MessageTypes.INFO, "TODO");
+ }
+
// ---- start SQL stress tests ---->
private void on_SQL_stress_test_safe_short_clicked (object o, EventArgs args) {
@@ -2052,7 +2068,14 @@ public class PreferencesWindow
"encoderSmoothCon",
preferences.encoderSmoothCon,
(double) PreferencesWindowBox.spin_encoder_smooth_con.Value);
-
+
+ Preferences.EncoderInertialGraphsXTypes encoderInertialGraphsXFromGUI =
get_encoderInertialGraphsX_from_gui();
+ if(preferences.encoderInertialGraphsX != encoderInertialGraphsXFromGUI)
+ {
+ SqlitePreferences.Update(SqlitePreferences.EncoderInertialGraphsX,
encoderInertialGraphsXFromGUI.ToString(), true);
+ preferences.encoderInertialGraphsX = encoderInertialGraphsXFromGUI;
+ }
+
Constants.Encoder1RMMethod encoder1RMMethod;
if(PreferencesWindowBox.radio_encoder_1RM_nonweighted.Active)
encoder1RMMethod = Constants.Encoder1RMMethod.NONWEIGHTED;
@@ -2233,6 +2256,16 @@ public class PreferencesWindow
return Preferences.MaximizedTypes.YESUNDECORATED;
}
+ private Preferences.EncoderInertialGraphsXTypes get_encoderInertialGraphsX_from_gui()
+ {
+ if(PreferencesWindowBox.radio_encoder_inertial_analyze_inertia_moment.Active)
+ return Preferences.EncoderInertialGraphsXTypes.INERTIA_MOMENT;
+ else if(PreferencesWindowBox.radio_encoder_inertial_analyze_diameter.Active)
+ return Preferences.EncoderInertialGraphsXTypes.DIAMETER;
+ else
+ return Preferences.EncoderInertialGraphsXTypes.EQUIVALENT_MASS;
+ }
+
private Preferences.pythonVersionEnum get_pythonVersion_from_gui()
{
if( PreferencesWindowBox.radio_python_default.Active)
diff --git a/src/preferences.cs b/src/preferences.cs
index 5ce59728..a3a7a633 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -98,6 +98,8 @@ public class Preferences
//encoder other
public bool encoderPropulsive;
public bool encoderWorkKcal;
+ public enum EncoderInertialGraphsXTypes { EQUIVALENT_MASS, INERTIA_MOMENT, DIAMETER };
+ public EncoderInertialGraphsXTypes encoderInertialGraphsX;
public double encoderSmoothCon;
public Constants.Encoder1RMMethod encoder1RMMethod;
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index 24e046b7..d44a11de 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.02";
+ static string lastChronojumpDatabaseVersion = "2.03";
public Sqlite()
{
@@ -2793,6 +2793,14 @@ class Sqlite
currentVersion = updateVersion("2.02");
}
+ if(currentVersion == "2.02")
+ {
+ LogB.SQL("Inserted into preferences: encoderInertialGraphsX");
+ SqlitePreferences.Insert (SqlitePreferences.EncoderInertialGraphsX,
+
Preferences.EncoderInertialGraphsXTypes.EQUIVALENT_MASS.ToString());
+
+ currentVersion = updateVersion("2.03");
+ }
/*
if(currentVersion == "1.79")
@@ -3008,6 +3016,7 @@ class Sqlite
//just testing: 1.79 - 1.80 Converted DB to 1.80 Created table ForceSensorElasticBandGlue and moved
stiffnessString records there
+ //2.02 - 2.03 Converted DB to 2.03 Inserted into preferences: encoderInertialGraphsX
//2.01 - 2.02 Converted DB to 2.02 Inserted into preferences: restTimeMinutes,
restTimeSeconds")
//2.00 - 2.01 Converted DB to 2.01 RunEncoderExercise ALTER TABLE: added column segmentMeters
//1.99 - 2.00 Converted DB to 2.00 Inserted into preferences: fontsOnGraphs
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index 17cd73ee..58263c38 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -54,6 +54,7 @@ class SqlitePreferences : Sqlite
public const string EncoderAutoSaveCurveBestNValue = "encoderAutoSaveCurveBestNValue";
public const string EncoderWorkKcal = "encoderWorkKcal";
+ public const string EncoderInertialGraphsX = "encoderInertialGraphsX";
public const string EncoderRhythmActiveStr = "encoderRhythmActive";
public const string EncoderRhythmRepsOrPhasesStr = "encoderRhythmRepsOrPhases";
@@ -219,6 +220,7 @@ class SqlitePreferences : Sqlite
Insert ("encoderCaptureCutByTriggers",
Preferences.TriggerTypes.NO_TRIGGERS.ToString(), dbcmdTr);
Insert ("encoderPropulsive", "True", dbcmdTr);
Insert (EncoderWorkKcal, "True", dbcmdTr);
+ Insert (EncoderInertialGraphsX,
Preferences.EncoderInertialGraphsXTypes.EQUIVALENT_MASS.ToString(), dbcmdTr);
Insert ("encoderSmoothEccCon", "0.6", dbcmdTr);
Insert ("encoderSmoothCon", "0.7", dbcmdTr);
Insert ("encoder1RMMethod", Constants.Encoder1RMMethod.WEIGHTED2.ToString(),
dbcmdTr);
@@ -531,6 +533,9 @@ class SqlitePreferences : Sqlite
preferences.encoderPropulsive = reader[1].ToString() == "True";
else if(reader[0].ToString() == EncoderWorkKcal)
preferences.encoderWorkKcal = reader[1].ToString() == "True";
+ else if(reader[0].ToString() == EncoderInertialGraphsX)
+ preferences.encoderInertialGraphsX = (Preferences.EncoderInertialGraphsXTypes)
+ Enum.Parse(typeof(Preferences.EncoderInertialGraphsXTypes),
reader[1].ToString());
else if(reader[0].ToString() == "encoderSmoothCon")
preferences.encoderSmoothCon = Convert.ToDouble(
Util.ChangeDecimalSeparator(reader[1].ToString()));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
