[chronojump] runEncoder device from radio to combo just above capture button
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] runEncoder device from radio to combo just above capture button
- Date: Thu, 26 Sep 2019 10:56:21 +0000 (UTC)
commit 284d968a6de737d42e5d8ab8e1b6c7a6c808497a
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Sep 26 12:56:00 2019 +0200
runEncoder device from radio to combo just above capture button
glade/app1.glade | 62 ++++++++++++++-------------------------------------
src/gui/chronojump.cs | 2 --
src/gui/runEncoder.cs | 13 +++++------
3 files changed, 23 insertions(+), 54 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index c356dd8c..d7b254bc 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7705,48 +7705,6 @@ EncoderInertialCapture</property>
<property name="position">3</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox"
id="hbox_race_analyzer_device">
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkRadioButton"
id="race_analyzer_radio_device_manual">
- <property name="label">Manual race
analyzer</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">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="race_analyzer_radio_device_other">
- <property name="label">Resisted race
analyzer</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">race_analyzer_radio_device_manual</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">True</property>
- <property name="position">4</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -10382,6 +10340,20 @@ Inverted values</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
+ <widget class="GtkComboBox"
id="combo_race_analyzer_device">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">0</property>
+ <property name="items">Manual race analyzer
+Resisted race analyzer</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="hbox_race_analyzer_distance">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -10435,7 +10407,7 @@ Inverted values</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -10492,7 +10464,7 @@ Inverted values</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -10546,7 +10518,7 @@ Inverted values</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 82654100..c74fd01f 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3210,7 +3210,6 @@ public partial class ChronoJumpWindow
button_inspect_last_test.Visible = false;
alignment_force_capture_feedback.Visible = false;
button_force_sensor_adjust.Visible = false;
- hbox_race_analyzer_device.Visible = false;
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
if(
@@ -3421,7 +3420,6 @@ public partial class ChronoJumpWindow
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
button_threshold.Visible = false;
- hbox_race_analyzer_device.Visible = true;
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
hbox_results_legend.Visible = false;
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index 4b3925b0..00f7226d 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -43,9 +43,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton race_analyzer_spinbutton_distance;
[Widget] Gtk.SpinButton race_analyzer_spinbutton_temperature;
[Widget] Gtk.TextView textview_race_analyzer_comment;
- [Widget] Gtk.HBox hbox_race_analyzer_device;
- [Widget] Gtk.RadioButton race_analyzer_radio_device_manual;
- [Widget] Gtk.RadioButton race_analyzer_radio_device_other; //resisted
+ [Widget] Gtk.ComboBox combo_race_analyzer_device;
[Widget] Gtk.Image image_run_encoder_graph;
[Widget] Gtk.Button button_run_encoder_recalculate;
[Widget] Gtk.Button button_race_analyzer_save_comment;
@@ -262,6 +260,7 @@ public partial class ChronoJumpWindow
private void initRunEncoder ()
{
createRunEncoderExerciseCombo();
+ combo_race_analyzer_device.Active = 0;
}
private void raceEncoderReadWidgets()
@@ -269,7 +268,7 @@ public partial class ChronoJumpWindow
race_analyzer_distance = Convert.ToInt32(race_analyzer_spinbutton_distance.Value);
race_analyzer_temperature = Convert.ToInt32(race_analyzer_spinbutton_temperature.Value);
- if(race_analyzer_radio_device_manual.Active)
+ if(UtilGtk.ComboGetActive(combo_race_analyzer_device) == RunEncoder.DevicesStringMANUAL)
race_analyzer_device = RunEncoder.Devices.MANUAL;
else
race_analyzer_device = RunEncoder.Devices.RESISTED;
@@ -277,7 +276,7 @@ public partial class ChronoJumpWindow
private RunEncoder.Devices raceEncoderGetDevice()
{
- if(race_analyzer_radio_device_manual.Active)
+ if(UtilGtk.ComboGetActive(combo_race_analyzer_device) == RunEncoder.DevicesStringMANUAL)
return RunEncoder.Devices.MANUAL;
else
return RunEncoder.Devices.RESISTED;
@@ -285,9 +284,9 @@ public partial class ChronoJumpWindow
private void raceEncoderSetDevice(RunEncoder.Devices d)
{
if(d == RunEncoder.Devices.RESISTED)
- race_analyzer_radio_device_other.Active = true;
+ combo_race_analyzer_device.Active =
UtilGtk.ComboMakeActive(combo_race_analyzer_device, RunEncoder.DevicesStringRESISTED);
else
- race_analyzer_radio_device_manual.Active = true;
+ combo_race_analyzer_device.Active =
UtilGtk.ComboMakeActive(combo_race_analyzer_device, RunEncoder.DevicesStringMANUAL);
}
private void raceEncoderSetDistanceAndTemp(int distance, int temp)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
