commit 6e2437235bc320d5fe7198b8ad31720f0f408ba5
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 26 19:42:02 2015 +0200
extra mass controls for raspberry
glade/chronojump.glade | 333 +++++++++++++++++++++++++++++++++++++++++++----
src/gui/encoder.cs | 62 ++++++++--
src/gui/networks.cs | 12 ++-
3 files changed, 368 insertions(+), 39 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 780c133..a1e3436 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7926,6 +7926,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -8884,6 +8893,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -10094,6 +10112,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10945,6 +10972,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -15420,7 +15456,7 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook"
id="notebook_encoder_capture_load">
+ <widget class="GtkNotebook"
id="notebook_encoder_capture_extra_mass">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -15434,14 +15470,30 @@ on current Chronojump version.</property>
<widget class="GtkHBox" id="hbox44">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
<child>
<widget class="GtkHBox" id="hbox47">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_capture_extra_mass_no_raspberry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip"
translatable="yes">Extra mass</property>
<property name="spacing">4</property>
<child>
+ <widget class="GtkLabel"
id="label_encoder_extra_weight_text">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Extra
mass</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkSpinButton"
id="spin_encoder_extra_weight">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -15462,21 +15514,40 @@ on current Chronojump version.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkLabel"
id="label_encoder_extra_weight_label_kg">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Kg</property>
+ <property name="label">Kg</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</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="GtkHBox"
id="hbox_encoder_capture_extra_mass_raspberry">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_minus_10">
+ <property name="label">-10</property>
+ <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_raspberry_extra_weight_minus_10_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -15485,43 +15556,77 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator1">
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_minus_1">
+ <property name="label">-1</property>
<property name="visible">True</property>
- <property name="can_focus">False</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_raspberry_extra_weight_minus_1_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox49">
+ <widget class="GtkEntry"
id="entry_raspberry_extra_weight">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Total mass</property>
- <property name="spacing">4</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">3</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">3</property>
+ <property name="text">10</property>
+ <property name="shadow_type">none</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <signal name="changed"
handler="on_entry_raspberry_extra_weight_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkLabel"
id="label_encoder_displaced_weight">
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_1">
+ <property name="label">+1</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">10</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_raspberry_extra_weight_plus_1_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label40">
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_10">
+ <property name="label">+10</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Kg</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_raspberry_extra_weight_plus_10_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -15529,7 +15634,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -15544,6 +15649,43 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox49">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Total mass</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_displaced_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">10</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Kg</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</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="GtkHBox" id="hbox61">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -15601,16 +15743,14 @@ on current Chronojump version.</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -21969,6 +22109,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22728,6 +22877,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23979,6 +24137,15 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24287,6 +24454,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -34608,6 +34784,60 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36747,6 +36977,15 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37544,6 +37783,15 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40307,6 +40555,15 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -40730,6 +40987,15 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41168,6 +41434,15 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 46becfb..c3a33c1 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -35,13 +35,14 @@ using LongoMatch.Gui;
public partial class ChronoJumpWindow
{
- [Widget] Gtk.Notebook notebook_encoder_capture_load;
+ [Widget] Gtk.Notebook notebook_encoder_capture_extra_mass;
+
[Widget] Gtk.SpinButton spin_encoder_extra_weight;
[Widget] Gtk.Label label_encoder_displaced_weight;
[Widget] Gtk.Label label_encoder_1RM_percent;
[Widget] Gtk.Label label_encoder_im_total;
[Widget] Gtk.SpinButton spin_encoder_im_weights_n;
-
+
[Widget] Gtk.Label label_encoder_selected;
//this is Kg*cm^2 because there's limitation of Glade on 3 decimals.
@@ -377,13 +378,13 @@ public partial class ChronoJumpWindow
encoderConfigurationCurrent = encoder_configuration_win.GetAcceptedValues();
if(encoderConfigurationCurrent.has_inertia) {
- notebook_encoder_capture_load.CurrentPage = 1;
+ notebook_encoder_capture_extra_mass.CurrentPage = 1;
encoderConfigurationCurrent.extraWeightN = (int) spin_encoder_im_weights_n.Value;
encoderConfigurationCurrent.inertiaTotal =
UtilEncoder.CalculeInertiaTotal(encoderConfigurationCurrent);
label_encoder_im_total.Text = encoderConfigurationCurrent.inertiaTotal.ToString();
} else
- notebook_encoder_capture_load.CurrentPage = 0;
+ notebook_encoder_capture_extra_mass.CurrentPage = 0;
label_encoder_selected.Text = encoderConfigurationCurrent.code;
}
@@ -481,13 +482,52 @@ public partial class ChronoJumpWindow
encoder_change_displaced_weight_and_1RM ();
}
}
- void on_spin_encoder_extra_weight_value_changed (object o, EventArgs args) {
+
+ // ---- change extra weight start ----
+
+ void on_button_encoder_raspberry_extra_weight_minus_10_clicked (object o, EventArgs args) {
+ rapsberryChangeExtraWeight(-10);
+ }
+ void on_button_encoder_raspberry_extra_weight_minus_1_clicked (object o, EventArgs args) {
+ rapsberryChangeExtraWeight(-1);
+ }
+ void on_button_encoder_raspberry_extra_weight_plus_10_clicked (object o, EventArgs args) {
+ rapsberryChangeExtraWeight(+10);
+ }
+ void on_button_encoder_raspberry_extra_weight_plus_1_clicked (object o, EventArgs args) {
+ rapsberryChangeExtraWeight(+1);
+ }
+ void rapsberryChangeExtraWeight(int change) {
+ spin_encoder_extra_weight.Value += change;
+ }
+
+ bool extra_weight_signals_on = true;
+
+ void on_spin_encoder_extra_weight_value_changed (object o, EventArgs args)
+ {
//don't need to:
//array1RMUpdate(false);
//because then we will be calling SQL at each spinbutton increment
-
+
+ //change raspberry controls but taking care not get into circular changes
+ extra_weight_signals_on = false;
+ entry_raspberry_extra_weight.Text = spin_encoder_extra_weight.Value.ToString();
+ extra_weight_signals_on = true;
+
encoder_change_displaced_weight_and_1RM ();
}
+ void on_entry_raspberry_extra_weight_changed (object o, EventArgs args)
+ {
+ if(! extra_weight_signals_on)
+ return;
+
+ if(entry_raspberry_extra_weight.Text == "" || entry_raspberry_extra_weight.Text == "00")
+ entry_raspberry_extra_weight.Text = "0";
+ else if(Util.IsNumber(entry_raspberry_extra_weight.Text, false)) //cannot be decimal
+ spin_encoder_extra_weight.Value = Convert.ToInt32(entry_raspberry_extra_weight.Text);
+ else
+ entry_raspberry_extra_weight.Text = spin_encoder_extra_weight.Value.ToString();
+ }
void encoder_change_displaced_weight_and_1RM ()
{
@@ -502,8 +542,12 @@ public partial class ChronoJumpWindow
label_encoder_1RM_percent.Text = "";
else
label_encoder_1RM_percent.Text = Util.TrimDecimals(
- (100 * findMass(Constants.MassType.EXTRA) / ( load1RM * 1.0
)).ToString(), 2);
+ (100 * findMass(Constants.MassType.EXTRA) / ( load1RM * 1.0
)).ToString(), 1);
}
+
+ // ---- end of change extra weight ----
+
+
//array1RM variable is not local because we need to perform calculations at each change on
displaced_weight
void array1RMUpdate (bool returnPersonNameAndExerciseName)
@@ -1303,13 +1347,13 @@ public partial class ChronoJumpWindow
encoderConfigurationCurrent = eSQL.encoderConfiguration;
if(encoderConfigurationCurrent.has_inertia) {
- notebook_encoder_capture_load.CurrentPage = 1;
+ notebook_encoder_capture_extra_mass.CurrentPage = 1;
spin_encoder_im_weights_n.Value =
encoderConfigurationCurrent.extraWeightN;
label_encoder_im_total.Text =
encoderConfigurationCurrent.inertiaTotal.ToString();
}
else
- notebook_encoder_capture_load.CurrentPage = 0;
+ notebook_encoder_capture_extra_mass.CurrentPage = 0;
label_encoder_selected.Text = encoderConfigurationCurrent.code;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 607ff5d..e178d72 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -33,6 +33,12 @@ public partial class ChronoJumpWindow
//RFID
[Widget] Gtk.Box hbox_rfid;
[Widget] Gtk.Label label_rfid;
+
+ //better raspberry controls
+ [Widget] Gtk.Entry entry_raspberry_extra_weight;
+ [Widget] Gtk.Box hbox_encoder_capture_extra_mass_no_raspberry;
+ [Widget] Gtk.Box hbox_encoder_capture_extra_mass_raspberry;
+
private enum linuxTypeEnum { NOTLINUX, LINUX, RASPBERRY, NETWORKS }
private linuxTypeEnum linuxType;
@@ -56,7 +62,11 @@ public partial class ChronoJumpWindow
private void raspberryOrNetworksInit() {
linuxType = getLinuxTypes();
- if(linuxType == linuxTypeEnum.RASPBERRY || linuxType == linuxTypeEnum.NETWORKS) {
+ if(linuxType == linuxTypeEnum.RASPBERRY || linuxType == linuxTypeEnum.NETWORKS)
+ {
+ hbox_encoder_capture_extra_mass_no_raspberry.Visible = false;
+ hbox_encoder_capture_extra_mass_raspberry.Visible = true;
+
alignment_video_encoder.Visible = false;
//TODO: put the no connect video here.
}