[chronojump] On force sensor only show "table" tab. Code clean.
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] On force sensor only show "table" tab. Code clean.
- Date: Wed, 17 May 2017 16:45:31 +0000 (UTC)
commit d349fbcfbe187b7b01976903c77eedfadb90ae02
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 17 18:44:50 2017 +0200
On force sensor only show "table" tab. Code clean.
glade/app1.glade | 9 +++++++--
src/gui/chronojump.cs | 33 +++++++--------------------------
src/gui/forceSensor.cs | 1 -
3 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 70b3544..405c029 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1248,6 +1248,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7555,7 +7558,6 @@ after time</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tab_pos">bottom</property>
- <property name="show_border">False</property>
<child>
<widget class="GtkVBox"
id="vbox_execute_and_results">
<property name="visible">True</property>
@@ -10394,7 +10396,7 @@ after time</property>
<widget class="GtkVBox" id="vbox79">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">10</property>
<property name="spacing">10</property>
<child>
<widget class="GtkHBox" id="hbox207">
@@ -20315,6 +20317,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 6d49049..df6073c 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -795,32 +795,6 @@ public partial class ChronoJumpWindow
*/
- public void on_radio_menuitem_mode_force_sensor_toggled (object obj, EventArgs args)
- {
- vbox_last_test_buttons.Sensitive = false;
- notebooks_change(Constants.Menuitem_modes.FORCESENSOR);
- //on_extra_window_force_sensor_test_changed(obj, args);
- hbox_results_legend.Visible = false;
- notebook_capture_graph_table.CurrentPage = 1; //"Show table"
- }
-
- public void on_radio_menuitem_mode_rt_toggled (object obj, EventArgs args)
- {
- vbox_last_test_buttons.Sensitive = false;
- notebooks_change(Constants.Menuitem_modes.RT);
- on_extra_window_reaction_times_test_changed(obj, args);
- hbox_results_legend.Visible = true;
- }
-
- public void on_radio_menuitem_mode_other_toggled (object obj, EventArgs args)
- {
- vbox_last_test_buttons.Sensitive = false;
- notebooks_change(Constants.Menuitem_modes.OTHER);
- hbox_other.Visible = true;
- on_extra_window_reaction_times_test_changed(obj, args);
- hbox_results_legend.Visible = true;
- }
-
public void on_radio_mode_pulses_small_toggled (object obj, EventArgs args) {
if(radio_mode_pulses_small.Active)
{
@@ -2845,6 +2819,10 @@ public partial class ChronoJumpWindow
vbox_last_test_buttons.Sensitive = false;
hbox_chronopics_and_threshold.Visible = true;
+ //all modes except force sensor show the tabs at bottom
+ notebook_capture_graph_table.CurrentPage = 0; //"Show graph"
+ notebook_capture_graph_table.ShowTabs = true;
+
if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
{
notebook_sup.CurrentPage = 0;
@@ -3027,7 +3005,10 @@ public partial class ChronoJumpWindow
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
hbox_chronopics_and_threshold.Visible = false;
hbox_results_legend.Visible = false;
+
+ //on force sensor only show table
notebook_capture_graph_table.CurrentPage = 1; //"Show table"
+ notebook_capture_graph_table.ShowTabs = false;
}
else if(m == Constants.Menuitem_modes.RT)
{
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 551e25a..8773bab 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -100,7 +100,6 @@ public partial class ChronoJumpWindow
label_force_sensor_value_max.Text = "0";
label_force_sensor_value.Text = "0";
label_force_sensor_value_min.Text = "0";
- notebook_capture_graph_table.CurrentPage = 1; //"Show table"
capturingForce = forceStatus.STARTING;
forceProcessFinish = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]