[chronojump] Shown person best (all sessions) on jump, run, reaction time graphs (50%)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Shown person best (all sessions) on jump, run, reaction time graphs (50%)
- Date: Fri, 24 Jun 2016 02:57:24 +0000 (UTC)
commit c3992a29c5914a56be916acd6e9434dbae6c40a5
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jun 24 04:50:01 2016 +0200
Shown person best (all sessions) on jump, run, reaction time graphs (50%)
glade/chronojump.glade | 217 +++++++++++++++++++++++++++---
images/line_person_max_all_sessions.png | Bin 0 -> 194 bytes
images/svg/icons.svg | 71 ++++++++---
src/Makefile.am | 1 +
src/gui/chronojump.cs | 16 ++-
5 files changed, 259 insertions(+), 46 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index d1f3321..42c1da3 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6725,7 +6725,65 @@ after time</property>
<widget class="GtkHBox" id="hbox_results_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkHBox" id="hbox122">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label160">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Group</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox200">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <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">Average</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="GtkHBox" id="hbox184">
<property name="visible">True</property>
@@ -6747,7 +6805,7 @@ after time</property>
<widget class="GtkLabel" id="label161">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Session best</property>
+ <property name="label"
translatable="yes">Best</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -6759,16 +6817,63 @@ after time</property>
<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">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="GtkHBox" id="hbox197">
+ <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>
+ <widget class="GtkLabel" id="label165">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Person</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox202">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHBox" id="hbox204">
<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">
+ <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>
@@ -6780,10 +6885,10 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label162">
+ <widget class="GtkLabel" id="label167">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Session avg</property>
+ <property name="label"
translatable="yes">Average</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -6795,11 +6900,11 @@ 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>
- <widget class="GtkHBox" id="hbox198">
+ <widget class="GtkHBox" id="hbox203">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -6816,10 +6921,10 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label163">
+ <widget class="GtkLabel" id="label166">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Person
best</property>
+ <property name="label"
translatable="yes">Best</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -6831,16 +6936,16 @@ 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>
<child>
- <widget class="GtkHBox" id="hbox199">
+ <widget class="GtkHBox" id="hbox61">
<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">
+ <widget class="GtkImage"
id="image_line_person_max_all_sessions">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -6852,10 +6957,10 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label164">
+ <widget class="GtkLabel" id="label163">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Person
avg</property>
+ <property name="label" translatable="yes">Best
(all sessions)</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -6867,7 +6972,21 @@ after time</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
+ </packing>
+ </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>
@@ -7878,6 +7997,9 @@ after time</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>
@@ -7996,9 +8118,6 @@ after time</property>
<property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -16569,6 +16688,9 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -21276,6 +21398,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22464,6 +22589,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24144,6 +24272,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24881,6 +25012,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -37961,6 +38095,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40676,6 +40828,18 @@ 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>
</widget>
</child>
</widget>
@@ -41913,9 +42077,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>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -43103,6 +43264,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -47177,6 +47341,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -48029,6 +48196,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48896,6 +49066,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/line_person_max_all_sessions.png b/images/line_person_max_all_sessions.png
new file mode 100644
index 0000000..bec0ad6
Binary files /dev/null and b/images/line_person_max_all_sessions.png differ
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index be580cd..f234622 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -7256,9 +7256,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1.1917158"
- inkscape:cx="369.23005"
- inkscape:cy="121.19634"
+ inkscape:zoom="3.7509109"
+ inkscape:cx="478.30195"
+ inkscape:cy="268.48109"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
@@ -7327,7 +7327,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -10271,14 +10271,14 @@
<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"
+ x="414.93549"
+ y="1082.8479"
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>
+ x="414.93549"
+ y="1082.8479">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"
@@ -10304,14 +10304,14 @@
<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"
+ x="471.95798"
+ y="1046.2433"
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>
+ x="471.95798"
+ y="1046.2433">line_person_avg.png</tspan></text>
<g
id="g5720"
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/line_session_avg.png"
@@ -10374,7 +10374,8 @@
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">
+ inkscape:export-ydpi="71.970001"
+ transform="translate(80.528347,-0.26660191)">
<rect
y="1053.5186"
x="407.56189"
@@ -10388,27 +10389,28 @@
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"
/>
+
style="fill:#ffcc01;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"
/>
<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"
/>
+
style="fill:#ffcc01;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"
/>
<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"
/>
+
style="fill:#ffcc01;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"
/>
</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">
+ inkscape:export-ydpi="71.970001"
+ transform="translate(80.528347,-0.26660191)">
<rect
y="1053.0095"
x="354.17221"
@@ -10422,7 +10424,7 @@
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"
/>
+
style="fill:#ffcc01;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>
<text
xml:space="preserve"
@@ -11224,5 +11226,38 @@
inkscape:connector-curvature="0" />
</g>
</g>
+ <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="345.27319"
+ y="1043.8402"
+ id="text3963-8-3-36"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3965-4-8-6"
+ x="345.27319"
+ y="1043.8402">line_person_max_all_sessions.png</tspan></text>
+ <g
+ id="g5736-2"
+
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"
+ transform="translate(17.201591,-0.51864977)"
+ style="fill:#ff00ff">
+ <rect
+ y="1053.0095"
+ x="354.17221"
+ height="20"
+ width="20"
+ id="rect4423-3-1-7-7-9"
+ style="fill:#ff00ff;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-0"
+
style="fill:#ff00ff;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 e911db7..2656f58 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -277,6 +277,7 @@ RESOURCES = \
../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_max_all_sessions.png,line_person_max_all_sessions.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 \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9bee46a..15ef2e4 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -120,10 +120,11 @@ public partial class ChronoJumpWindow
[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_session_max;
[Widget] Gtk.Image image_line_person_avg;
+ [Widget] Gtk.Image image_line_person_max;
+ [Widget] Gtk.Image image_line_person_max_all_sessions;
[Widget] Gtk.Box hbox_combo_result_jumps;
@@ -692,14 +693,17 @@ public partial class ChronoJumpWindow
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_session_max.png");
+ image_line_session_max.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "line_person_avg.png");
image_line_person_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_max_all_sessions.png");
+ image_line_person_max_all_sessions.Pixbuf = pixbuf;
//reaction times changes
//UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
