commit c8823223d2e19fab6c41df6c513440439135f9cc
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Sep 6 10:37:19 2021 +0200
Removed all notebook_results_data page 0 (jumpRj) stuff: bells, result labels, ...
glade/app1.glade | 664 +--------------------------------------------
src/gui/app1/chronojump.cs | 7 +-
src/gui/app1/jump.cs | 1 -
src/gui/eventExecute.cs | 133 +--------
4 files changed, 20 insertions(+), 785 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 7c10dd282..966ce927e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -8423,566 +8423,13 @@ EncoderInertialCapture</property>
<child>
<widget class="GtkNotebook"
id="notebook_results_data">
<property name="can_focus">False</property>
- <property name="show_border">False</property>
- <child>
- <widget class="GtkHBox" id="hbox30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkTable"
id="event_execute_table_jump_reactive">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label290">
- <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="label291">
- <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="GtkHBox" id="hbox226">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label448">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">TC</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="hbox227">
- <property name="width_request">16</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tc_good">
- <property name="width_request">16</property>
- <property name="height_request">16</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="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tc_bad">
- <property name="width_request">16</property>
- <property name="height_request">16</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">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox224">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label447">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">TF</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="hbox225">
- <property name="width_request">16</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_good">
- <property name="width_request">16</property>
- <property name="height_request">16</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="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_bad">
- <property name="width_request">16</property>
- <property name="height_request">16</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">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="hbox222">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label446">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Height</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="hbox223">
- <property name="width_request">16</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_height_good">
- <property name="width_request">16</property>
- <property name="height_request">16</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="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_height_bad">
- <property name="width_request">16</property>
- <property name="height_request">16</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>
- <child>
- <widget class="GtkEventBox"
id="event_execute_eventbox_jump_reactive_tf_tc">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label444">
- <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">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox"
id="event_execute_eventbox_jump_reactive_tc">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label288">
- <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">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox"
id="event_execute_eventbox_jump_reactive_tf">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label292">
- <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="GtkEventBox"
id="event_execute_eventbox_jump_reactive_height">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label118">
- <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="hbox137">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label117">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">TF /
TC</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="hbox138">
- <property name="width_request">16</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_tc_good">
- <property name="width_request">16</property>
- <property name="height_request">16</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="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_tc_bad">
- <property name="width_request">16</property>
- <property name="height_request">16</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">4</property>
- <property name="bottom_attach">5</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_jump_reactive_values">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkLabel" id="label267">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Last
jump</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="label268">
- <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_jump_reactive_tf_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="event_execute_label_jump_reactive_tf_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_jump_reactive_tc_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">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_jump_reactive_tc_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">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_jump_reactive_tf_tc_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">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_jump_reactive_tf_tc_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">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_jump_reactive_height_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>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
- <widget class="GtkLabel"
id="event_execute_label_jump_reactive_height_avg">
+ <widget class="GtkLabel" id="label62">
<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>
- </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 runinterval and pulses on pages 1 and 2</property>
</widget>
</child>
<child>
@@ -9511,109 +8958,6 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox_results_legend">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkHBox" id="hbox122">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox200">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox201">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox202">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </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">2</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 7bcb2717f..302b4b225 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4665,9 +4665,10 @@ public partial class ChronoJumpWindow
{
//there are some notebook_execute pages that have not notebook_results_data pages
//like jump simple (0), run simple (2), reaction time (4)
- if(notebook_execute.CurrentPage == 1) //reactive jump
- notebook_results_data.CurrentPage = 0;
- else if(notebook_execute.CurrentPage == 3) //interval run
+ //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
notebook_results_data.CurrentPage = 2;
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index 5be251121..a2b34d655 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -359,7 +359,6 @@ public partial class ChronoJumpWindow
return;
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
- event_execute_table_jump_reactive_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 45b70748a..6a86ce829 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -1,3 +1,10 @@
+/*
+posar un graph de contacts capture (per jumpsRj, runsSimple, runsInterval), que estigui dalt, i separat dels
resultats per un panel.
+salts Rj graph de sessió podria ser 2H (num salts, totalheight)
+curses trams graph de sessió podria ser 2H (totaltime, maxSpeed)
+*/
+
+
/*
* This file is part of ChronoJump
*
@@ -68,11 +75,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button event_execute_button_cancel;
[Widget] Gtk.Button event_execute_button_finish;
- [Widget] Gtk.Table event_execute_table_jump_reactive;
[Widget] Gtk.Table event_execute_table_run_interval;
[Widget] Gtk.Table event_execute_table_pulse;
-
- [Widget] Gtk.Table event_execute_table_jump_reactive_values;
+
[Widget] Gtk.Table event_execute_table_run_interval_values;
[Widget] Gtk.Table event_execute_table_pulse_values;
@@ -81,23 +86,10 @@ 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_jump_reactive_height;
- [Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_tc;
- [Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_tf;
- //[Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_tf_tc;
[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_jump_reactive_height_now;
- [Widget] Gtk.Label event_execute_label_jump_reactive_height_avg;
- [Widget] Gtk.Label event_execute_label_jump_reactive_tf_now;
- [Widget] Gtk.Label event_execute_label_jump_reactive_tf_avg;
- [Widget] Gtk.Label event_execute_label_jump_reactive_tc_now;
- [Widget] Gtk.Label event_execute_label_jump_reactive_tc_avg;
- [Widget] Gtk.Label event_execute_label_jump_reactive_tf_tc_now;
- [Widget] Gtk.Label event_execute_label_jump_reactive_tf_tc_avg;
-
[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;
@@ -107,15 +99,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label event_execute_label_pulse_now;
[Widget] Gtk.Label event_execute_label_pulse_avg;
- [Widget] Gtk.Image event_execute_image_jump_reactive_height_good;
- [Widget] Gtk.Image event_execute_image_jump_reactive_height_bad;
- [Widget] Gtk.Image event_execute_image_jump_reactive_tf_good;
- [Widget] Gtk.Image event_execute_image_jump_reactive_tf_bad;
- [Widget] Gtk.Image event_execute_image_jump_reactive_tc_good;
- [Widget] Gtk.Image event_execute_image_jump_reactive_tc_bad;
- [Widget] Gtk.Image event_execute_image_jump_reactive_tf_tc_good;
- [Widget] Gtk.Image event_execute_image_jump_reactive_tf_tc_bad;
-
[Widget] Gtk.Image event_execute_image_run_interval_time_good;
[Widget] Gtk.Image event_execute_image_run_interval_time_bad;
@@ -196,8 +179,7 @@ public partial class ChronoJumpWindow
)
{
eventExecuteHideAllTables();
- eventExecuteHideImages();
-
+
if(UtilAll.IsWindows()) {
event_execute_rightMargin = 55;
}
@@ -240,11 +222,7 @@ public partial class ChronoJumpWindow
UtilGtk.ClearDrawingArea(event_execute_drawingarea, event_execute_pixmap);
clearProgressBars();
-
- //event_execute_eventbox_jump_reactive_height.ModifyBg(Gtk.StateType.Normal,
UtilGtk.RED_PLOTS);
- event_execute_eventbox_jump_reactive_tc.ModifyBg(Gtk.StateType.Normal, UtilGtk.RED_PLOTS);
- event_execute_eventbox_jump_reactive_tf.ModifyBg(Gtk.StateType.Normal, UtilGtk.BLUE_PLOTS);
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
@@ -278,43 +256,23 @@ public partial class ChronoJumpWindow
return executingGraphData;
}
-
+
private void eventExecutePutNonStandardIcons() {
Pixbuf pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_green.png");
- event_execute_image_jump_reactive_height_good.Pixbuf = pixbuf;
- event_execute_image_jump_reactive_tf_good.Pixbuf = pixbuf;
- event_execute_image_jump_reactive_tc_good.Pixbuf = pixbuf;
- event_execute_image_jump_reactive_tf_tc_good.Pixbuf = pixbuf;
event_execute_image_run_interval_time_good.Pixbuf = pixbuf;
-
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_red.png");
- event_execute_image_jump_reactive_height_bad.Pixbuf = pixbuf;
- event_execute_image_jump_reactive_tf_bad.Pixbuf = pixbuf;
- event_execute_image_jump_reactive_tc_bad.Pixbuf = pixbuf;
- event_execute_image_jump_reactive_tf_tc_bad.Pixbuf = pixbuf;
event_execute_image_run_interval_time_bad.Pixbuf = pixbuf;
}
private void eventExecuteHideImages() {
- event_execute_image_jump_reactive_height_good.Hide();
- event_execute_image_jump_reactive_height_bad.Hide();
- event_execute_image_jump_reactive_tf_good.Hide();
- event_execute_image_jump_reactive_tf_bad.Hide();
- event_execute_image_jump_reactive_tc_good.Hide();
- event_execute_image_jump_reactive_tc_bad.Hide();
- event_execute_image_jump_reactive_tf_tc_good.Hide();
- event_execute_image_jump_reactive_tf_tc_bad.Hide();
event_execute_image_run_interval_time_good.Hide();
event_execute_image_run_interval_time_bad.Hide();
}
private void eventExecuteHideAllTables()
{
- //hide reactive info
- event_execute_table_jump_reactive.Hide();
- event_execute_table_jump_reactive_values.Hide();
-
//hide run interval info
event_execute_table_run_interval.Hide();
event_execute_table_run_interval_values.Hide();
@@ -345,22 +303,7 @@ public partial class ChronoJumpWindow
// align_check_vbox_contacts_graph_legend.Visible = false;
// vbox_contacts_graph_legend.Visible = false;
- //show reactive info
- event_execute_table_jump_reactive.Show();
- event_execute_table_jump_reactive_values.Show();
-
- //initializeLabels
- event_execute_label_jump_reactive_height_now.Text = "";
- event_execute_label_jump_reactive_height_avg.Text = "";
- event_execute_label_jump_reactive_tf_now.Text = "";
- event_execute_label_jump_reactive_tf_avg.Text = "";
- event_execute_label_jump_reactive_tc_now.Text = "";
- event_execute_label_jump_reactive_tc_avg.Text = "";
- event_execute_label_jump_reactive_tf_tc_now.Text = "";
- event_execute_label_jump_reactive_tf_tc_avg.Text = "";
-
- notebook_results_data.Visible = true;
- notebook_results_data.CurrentPage = 0;
+ notebook_results_data.Visible = false;
}
private void showRunSimpleLabels()
@@ -2052,14 +1995,6 @@ public partial class ChronoJumpWindow
plotSimulatedMessageIfNeededAtCenter(ancho, alto);
//bells & images
- event_execute_image_jump_reactive_height_good.Hide();
- event_execute_image_jump_reactive_height_bad.Hide();
- event_execute_image_jump_reactive_tf_good.Hide();
- event_execute_image_jump_reactive_tf_bad.Hide();
- event_execute_image_jump_reactive_tc_good.Hide();
- event_execute_image_jump_reactive_tc_bad.Hide();
- event_execute_image_jump_reactive_tf_tc_good.Hide();
- event_execute_image_jump_reactive_tf_tc_bad.Hide();
bool showHeightGood = false;
bool showHeightBad = false;
bool showTfGood = false;
@@ -2102,56 +2037,12 @@ public partial class ChronoJumpWindow
Util.PlaySound(Constants.SoundTypes.GOOD, volumeOn, preferences.gstreamer);
if(showHeightBad || showTfBad || showTcBad || showTfTcBad)
Util.PlaySound(Constants.SoundTypes.BAD, volumeOn, preferences.gstreamer);
-
- if(showHeightGood)
- event_execute_image_jump_reactive_height_good.Show();
- if(showHeightBad)
- event_execute_image_jump_reactive_height_bad.Show();
- if(showTfGood)
- event_execute_image_jump_reactive_tf_good.Show();
- if(showTfBad)
- event_execute_image_jump_reactive_tf_bad.Show();
- if(showTcGood)
- event_execute_image_jump_reactive_tc_good.Show();
- if(showTcBad)
- event_execute_image_jump_reactive_tc_bad.Show();
- if(showTfTcGood)
- event_execute_image_jump_reactive_tf_tc_good.Show();
- if(showTfTcBad)
- event_execute_image_jump_reactive_tf_tc_bad.Show();
}
/*
* these Log.writeLines are useful to don't "get the thread dead"
* without them , sometimes drawingarea is not painted
*/
-
- //height
- event_execute_label_jump_reactive_height_now.Text = "<b>" +
Util.TrimDecimals(lastHeight.ToString(), preferences.digitsNumber) + "</b>";
- event_execute_label_jump_reactive_height_now.UseMarkup = true;
- event_execute_label_jump_reactive_height_avg.Text = Util.TrimDecimals(
- Util.GetHeightInCentimeters(avgTV.ToString()), preferences.digitsNumber);
-
- //TV
- event_execute_label_jump_reactive_tf_now.Text = "<b>" + Util.TrimDecimals(lastTv.ToString(),
preferences.digitsNumber) + "</b>";
- event_execute_label_jump_reactive_tf_now.UseMarkup = true;
- event_execute_label_jump_reactive_tf_avg.Text = Util.TrimDecimals(avgTV.ToString(),
preferences.digitsNumber);
-
- //TC
- event_execute_label_jump_reactive_tc_now.Text = "<b>" + Util.TrimDecimals(lastTc.ToString(),
preferences.digitsNumber) + "</b>";
- event_execute_label_jump_reactive_tc_now.UseMarkup = true;
- event_execute_label_jump_reactive_tc_avg.Text = Util.TrimDecimals(avgTC.ToString(),
preferences.digitsNumber);
-
- //TV / TC
- if(lastTc > 0) {
- event_execute_label_jump_reactive_tf_tc_now.Text = "<b>" +
Util.TrimDecimals((lastTv/lastTc).ToString(), preferences.digitsNumber) + "</b>";
- event_execute_label_jump_reactive_tf_tc_now.UseMarkup = true;
- } else
- event_execute_label_jump_reactive_tf_tc_now.Text = "0";
- if(avgTC > 0)
- event_execute_label_jump_reactive_tf_tc_avg.Text =
Util.TrimDecimals((avgTV/avgTC).ToString(), preferences.digitsNumber);
- else
- event_execute_label_jump_reactive_tf_tc_avg.Text = "0";
}
double getRunSRunINegativePTLTime (List<RunPhaseTimeListObject> runPTLInListForPainting)