[chronojump] Improving jumps execute graph (3)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Improving jumps execute graph (3)
- Date: Wed, 20 Apr 2016 15:15:12 +0000 (UTC)
commit 562b7d32b8883ed5b0e5d71025969f274d624e2f
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Apr 20 17:11:38 2016 +0200
Improving jumps execute graph (3)
glade/chronojump.glade | 506 ++++++++++++++++++++++++++++++++++---------
images/line_person_avg.png | Bin 0 -> 252 bytes
images/line_person_max.png | Bin 0 -> 194 bytes
images/line_session_avg.png | Bin 0 -> 255 bytes
images/line_session_max.png | Bin 0 -> 196 bytes
images/svg/icons.svg | 173 +++++++++++++++-
src/Makefile.am | 4 +
src/gui/chronojump.cs | 14 ++
src/gui/eventExecute.cs | 78 ++++---
9 files changed, 635 insertions(+), 140 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 114d0d0..6123dd0 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6552,24 +6552,13 @@ after time</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox56">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel"
id="event_execute_label_message">
+ <widget class="GtkLabel"
id="event_execute_label_message">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
<property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -6578,17 +6567,6 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<widget class="GtkNotebook"
id="notebook_capture_graph_table">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6621,25 +6599,225 @@ after time</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox88">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkLabel"
id="event_graph_label_graph_person">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkLabel" id="label151">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"> ( </property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="event_graph_label_graph_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label160">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"> ) </property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</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="hbox105">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox184">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_line_session_max">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label161">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Session max</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">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="event_graph_label_graph_test">
+ <widget class="GtkHBox" id="hbox197">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_line_session_avg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label162">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Session avg</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">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox198">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_line_person_max">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label163">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Person
max</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">True</property>
<property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox199">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_line_person_avg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label164">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Person
avg</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">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">20</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -6692,7 +6870,7 @@ after time</property>
<widget class="GtkVBox" id="vbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">3</property>
<child>
<widget class="GtkVBox" id="vbox20">
<property name="can_focus">False</property>
@@ -6753,7 +6931,7 @@ after time</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -6776,7 +6954,7 @@ after time</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -6799,6 +6977,68 @@ after time</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox"
id="vbox_this_test_buttons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_delete_this_test">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Delete this test (d)</property>
+ <signal name="clicked"
handler="on_delete_this_test_clicked" swapped="no"/>
+ <accelerator key="d" signal="clicked"/>
+ <child>
+ <widget class="GtkImage"
id="image_delete_this_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_video_play_this_test">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Play
Video (v)</property>
+ <signal name="clicked"
handler="on_video_play_this_test_clicked" swapped="no"/>
+ <accelerator key="v" signal="clicked"/>
+ <child>
+ <widget class="GtkImage" id="image22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-media-play</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
@@ -6817,10 +7057,6 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
<widget class="GtkNotebook"
id="notebook_results_data">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7862,6 +8098,12 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9405,6 +9647,12 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10589,6 +10837,12 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -10822,74 +11076,6 @@ after time</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox"
id="vbox_this_test_buttons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_delete_this_test">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Delete this test (d)</property>
- <signal name="clicked"
handler="on_delete_this_test_clicked" swapped="no"/>
- <accelerator key="d" signal="clicked"/>
- <child>
- <widget class="GtkImage"
id="image_delete_this_test">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_video_play_this_test">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
Video (v)</property>
- <signal name="clicked"
handler="on_video_play_this_test_clicked" swapped="no"/>
- <accelerator key="v" signal="clicked"/>
- <child>
- <widget class="GtkImage" id="image22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-media-play</property>
- <property name="icon-size">1</property>
- </widget>
- </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="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">1</property>
@@ -12774,7 +12960,7 @@ after time</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>
@@ -19035,6 +19221,12 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23637,6 +23829,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24720,6 +24918,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -26295,6 +26499,12 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26927,6 +27137,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -39450,6 +39666,42 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41745,6 +41997,30 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -43084,12 +43360,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -44172,6 +44442,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48141,6 +48417,12 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -48888,6 +49170,12 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -49650,6 +49938,12 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/line_person_avg.png b/images/line_person_avg.png
new file mode 100644
index 0000000..2fd67d1
Binary files /dev/null and b/images/line_person_avg.png differ
diff --git a/images/line_person_max.png b/images/line_person_max.png
new file mode 100644
index 0000000..d146b2a
Binary files /dev/null and b/images/line_person_max.png differ
diff --git a/images/line_session_avg.png b/images/line_session_avg.png
new file mode 100644
index 0000000..18a52f5
Binary files /dev/null and b/images/line_session_avg.png differ
diff --git a/images/line_session_max.png b/images/line_session_max.png
new file mode 100644
index 0000000..00fb590
Binary files /dev/null and b/images/line_session_max.png differ
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index 71f6d86..0a697cd 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -5337,9 +5337,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1.5102801"
- inkscape:cx="145.14997"
- inkscape:cy="171.16029"
+ inkscape:zoom="4.0571425"
+ inkscape:cx="443.85858"
+ inkscape:cy="267.64927"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
@@ -8477,5 +8477,172 @@
x="-42.132053"
y="981.16022"
style="font-size:2px">encoder-analyze-1RM.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:5.68163776px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="312.04745"
+ y="1000.4445"
+ id="text3963-8"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3965-4"
+ x="312.04745"
+ y="1000.4445">all 16x16px</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:5.68163776px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="333.07413"
+ y="1035.1261"
+ id="text3963-8-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3965-4-8"
+ x="333.07413"
+ y="1035.1261">line_person_max.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:5.68163776px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="236.15991"
+ y="1042.007"
+ id="text3963-8-3-5"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3965-4-8-7"
+ x="236.15991"
+ y="1042.007">line_session_max.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:5.68163776px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="290.93176"
+ y="1084.3719"
+ id="text3963-8-3-2"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3965-4-8-4"
+ x="290.93176"
+ y="1084.3719">line_session_avg.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:5.68163776px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="384.76459"
+ y="1085.7003"
+ id="text3963-8-3-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3965-4-8-9"
+ x="384.76459"
+ y="1085.7003">line_person_avg.png</tspan></text>
+ <g
+ id="g5720"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/line_session_avg.png"
+ inkscape:export-xdpi="71.970001"
+ inkscape:export-ydpi="71.970001">
+ <rect
+ y="1053.7712"
+ x="308.76245"
+ height="20"
+ width="20"
+ id="rect4423-3-1"
+ style="fill:#ffffff;fill-opacity:0;stroke:none" />
+ <g
+ transform="translate(-6.127347,-0.87533528)"
+ id="g5656">
+ <rect
+
style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.4769018;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.734"
+ id="rect5545-1-4"
+ width="5.4947548"
+ height="2.7842968"
+ x="315.12851"
+ y="1063.2545" />
+ <rect
+
style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.4769018;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.734"
+ id="rect5545-1-4-1"
+ width="5.4947548"
+ height="2.7842968"
+ x="322.1424"
+ y="1063.2545" />
+ <rect
+
style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.4769018;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.734"
+ id="rect5545-1-4-8"
+ width="5.4947548"
+ height="2.7842968"
+ x="329.15628"
+ y="1063.2545" />
+ </g>
+ </g>
+ <g
+ id="g5716"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/line_session_max.png"
+ inkscape:export-xdpi="71.970001"
+ inkscape:export-ydpi="71.970001">
+ <rect
+ y="1053.2622"
+ x="255.37276"
+ height="20"
+ width="20"
+ id="rect4423-3-1-7"
+ style="fill:#ffffff;fill-opacity:0;stroke:none" />
+ <rect
+ y="1062.0496"
+ x="255.60973"
+ height="2.4252286"
+ width="19.52602"
+ id="rect5545-1-4-1-4"
+
style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.47398013;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.734"
/>
+ </g>
+ <g
+ id="g5730"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/line_person_avg.png"
+ inkscape:export-xdpi="71.970001"
+ inkscape:export-ydpi="71.970001">
+ <rect
+ y="1053.5186"
+ x="407.56189"
+ height="20"
+ width="20"
+ id="rect4423-3-1-6"
+ style="fill:#ffffff;fill-opacity:0;stroke:none" />
+ <rect
+ y="1062.1266"
+ x="407.8006"
+ height="2.7842968"
+ width="5.4947548"
+ id="rect5545-1-4-6"
+
style="fill:#ffcc01;fill-opacity:1;stroke:#ffffff;stroke-width:0.47690179999999999;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.73399999999999999"
/>
+ <rect
+ y="1062.1266"
+ x="414.81448"
+ height="2.7842968"
+ width="5.4947548"
+ id="rect5545-1-4-1-2"
+
style="fill:#ffcc01;fill-opacity:1;stroke:#ffffff;stroke-width:0.47690179999999999;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.73399999999999999"
/>
+ <rect
+ y="1062.1266"
+ x="421.82837"
+ height="2.7842968"
+ width="5.4947548"
+ id="rect5545-1-4-8-9"
+
style="fill:#ffcc01;fill-opacity:1;stroke:#ffffff;stroke-width:0.47690179999999999;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.73399999999999999"
/>
+ </g>
+ <g
+ id="g5736"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/line_person_max.png"
+ inkscape:export-xdpi="71.970001"
+ inkscape:export-ydpi="71.970001">
+ <rect
+ y="1053.0095"
+ x="354.17221"
+ height="20"
+ width="20"
+ id="rect4423-3-1-7-7"
+ style="fill:#ffffff;fill-opacity:0;stroke:none" />
+ <rect
+ y="1061.7969"
+ x="354.40918"
+ height="2.4252286"
+ width="19.52602"
+ id="rect5545-1-4-1-4-4"
+
style="fill:#ffcc01;fill-opacity:1;stroke:#ffffff;stroke-width:0.47398013000000000;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.73399999999999999"
/>
+ </g>
</g>
</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c82b60..d1956ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -270,6 +270,10 @@ RESOURCES = \
../images/stock_bell.png,stock_bell.png \
../images/stock_bell_green.png,stock_bell_green.png \
../images/stock_bell_red.png,stock_bell_red.png \
+ ../images/line_session_max.png,line_session_max.png \
+ ../images/line_session_avg.png,line_session_avg.png \
+ ../images/line_person_max.png,line_person_max.png \
+ ../images/line_person_avg.png,line_person_avg.png \
../images/audio-volume-high.png,audio-volume-high.png \
../images/audio-volume-muted.png,audio-volume-muted.png \
../images/chronopic_24.png,chronopic_24.png \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index c3af3f0..a411bca 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -115,6 +115,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_auto_start;
[Widget] Gtk.Label label_jump_auto_current_person;
[Widget] Gtk.Label label_jump_auto_current_test;
+
+ [Widget] Gtk.Image image_line_session_max;
+ [Widget] Gtk.Image image_line_session_avg;
+ [Widget] Gtk.Image image_line_person_max;
+ [Widget] Gtk.Image image_line_person_avg;
[Widget] Gtk.Box hbox_combo_result_jumps;
@@ -682,6 +687,15 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsFallPredefined);
extra_windows_jumps_image_dj_fall_predefined.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "line_session_max.png");
+ image_line_session_max.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "line_session_avg.png");
+ image_line_session_avg.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "line_person_max.png");
+ image_line_person_max.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "line_person_avg.png");
+ image_line_person_avg.Pixbuf = pixbuf;
//reaction times changes
UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 00b202f..e92b7ca 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -363,6 +363,7 @@ public partial class ChronoJumpWindow
}
private void showJumpSimpleLabels() {
+ /*
//show simple jump info
event_execute_hbox_jump_simple_titles.Show();
event_execute_table_jump_simple.Show();
@@ -378,8 +379,10 @@ public partial class ChronoJumpWindow
event_execute_label_jump_simple_height_now.Text = "";
event_execute_label_jump_simple_height_person.Text = "";
event_execute_label_jump_simple_height_session.Text = "";
+ */
- notebook_results_data.CurrentPage = 0;
+ notebook_results_data.Visible = false;
+ //notebook_results_data.CurrentPage = 0;
}
@@ -398,6 +401,7 @@ public partial class ChronoJumpWindow
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 = 1;
}
@@ -429,6 +433,7 @@ public partial class ChronoJumpWindow
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 = 3;
}
@@ -443,6 +448,7 @@ public partial class ChronoJumpWindow
event_execute_label_reaction_time_person.Text = "";
event_execute_label_reaction_time_session.Text = "";
+ notebook_results_data.Visible = true;
notebook_results_data.CurrentPage = 4;
}
@@ -455,6 +461,7 @@ public partial class ChronoJumpWindow
event_execute_label_pulse_now.Text = "";
event_execute_label_pulse_avg.Text = "";
+ notebook_results_data.Visible = true;
notebook_results_data.CurrentPage = 5;
}
@@ -1083,7 +1090,7 @@ TODO: use specific method
int lWidth = 1;
int lHeight = 1;
layoutBig.GetPixelSize(out lWidth, out lHeight);
- event_execute_pixmap.DrawLayout (pen_negro,
+ event_execute_pixmap.DrawLayout (pen_black,
Convert.ToInt32(x - lWidth/2),
//Convert.ToInt32(alto/2 - lHeight/2),
//10,
@@ -1098,7 +1105,7 @@ TODO: use specific method
int lWidth = 1;
int lHeight = 1;
layoutBig.GetPixelSize(out lWidth, out lHeight);
- event_execute_pixmap.DrawLayout (pen_negro,
+ event_execute_pixmap.DrawLayout (pen_black,
Convert.ToInt32(ancho/2 - lWidth/2),
Convert.ToInt32(alto/2 - lHeight/2),
layoutBig);
@@ -1110,7 +1117,7 @@ TODO: use specific method
int lWidth = 1;
int lHeight = 1;
layoutMid.GetPixelSize(out lWidth, out lHeight);
- event_execute_pixmap.DrawLayout (pen_negro,
+ event_execute_pixmap.DrawLayout (pen_black,
//Convert.ToInt32(x - lWidth/2),
//x,
Convert.ToInt32(x - lWidth/2),
@@ -1126,7 +1133,7 @@ TODO: use specific method
int count;
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
- writeMarginsText(eventGraph.sessionMAXAtSQL, minValue, alto);
+ //writeMarginsText(eventGraph.sessionMAXAtSQL, minValue, alto);
//check now here that we will have not division by zero problems
if(maxValue - minValue <= 0)
@@ -1142,10 +1149,11 @@ TODO: use specific method
int barDesplLeft = Convert.ToInt32(.5*barWidth);
//paint first the average horizontal guides in order to be behind the bars
- drawGuideOrAVG(pen_negro, eventGraph.personMAXAtSQL, alto, ancho, topMargin, bottomMargin,
maxValue, minValue);
- drawGuideOrAVG(pen_gris, eventGraph.sessionMAXAtSQL, alto, ancho, topMargin, bottomMargin,
maxValue, minValue);
- drawGuideOrAVG(pen_azul_claro, eventGraph.personAVGAtSQL, alto, ancho, topMargin,
bottomMargin, maxValue, minValue);
- drawGuideOrAVG(pen_azul_claro_discont, eventGraph.sessionAVGAtSQL, alto, ancho, topMargin,
bottomMargin, maxValue, minValue);
+ drawGuideOrAVG(pen_black, eventGraph.sessionMAXAtSQL, alto, ancho, topMargin, bottomMargin,
maxValue, minValue);
+ drawGuideOrAVG(pen_black_discont, eventGraph.sessionAVGAtSQL, alto, ancho, topMargin,
bottomMargin, maxValue, minValue);
+
+ drawGuideOrAVG(pen_yellow, eventGraph.personMAXAtSQL, alto, ancho, topMargin, bottomMargin,
maxValue, minValue);
+ drawGuideOrAVG(pen_yellow_discont, eventGraph.personAVGAtSQL, alto, ancho, topMargin,
bottomMargin, maxValue, minValue);
//red for TC
count = eventGraph.jumpsAtSQL.Length;
@@ -1160,9 +1168,9 @@ TODO: use specific method
);
event_execute_pixmap.DrawRectangle(pen_rojo, true, rect);
if(count == eventGraph.jumpsAtSQL.Length)
- event_execute_pixmap.DrawRectangle(pen_yellow, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_yellow_bars, false, rect);
else
- event_execute_pixmap.DrawRectangle(pen_negro, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_black, false, rect);
count --;
@@ -1183,9 +1191,9 @@ TODO: use specific method
);
event_execute_pixmap.DrawRectangle(pen_azul_claro, true, rect);
if(count == eventGraph.jumpsAtSQL.Length)
- event_execute_pixmap.DrawRectangle(pen_yellow, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_yellow_bars, false,
rect);
else
- event_execute_pixmap.DrawRectangle(pen_negro, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_black, false, rect);
count --;
}
@@ -1205,9 +1213,9 @@ TODO: use specific method
);
event_execute_pixmap.DrawRectangle(pen_azul_claro, true, rect);
if(count == eventGraph.jumpsAtSQL.Length)
- event_execute_pixmap.DrawRectangle(pen_yellow, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_yellow_bars, false,
rect);
else
- event_execute_pixmap.DrawRectangle(pen_negro, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_black, false, rect);
plotResultOnBar(x + barWidth/2, y, alto,
Convert.ToDouble(Util.GetHeightInCentimeters(jump[5])));
@@ -1223,7 +1231,7 @@ TODO: use specific method
alto);
//paint reference guide black and green if needed
- //drawGuideOrAVG(pen_negro_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
+ //drawGuideOrAVG(pen_black_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
//drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
}
@@ -1247,7 +1255,7 @@ TODO: use specific method
int barDesplLeft = Convert.ToInt32(.5*barWidth);
//paint reference guide black and green if needed
- drawGuideOrAVG(pen_negro_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
+ drawGuideOrAVG(pen_black_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
//blue for TF
@@ -1267,7 +1275,7 @@ TODO: use specific method
);
//TODO: do speed related
event_execute_pixmap.DrawRectangle(pen_azul_claro, true, rect);
- event_execute_pixmap.DrawRectangle(pen_negro, false, rect);
+ event_execute_pixmap.DrawRectangle(pen_black, false, rect);
count ++;
}
@@ -1313,7 +1321,7 @@ TODO: use specific method
}
//paint reference guide black and green if needed
- drawGuideOrAVG(pen_negro_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
+ drawGuideOrAVG(pen_black_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
@@ -1508,7 +1516,7 @@ TODO: use specific method
}
//paint reference guide black and green if needed
- drawGuideOrAVG(pen_negro_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
+ drawGuideOrAVG(pen_black_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
@@ -1617,7 +1625,7 @@ TODO: use specific method
drawGuideOrAVG(pen_azul_discont, avgTime, alto, ancho, topMargin, bottomMargin,
maxValue, minValue);
//paint reference guide black and green if needed
- drawGuideOrAVG(pen_negro_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
+ drawGuideOrAVG(pen_black_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
//blue time evolution
@@ -2021,9 +2029,11 @@ TODO: use specific method
Gdk.GC pen_rojo_discont; //avg tc in reactive; jump avg sessionTc
Gdk.GC pen_azul_claro_discont; //avg tf in reactive; jump avg sessionTv
Gdk.GC pen_azul_discont; //avg tf in reactive; jump avg sessionTv
- Gdk.GC pen_negro; //borders of rectangle
- Gdk.GC pen_yellow; //big yellow borders of rectangle (last event)
- Gdk.GC pen_negro_discont; //guide
+ Gdk.GC pen_black; //borders of rectangle
+ Gdk.GC pen_yellow; //person max
+ Gdk.GC pen_yellow_discont; //person avg
+ Gdk.GC pen_yellow_bars; //big yellow borders of rectangle (last event)
+ Gdk.GC pen_black_discont; //guide
Gdk.GC pen_green_discont; //guide
Gdk.GC pen_gris; //textual data
Gdk.GC pen_beige_discont; //Y cols
@@ -2063,15 +2073,17 @@ TODO: use specific method
//-- Configurar los contextos graficos (pinceles)
pen_rojo = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_yellow = new Gdk.GC(event_execute_drawingarea.GdkWindow);
+ pen_yellow_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
+ pen_yellow_bars = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_azul_claro = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_azul = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_rojo_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_azul_claro_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_azul_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
- //pen_negro = new Gdk.GC(event_execute_drawingarea.GdkWindow);
+ //pen_black = new Gdk.GC(event_execute_drawingarea.GdkWindow);
//pen_blanco= new Gdk.GC(event_execute_drawingarea.GdkWindow);
- pen_negro = new Gdk.GC(event_execute_drawingarea.GdkWindow);
- pen_negro_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
+ pen_black = new Gdk.GC(event_execute_drawingarea.GdkWindow);
+ pen_black_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_green_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_gris = new Gdk.GC(event_execute_drawingarea.GdkWindow);
pen_beige_discont = new Gdk.GC(event_execute_drawingarea.GdkWindow);
@@ -2090,20 +2102,24 @@ TODO: use specific method
pen_azul_claro_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
pen_azul_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
- pen_negro.Foreground = negro;
+ pen_black.Foreground = negro;
pen_yellow.Foreground = yellow;
+ pen_yellow_discont.Foreground = yellow;
+ pen_yellow_bars.Foreground = yellow;
- pen_negro_discont.Foreground = negro;
- pen_negro_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
+ pen_black_discont.Foreground = negro;
+ pen_black_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
pen_green_discont.Foreground = green;
pen_green_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
+ pen_yellow_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
+
pen_gris.Foreground = gris;
pen_beige_discont.Foreground = beige;
pen_beige_discont.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
- pen_yellow.SetLineAttributes(2, Gdk.LineStyle.Solid, Gdk.CapStyle.Butt, Gdk.JoinStyle.Round);
+ pen_yellow_bars.SetLineAttributes(2, Gdk.LineStyle.Solid, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
pen_brown_bold.Foreground = brown;
pen_brown_bold.SetLineAttributes(2, Gdk.LineStyle.Solid, Gdk.CapStyle.Butt,
Gdk.JoinStyle.Round);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
