commit 65f4856ff92e246019a41a2655618a10c6c39795
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Sep 27 14:14:25 2021 +0200
Removed event_execute_table_run_interval and values
glade/app1.glade | 315 +--------------------------------------------
src/gui/app1/chronojump.cs | 7 +-
src/gui/app1/run.cs | 1 -
src/gui/eventExecute.cs | 45 +------
4 files changed, 8 insertions(+), 360 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 540dc2e44..b794cb3f3 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -8488,7 +8488,7 @@ EncoderInertialCapture</property>
<widget class="GtkLabel" id="label62">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">not deleted right now to
have runinterval and pulses on pages 1 and 2</property>
+ <property name="label">not deleted right now to
have pulses on page 2</property>
</widget>
</child>
<child>
@@ -8503,319 +8503,10 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox31">
+ <widget class="GtkLabel" id="label63">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <widget class="GtkTable"
id="event_execute_table_run_interval">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <widget class="GtkEventBox"
id="event_execute_eventbox_run_interval_speed">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label300">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label302">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label303">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox"
id="event_execute_eventbox_run_interval_time">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label304">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox220">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label440">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Speed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox219">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label439">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Time</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="hbox221">
- <property name="width_request">24</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="event_execute_image_run_interval_time_good">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="event_execute_image_run_interval_time_bad">
- <property name="width_request">24</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable"
id="event_execute_table_run_interval_values">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <property name="homogeneous">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label305">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Last
lap</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="x_options">GTK_EXPAND</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label306">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">AVG</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_run_interval_time_now">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_run_interval_time_avg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_run_interval_speed_avg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_run_interval_speed_now">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label151">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Total</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_run_interval_time_total">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label">not deleted right now to
have pulses on page 2</property>
</widget>
<packing>
<property name="position">1</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index f5fb3bc58..7c94c8def 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4676,9 +4676,10 @@ public partial class ChronoJumpWindow
//if(notebook_execute.CurrentPage == 1) //reactive jump
// notebook_results_data.CurrentPage = 0;
//else if(notebook_execute.CurrentPage == 3) //interval run
- if(notebook_execute.CurrentPage == 3) //interval run
- notebook_results_data.CurrentPage = 1;
- else if(notebook_execute.CurrentPage == 6) //pulse
+ //if(notebook_execute.CurrentPage == 3) //interval run
+ // notebook_results_data.CurrentPage = 1;
+ //else if(notebook_execute.CurrentPage == 6) //pulse
+ if(notebook_execute.CurrentPage == 6) //pulse
notebook_results_data.CurrentPage = 2;
}
diff --git a/src/gui/app1/run.cs b/src/gui/app1/run.cs
index f5b99a341..09bdb35ea 100644
--- a/src/gui/app1/run.cs
+++ b/src/gui/app1/run.cs
@@ -229,7 +229,6 @@ public partial class ChronoJumpWindow
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
*/
- event_execute_table_run_interval_values.Hide();
//we do not plot graph, but we want to update label event_graph_label_graph_test
//intializeVariables if not done before
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 08919bcf8..9163877ec 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -73,10 +73,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button event_execute_button_cancel;
[Widget] Gtk.Button event_execute_button_finish;
- [Widget] Gtk.Table event_execute_table_run_interval;
[Widget] Gtk.Table event_execute_table_pulse;
-
- [Widget] Gtk.Table event_execute_table_run_interval_values;
[Widget] Gtk.Table event_execute_table_pulse_values;
// [Widget] Gtk.Alignment align_check_vbox_contacts_graph_legend;
@@ -84,24 +81,12 @@ public partial class ChronoJumpWindow
// [Widget] Gtk.VBox vbox_contacts_graph_legend;
//for the color change in the background of the cell label
- [Widget] Gtk.EventBox event_execute_eventbox_run_interval_time;
- [Widget] Gtk.EventBox event_execute_eventbox_run_interval_speed;
[Widget] Gtk.EventBox event_execute_eventbox_pulse_time;
-
- [Widget] Gtk.Label event_execute_label_run_interval_time_now;
- [Widget] Gtk.Label event_execute_label_run_interval_time_avg;
- [Widget] Gtk.Label event_execute_label_run_interval_time_total;
- [Widget] Gtk.Label event_execute_label_run_interval_speed_now;
- [Widget] Gtk.Label event_execute_label_run_interval_speed_avg;
-
[Widget] Gtk.Label event_execute_label_pulse_now;
[Widget] Gtk.Label event_execute_label_pulse_avg;
- [Widget] Gtk.Image event_execute_image_run_interval_time_good;
- [Widget] Gtk.Image event_execute_image_run_interval_time_bad;
-
[Widget] Gtk.Notebook notebook_results_data;
-
+
[Widget] Gtk.DrawingArea event_execute_drawingarea;
[Widget] Gtk.DrawingArea event_execute_drawingarea_realtime_capture_cairo;
[Widget] Gtk.DrawingArea event_execute_drawingarea_cairo;
@@ -228,8 +213,6 @@ public partial class ChronoJumpWindow
clearProgressBars();
- event_execute_eventbox_run_interval_time.ModifyBg(Gtk.StateType.Normal, UtilGtk.RED_PLOTS);
- event_execute_eventbox_run_interval_speed.ModifyBg(Gtk.StateType.Normal, UtilGtk.BLUE_PLOTS);
event_execute_eventbox_pulse_time.ModifyBg(Gtk.StateType.Normal, UtilGtk.BLUE_PLOTS); //only
one serie in pulse, leave blue
layoutSmall = new Pango.Layout (event_execute_drawingarea.PangoContext);
@@ -263,25 +246,13 @@ public partial class ChronoJumpWindow
}
private void eventExecutePutNonStandardIcons() {
- Pixbuf pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_green.png");
- event_execute_image_run_interval_time_good.Pixbuf = pixbuf;
-
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_red.png");
- event_execute_image_run_interval_time_bad.Pixbuf = pixbuf;
}
private void eventExecuteHideImages() {
- event_execute_image_run_interval_time_good.Hide();
- event_execute_image_run_interval_time_bad.Hide();
}
private void eventExecuteHideAllTables()
{
- //hide run interval info
- event_execute_table_run_interval.Hide();
- event_execute_table_run_interval_values.Hide();
-
//hide pulse info
event_execute_table_pulse.Hide();
event_execute_table_pulse_values.Hide();
@@ -332,20 +303,6 @@ public partial class ChronoJumpWindow
// align_check_vbox_contacts_graph_legend.Visible = false;
// vbox_contacts_graph_legend.Visible = false;
-
- //show run interval info
- event_execute_table_run_interval.Show();
- event_execute_table_run_interval_values.Show();
-
- //initializeLabels
- event_execute_label_run_interval_time_now.Text = "";
- event_execute_label_run_interval_time_avg.Text = "";
- event_execute_label_run_interval_time_total.Text = "";
- event_execute_label_run_interval_speed_now.Text = "";
- event_execute_label_run_interval_speed_avg.Text = "";
-
- notebook_results_data.Visible = true;
- notebook_results_data.CurrentPage = 1;
}
private void showReactionTimeLabels()