commit f18fd9fe3ecc43b367d430e93bd6405a057afadc
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon May 31 13:22:05 2021 +0200
Force sensor adjust moved to center of the capture window
glade/app1.glade | 977 +++++++++++++++++++++++----------------
src/gui/app1/chronojump.cs | 2 +-
src/gui/app1/contactsExercise.cs | 4 +-
src/gui/app1/forceSensor.cs | 42 +-
4 files changed, 603 insertions(+), 422 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 2e3c8f74b..8bb48291e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7011,260 +7011,6 @@ EncoderInertialCapture</property>
<property name="type">tab</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox"
id="hbox_force_sensor_adjust_actions">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkVBox" id="vbox152">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_tare">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox238">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_tare">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</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="label256">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Tare</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</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="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkHBox"
id="hbox_spin_force_sensor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton"
id="spin_force_sensor_calibration_kg_value">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</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>
- <property name="adjustment">400 0.01 500 1 10
0</property>
- <property name="climb_rate">1</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="calibration_factor_kg_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">Kg</property>
- </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="GtkButton"
id="button_force_sensor_calibrate">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox254">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_calibrate">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</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="label164">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Calibrate</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</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">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox153">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_adjust_help">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_adjust_help_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_adjust_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </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_force_sensor_adjust_close">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_adjust_close_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
- <child>
- <widget class="GtkHBox" id="hbox269">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_capture_adjust_close">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</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="label299">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Close</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</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>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">forceSensor
adjust</property>
- </widget>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7756,7 +7502,7 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="top_padding">2</property>
<child>
- <widget class="GtkNotebook"
id="notebook_contacts_execute_or_instructions">
+ <widget class="GtkNotebook"
id="notebook_contacts_execute_or">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -12088,7 +11834,7 @@ EncoderInertialCapture</property>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">12</property>
+ <property name="top_padding">24</property>
<property name="left_padding">20</property>
<child>
<widget class="GtkVBox" id="vbox147">
@@ -12096,11 +11842,6 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">25</property>
<child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">12</property>
- <child>
<widget class="GtkHBox" id="hbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -16268,7 +16009,7 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkVBox" id="vbox19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -16700,22 +16441,485 @@ Resisted race analyzer</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_race_analyzer_distance">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Distance</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="race_analyzer_spinbutton_distance">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</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>
+ <property name="adjustment">30 1 300 1 10
0</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="race_analyzer_distance_units">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">m</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_race_analyzer_temperature">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label138">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Temperature</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="race_analyzer_spinbutton_temperature">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</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>
+ <property name="adjustment">25 -50 50 1 10
0</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="race_analyzer_temperature_units">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">ºC</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label369">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">runs
encoder</property>
+ </widget>
+ <packing>
+ <property name="position">8</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">25</property>
+ <child>
+ <widget class="GtkButton" id="button_1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Close</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_contacts_exercise_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox334">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage"
id="image_contacts_exercise_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label415">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Close</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_contacts_exercise_close_and_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_contacts_exercise_close_and_capture_clicked" swapped="no"/>
+ <accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkHBox" id="hbox65">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage"
id="image_contacts_close_and_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Close
and capture</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_contacts_exercise_close_and_recalculate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Recalculate set with changed parameters</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_contacts_exercise_close_and_recalculate_clicked" swapped="no"/>
+ <accelerator key="r" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkHBox" id="hbox368">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage"
id="image_contacts_recalculate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label478">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Close
and recalculate</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label414">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">instruccions</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <child>
+ <widget class="GtkFrame" id="frame35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment77">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment78">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">24</property>
+ <child>
+ <widget class="GtkHBox" id="hbox238">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkHBox" id="hbox519">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="force_sensor_adjust_label_message">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">end</property>
+ <property name="single_line_mode">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_adjust_help">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_force_sensor_adjust_help_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_adjust_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox"
id="vbox_force_sensor_adjust_actions">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkFrame" id="frame12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property
name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkVBox" id="vbox262">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label643">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Place
the sensor in the same orientation in which you are going to capture (horizontal or vertical).</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_tare">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox254">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_tare">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_race_analyzer_distance">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label70">
+ <widget class="GtkLabel" id="label256">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Distance</property>
+ <property name="label"
translatable="yes">Tare</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -16723,19 +16927,6 @@ Resisted race analyzer</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkSpinButton"
id="race_analyzer_spinbutton_distance">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</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>
- <property name="adjustment">30 1 300 1 10
0</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -16743,37 +16934,53 @@ Resisted race analyzer</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
<child>
- <widget class="GtkLabel"
id="race_analyzer_distance_units">
+ <widget class="GtkLabel" id="label641">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">m</property>
+ <property name="label"
translatable="yes">Tare</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_race_analyzer_temperature">
+ <widget class="GtkFrame" id="frame34">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="label_xalign">0</property>
+ <property
name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkLabel" id="label138">
+ <widget class="GtkVBox" id="vbox263">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Temperature</property>
+ <property name="border_width">8</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox517">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox520">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkLabel" id="label644">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Place
a weight in the sensor to calibrate</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -16782,7 +16989,12 @@ Resisted race analyzer</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="race_analyzer_spinbutton_temperature">
+ <widget class="GtkHBox"
id="hbox_spin_force_sensor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_force_sensor_calibration_kg_value">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
@@ -16791,103 +17003,68 @@ Resisted race analyzer</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">25 -50 50 1 10
0</property>
+ <property name="adjustment">10 0.01 500 1 10
0</property>
<property name="climb_rate">1</property>
+ <property name="digits">2</property>
<property name="numeric">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="race_analyzer_temperature_units">
+ <widget class="GtkLabel"
id="calibration_factor_kg_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label">ºC</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="label">Kg</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label369">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">runs
encoder</property>
- </widget>
- <packing>
- <property name="position">8</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- </child>
<child>
- <widget class="GtkHBox" id="hbox52">
+ <widget class="GtkHButtonBox" id="hbuttonbox20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">25</property>
<child>
- <widget class="GtkButton" id="button_1">
+ <widget class="GtkButton"
id="button_force_sensor_calibrate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Close</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_contacts_exercise_close_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox334">
+ <widget class="GtkHBox" id="hbox518">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_contacts_exercise_close">
+ <widget class="GtkImage"
id="image_force_sensor_calibrate">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -16899,10 +17076,10 @@ Resisted race analyzer</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label415">
+ <widget class="GtkLabel" id="label164">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Close</property>
+ <property name="label"
translatable="yes">Calibrate</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -16914,73 +17091,72 @@ Resisted race analyzer</property>
</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="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_contacts_exercise_close_and_capture">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_contacts_exercise_close_and_capture_clicked" swapped="no"/>
- <accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkHBox" id="hbox65">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkImage"
id="image_contacts_close_and_capture">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
<child>
- <widget class="GtkLabel" id="label21">
+ <widget class="GtkLabel" id="label646">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Close
and capture</property>
+ <property name="label"
translatable="yes">Calibrate</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</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">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkButton"
id="button_contacts_exercise_close_and_recalculate">
+ <widget class="GtkButton"
id="button_force_sensor_adjust_close">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Recalculate set with changed parameters</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_contacts_exercise_close_and_recalculate_clicked" swapped="no"/>
- <accelerator key="r" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <signal name="clicked"
handler="on_button_force_sensor_adjust_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
<child>
- <widget class="GtkHBox" id="hbox368">
+ <widget class="GtkHBox" id="hbox269">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_contacts_recalculate">
+ <widget class="GtkImage"
id="image_force_sensor_capture_adjust_close">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -16992,10 +17168,10 @@ Resisted race analyzer</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label478">
+ <widget class="GtkLabel" id="label299">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Close
and recalculate</property>
+ <property name="label"
translatable="yes">Close</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -17007,13 +17183,6 @@ Resisted race analyzer</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
<property name="type">label_item</property>
</packing>
</child>
@@ -17021,17 +17190,17 @@ Resisted race analyzer</property>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label414">
+ <widget class="GtkLabel" id="label642">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">instruccions</property>
+ <property
name="label">forceSensorAdjust</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -17059,7 +17228,7 @@ Resisted race analyzer</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox19">
+ <widget class="GtkVBox" id="vbox19_analyze">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -25503,6 +25672,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -40815,6 +40990,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 80c330136..4ff21a101 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -61,7 +61,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_other;
[Widget] Gtk.HBox hbox_contacts_capture_top;
[Widget] Gtk.Notebook notebook_capture_analyze; //not encoder
- [Widget] Gtk.Notebook notebook_contacts_execute_or_instructions;
+ [Widget] Gtk.Notebook notebook_contacts_execute_or; // execute (page 0), instructions (page 1),
forceSensorAdjust (page 2)
[Widget] Gtk.Notebook notebook_analyze; //not encoder
[Widget] Gtk.Notebook notebook_capture_graph_table;
[Widget] Gtk.HBox hbox_message_permissions_at_boot;
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index 8a364fa65..db174ba70 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -37,7 +37,7 @@ public partial class ChronoJumpWindow
hbox_top_person.Sensitive = false;
button_contacts_exercise_close_and_capture.Sensitive = myTreeViewPersons.IsThereAnyRecord();
- notebook_contacts_execute_or_instructions.CurrentPage = 1;
+ notebook_contacts_execute_or.CurrentPage = 1;
}
private void on_button_contacts_exercise_close_clicked (object o, EventArgs args)
{
@@ -49,7 +49,7 @@ public partial class ChronoJumpWindow
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = true;
hbox_top_person.Sensitive = true;
- notebook_contacts_execute_or_instructions.CurrentPage = 0;
+ notebook_contacts_execute_or.CurrentPage = 0;
}
private void on_button_contacts_exercise_close_and_capture_clicked (object o, EventArgs args)
{
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 3c5914bbf..7ff313acd 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -48,7 +48,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton radio_force_sensor_laterality_both;
[Widget] Gtk.RadioButton radio_force_sensor_laterality_l;
[Widget] Gtk.RadioButton radio_force_sensor_laterality_r;
- [Widget] Gtk.HBox hbox_force_sensor_adjust_actions;
+ [Widget] Gtk.VBox vbox_force_sensor_adjust_actions;
[Widget] Gtk.Button button_force_sensor_tare;
[Widget] Gtk.Button button_force_sensor_calibrate;
[Widget] Gtk.Label label_force_sensor_value_max;
@@ -61,6 +61,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_force_sensor_exercise_edit;
[Widget] Gtk.Button button_force_sensor_exercise_delete;
+ [Widget] Gtk.Label force_sensor_adjust_label_message;
+
ForceSensorExerciseWindow forceSensorExerciseWin;
ForceSensorElasticBandsWindow forceSensorElasticBandsWin;
@@ -456,13 +458,13 @@ public partial class ChronoJumpWindow
if(o == (object) button_force_sensor_tare)
{
- hbox_force_sensor_adjust_actions.Sensitive = false;
+ vbox_force_sensor_adjust_actions.Sensitive = false;
forceSensorOtherMode = forceSensorOtherModeEnum.TARE;
forceOtherThread = new Thread(new ThreadStart(forceSensorTare));
}
else if(o == (object) button_force_sensor_calibrate)
{
- hbox_force_sensor_adjust_actions.Sensitive = false;
+ vbox_force_sensor_adjust_actions.Sensitive = false;
forceSensorOtherMode = forceSensorOtherModeEnum.CALIBRATE;
forceOtherThread = new Thread(new ThreadStart(forceSensorCalibrate));
}
@@ -645,14 +647,13 @@ public partial class ChronoJumpWindow
if(forceOtherThread.IsAlive)
{
- /*
if(forceSensorOtherMode == forceSensorOtherModeEnum.TARE ||
- forceSensorOtherMode == forceSensorOtherModeEnum.CALIBRATE)
+ forceSensorOtherMode == forceSensorOtherModeEnum.CALIBRATE)
+ {
+ force_sensor_adjust_label_message.Text = forceSensorOtherMessage + secondsStr;
+ force_sensor_adjust_label_message.UseMarkup = true;
+ } else
event_execute_label_message.Text = forceSensorOtherMessage + secondsStr;
- else
- */
- event_execute_label_message.Text = forceSensorOtherMessage + secondsStr;
- event_execute_label_message.UseMarkup = true;
if(forceSensorOtherMode == forceSensorOtherModeEnum.STIFFNESS_DETECT &&
forceSensorValues != null)
@@ -664,13 +665,13 @@ public partial class ChronoJumpWindow
}
else
{
- event_execute_label_message.Text = forceSensorOtherMessage;
LogB.ThreadEnding();
if(forceSensorOtherMode == forceSensorOtherModeEnum.TARE ||
forceSensorOtherMode == forceSensorOtherModeEnum.CALIBRATE)
{
- hbox_force_sensor_adjust_actions.Sensitive = true;
+ force_sensor_adjust_label_message.Text = forceSensorOtherMessage;
+ vbox_force_sensor_adjust_actions.Sensitive = true;
return false;
}
else if(forceSensorOtherMode == forceSensorOtherModeEnum.STIFFNESS_DETECT)
@@ -685,7 +686,10 @@ public partial class ChronoJumpWindow
event_execute_label_message.Text = forceSensorOtherMessage;
}
else if(forceSensorOtherMode == forceSensorOtherModeEnum.TARE_AND_CAPTURE_PRE ||
forceSensorOtherMode == forceSensorOtherModeEnum.CAPTURE_PRE)
+ {
+ event_execute_label_message.Text = forceSensorOtherMessage;
forceSensorCapturePre2_GTK_cameraCall();
+ }
return false;
}
@@ -1571,7 +1575,7 @@ LogB.Information(" fs E ");
if(fscPoints != null) {
int countDown = Convert.ToInt32(UtilAll.DivideSafe(5000000 -
fscPoints.GetLastTime(), 1000000));
if(countDown >= 0)
- accuracyStr = string.Format(" Accuracy count starts in {0}
s", countDown);
+ accuracyStr = string.Format(" Accuracy calculation starts in
{0} s", countDown);
else
accuracyStr = string.Format(" Accuracy: {0} %",
Util.TrimDecimals(pathAccuracy.Accuracy, 1));
}
@@ -2908,28 +2912,24 @@ LogB.Information(" fs R ");
private void on_button_force_sensor_adjust_clicked (object o, EventArgs args)
{
alignment_button_force_sensor_adjust.Sensitive = false; //to not be called again
- button_force_sensor_sync.Sensitive = false;
- //hbox_force_capture_buttons.Sensitive = false;
- notebook_contacts_execute_or_instructions.Sensitive = false;
+ notebook_contacts_capture_doing_wait.Sensitive = false;
+ notebook_contacts_execute_or.CurrentPage = 2;
viewport_chronopics.Sensitive = false;
- notebook_contacts_capture_doing_wait.CurrentPage = 3;
button_contacts_exercise.Sensitive = false;
forceSensorCaptureAdjustSensitivity(false);
- event_execute_label_message.Text = Catalog.GetString("If you want to calibrate, please tare
first.");
+ force_sensor_adjust_label_message.Text = Catalog.GetString("If you want to calibrate, please
tare first.");
}
private void on_button_force_sensor_adjust_close_clicked (object o, EventArgs args)
{
alignment_button_force_sensor_adjust.Sensitive = true;
- button_force_sensor_sync.Sensitive = true;
- //hbox_force_capture_buttons.Sensitive = true;
- notebook_contacts_execute_or_instructions.Sensitive = true;
+ notebook_contacts_capture_doing_wait.Sensitive = true;
+ notebook_contacts_execute_or.CurrentPage = 0;
viewport_chronopics.Sensitive = true;
- notebook_contacts_capture_doing_wait.CurrentPage = 0;
button_contacts_exercise.Sensitive = true;
forceSensorCaptureAdjustSensitivity(true);