commit c064520c7821bd38246a026bf12a9ea3d1f2fe56
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Feb 15 20:36:45 2017 +0100
inertialBG as vscale in the middle and better GUI sensitiveness on capture
glade/app1.glade | 138 +++++++++++++++++++++++--------------------------
src/gui/chronojump.cs | 4 +-
src/gui/encoder.cs | 24 ++++----
3 files changed, 78 insertions(+), 88 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index e852459..aaf49b4 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -13865,48 +13865,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_inertial_calibrate">
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_inertial_calibrate">
- <property name="label"
translatable="yes">Calibrate</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_encoder_inertial_calibrate_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHScale"
id="hscale_encoder_capture_inertial_angle_now">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 -100 100 1 1
0</property>
- <property
name="restrict_to_fill_level">False</property>
- <property name="fill_level">0</property>
- <property name="digits">0</property>
- <property name="value_pos">right</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="GtkHBox"
id="hbox_chronopic_encoder_detecting">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -13955,7 +13913,7 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -14083,7 +14041,7 @@ Concentric</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -15232,14 +15190,18 @@ Concentric</property>
<property name="can_focus">True</property>
<property name="position">400</property>
<child>
- <widget class="GtkNotebook"
id="notebook_encoder_capture_main">
+ <widget class="GtkHBox" id="hbox74">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tab_pos">bottom</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkNotebook"
id="notebook_encoder_capture_or_instructions">
+ <widget class="GtkNotebook"
id="notebook_encoder_capture_main">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tab_pos">bottom</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_encoder_capture_or_instructions">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -15292,7 +15254,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox80">
+ <widget class="GtkHBox" id="hbox85">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
@@ -15529,7 +15491,7 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_encoder_inertial_calibrate_2">
+ <widget class="GtkButton"
id="button_encoder_inertial_calibrate">
<property name="label"
translatable="yes">Calibrate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -15577,47 +15539,72 @@ then click this button.</property>
<property name="type">tab</property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label128">
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label128">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show
graph</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="tab_fill">False</property>
<property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox"
id="vbox_treeview_encoder_at_second_page">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox"
id="vbox_treeview_encoder_at_second_page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label131">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show
table</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label131">
+ <widget class="GtkVScale"
id="vscale_encoder_capture_inertial_angle_now">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show
table</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 -100 100 1 1
0</property>
+ <property
name="restrict_to_fill_level">False</property>
+ <property name="fill_level">0</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">10</property>
<property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
</widget>
<packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
@@ -15637,7 +15624,7 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox87">
+ <widget class="GtkHBox" id="hbox94">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -15770,7 +15757,7 @@ then click this button.</property>
<property
name="extension_events">cursor</property>
<property name="border_width">2</property>
<child>
- <widget class="GtkHBox" id="hbox94">
+ <widget class="GtkHBox" id="hbox118">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -16049,7 +16036,7 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox74">
+ <widget class="GtkHBox" id="hbox87">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -16148,7 +16135,7 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="resize">False</property>
+ <property name="resize">True</property>
<property name="shrink">False</property>
</packing>
</child>
@@ -18621,6 +18608,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index d6ba1ff..59beb87 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3113,7 +3113,7 @@ public partial class ChronoJumpWindow
radiobutton_encoder_analyze_neuromuscular_profile.Visible = true;
}
//hbox_encoder_capture_1_or_cont.Visible = true;
- hbox_encoder_inertial_calibrate.Visible = false;
+ vscale_encoder_capture_inertial_angle_now.Visible = false;
label_encoder_not_menu.Text = Catalog.GetString("Gravitatory");
button_gravitatory_not_menu.Sensitive = false;
@@ -3140,7 +3140,7 @@ public partial class ChronoJumpWindow
radio_encoder_capture_1set.Active = true;
//hbox_encoder_capture_1_or_cont.Visible = false;
- hbox_encoder_inertial_calibrate.Visible = true;
+ vscale_encoder_capture_inertial_angle_now.Visible = true;
label_encoder_not_menu.Text = Catalog.GetString("Inertial");
button_gravitatory_not_menu.Sensitive = true;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 8a3e845..03082e0 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -60,13 +60,12 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Box hbox_encoder_capture_wait;
[Widget] Gtk.Box vbox_encoder_capture_doing;
- [Widget] Gtk.HScale hscale_encoder_capture_inertial_angle_now;
+ [Widget] Gtk.VScale vscale_encoder_capture_inertial_angle_now;
- [Widget] Gtk.Box hbox_encoder_inertial_calibrate;
[Widget] Gtk.RadioButton radio_encoder_capture_1set;
[Widget] Gtk.RadioButton radio_encoder_capture_cont;
[Widget] Gtk.Button button_encoder_capture;
- [Widget] Gtk.Button button_encoder_inertial_calibrate_2;
+ [Widget] Gtk.Button button_encoder_inertial_calibrate;
[Widget] Gtk.Label label_wait;
[Widget] Gtk.Label label_encoder_not_menu;
@@ -664,7 +663,8 @@ public partial class ChronoJumpWindow
{
//show inertia calibrate instructions. User will click on calibrate and this
method will be called again
- button_encoder_inertial_calibrate_2.Sensitive = true;
+ sensitiveGuiEventDoing();
+ button_encoder_inertial_calibrate.Sensitive = true;
label_wait.Text = " ";
notebook_encoder_capture_or_instructions.Page = 1;
@@ -2143,7 +2143,7 @@ public partial class ChronoJumpWindow
eCaptureInertialBG.FinishBG();
EncoderCaptureInertialBackgroundStatic.Abort();
eCaptureInertialBG = null;
- hscale_encoder_capture_inertial_angle_now.Value = 0;
+ vscale_encoder_capture_inertial_angle_now.Value = 0;
}
//this is called by non gtk thread. Don't do gtk stuff here
@@ -5057,7 +5057,7 @@ public partial class ChronoJumpWindow
if(! shownWaitAtInertialCapture)
{
- button_encoder_inertial_calibrate_2.Sensitive = false;
+ button_encoder_inertial_calibrate.Sensitive = false;
label_wait.Text = string.Format("Exercise will start in {0} seconds.", 3);
shownWaitAtInertialCapture = true;
}
@@ -5073,16 +5073,16 @@ public partial class ChronoJumpWindow
label_wait.Text = string.Format("Exercise will start in {0} seconds.", 3 -
elapsed);
}
- //resize hscale if needed
+ //resize vscale if needed
int newValue = eCaptureInertialBG.AngleNow;
- int lower = Convert.ToInt32(hscale_encoder_capture_inertial_angle_now.Adjustment.Lower);
- int upper = Convert.ToInt32(hscale_encoder_capture_inertial_angle_now.Adjustment.Upper);
+ int lower = Convert.ToInt32(vscale_encoder_capture_inertial_angle_now.Adjustment.Lower);
+ int upper = Convert.ToInt32(vscale_encoder_capture_inertial_angle_now.Adjustment.Upper);
if(newValue < lower || newValue > upper)
- hscale_encoder_capture_inertial_angle_now.SetRange(lower * 2, upper *2);
+ vscale_encoder_capture_inertial_angle_now.SetRange(lower * 2, upper *2);
- //update hscale value
- hscale_encoder_capture_inertial_angle_now.Value = eCaptureInertialBG.AngleNow;
+ //update vscale value
+ vscale_encoder_capture_inertial_angle_now.Value = eCaptureInertialBG.AngleNow;
Thread.Sleep (50);