Commit 3a7b3e3a authored by Xavier de Blas's avatar Xavier de Blas

button_enter (like mouse_over) now shows the graph

added run, runInterval images
jumps_more, jumps_rj_more shows the graph
jumps_more, rj_more inherits from EventSimpleMoreWindow
Fixed graph of ABK and SJl 

svn path=/trunk/; revision=247
parent f58415d7
......@@ -18,7 +18,7 @@ MCS = gmcs
CHRONOJUMP = chronojump
CHRONOJUMP_DEP_GUI = src/gui/confirm.cs src/gui/error.cs src/gui/event.cs src/gui/eventGraphConfigure.cs src/gui/jump.cs src/gui/jumpType.cs src/gui/run.cs src/gui/runType.cs src/gui/pulse.cs src/gui/person.cs src/gui/preferences.cs src/gui/session.cs src/gui/stats.cs src/gui/report.cs src/gui/about.cs src/gui/helpPorts.cs src/gui/dialogMessage.cs src/gui/dialogHelp.cs src/gui/dialogCalendar.cs src/gui/dialogImageTest.cs src/gui/language.cs src/gui/repetitiveConditions.cs
CHRONOJUMP_DEP_GUI = src/gui/confirm.cs src/gui/error.cs src/gui/eventExecute.cs src/gui/eventGraphConfigure.cs src/gui/event.cs src/gui/jump.cs src/gui/jumpType.cs src/gui/run.cs src/gui/runType.cs src/gui/pulse.cs src/gui/person.cs src/gui/preferences.cs src/gui/session.cs src/gui/stats.cs src/gui/report.cs src/gui/about.cs src/gui/helpPorts.cs src/gui/dialogMessage.cs src/gui/dialogHelp.cs src/gui/dialogCalendar.cs src/gui/dialogImageTest.cs src/gui/language.cs src/gui/repetitiveConditions.cs
CHRONOJUMP_DEP_STATS = src/statType.cs src/stats/main.cs src/stats/global.cs src/stats/sjCmjAbk.cs src/stats/sjCmjAbkPlus.cs src/stats/djIndex.cs src/stats/djQ.cs src/stats/rjIndex.cs src/stats/rjPotencyBosco.cs src/stats/rjEvolution.cs src/stats/ieIub.cs src/stats/fv.cs src/stats/cmjPlusPotency.cs
......@@ -48,6 +48,8 @@ RESOURCES_IMAGES = -resource:images/mini/no_image.png,mini/no_image.png \
-resource:images/jump_rocket.png,jump_rocket.png -resource:images/mini/jump_rocket.png,mini/jump_rocket.png \
-resource:images/jump_rj.png,jump_rj.png -resource:images/mini/jump_rj.png,mini/jump_rj.png \
-resource:images/jump_rj_in.png,jump_rj_in.png -resource:images/mini/jump_rj_in.png,mini/jump_rj_in.png \
-resource:images/run_simple.png,run_simple.png -resource:images/mini/run_simple.png,mini/run_simple.png \
-resource:images/run_interval.png,run_interval.png -resource:images/mini/run_interval.png,mini/run_interval.png \
CHRONOJUMP_LIB = -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -r:System.Data -r:Mono.Data.SqliteClient -r:System.Web.Services
#CHRONOJUMP_LIB = -pkg:gtk-sharp -pkg:glade-sharp -r:System.Data -r:Mono.Data.SqliteClient -r:System.Web.Services
......
CHRONOJUMP DETAILED CHANGELOG:
2 may 2007
button_enter (like mouse_over) now shows the graph
added run, runInterval images
jumps_more, jumps_rj_more shows the graph
jumps_more, rj_more inherits from EventSimpleMoreWindow
Fixed graph of ABK and SJl
30 apr 2007
changed all SJ+, CMJ+, ABK+ to SJl, CMJl, ABKl
added graphs: jump_free, jump_rj_in, jump_sjl
......
No preview for this file type
......@@ -10921,9 +10921,9 @@ If you need more, just repeat the operation later.</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label450">
<widget class="GtkLabel" id="label_image_test">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;image of test&lt;/b&gt;</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -10933,8 +10933,8 @@ If you need more, just repeat the operation later.</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="ellipsize">PANGO_ELLIPSIZE_END</property>
<property name="width_chars">15</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
......@@ -10948,7 +10948,7 @@ If you need more, just repeat the operation later.</property>
<child>
<widget class="GtkButton" id="button_image_test">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Expand image</property>
<property name="tooltip" translatable="yes">Expand image and show description</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
......@@ -10989,7 +10989,7 @@ If you need more, just repeat the operation later.</property>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
</packing>
</child>
......@@ -11045,6 +11045,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_jump_activate" last_modification_time="Sat, 17 Feb 2007 23:07:58 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:05:25 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11063,6 +11064,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_jump_activate" last_modification_time="Sat, 02 Oct 2004 20:21:23 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 19:40:46 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11081,6 +11083,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_jump_extra_activate" last_modification_time="Fri, 11 Mar 2005 13:16:40 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 19:51:43 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11099,6 +11102,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_jump_activate" last_modification_time="Sat, 02 Oct 2004 20:21:34 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 19:51:52 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11117,6 +11121,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_jump_activate" last_modification_time="Sat, 02 Oct 2004 20:26:49 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:00:28 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11135,6 +11140,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_jump_extra_activate" last_modification_time="Fri, 11 Mar 2005 13:16:30 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:00:36 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11153,6 +11159,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_jump_activate" last_modification_time="Sun, 29 Apr 2007 11:24:29 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:00:45 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11577,6 +11584,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_rj_activate" last_modification_time="Thu, 23 Sep 2004 00:45:53 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:06:07 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11595,6 +11603,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_rj_activate" last_modification_time="Thu, 23 Sep 2004 00:45:53 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:08:00 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -11613,6 +11622,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_rj_activate" last_modification_time="Thu, 23 Sep 2004 00:45:53 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:08:16 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12175,6 +12185,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_run_extra_activate" last_modification_time="Thu, 21 Apr 2005 13:51:01 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12192,6 +12203,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_run_activate" last_modification_time="Thu, 21 Apr 2005 13:51:12 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:30 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12209,6 +12221,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_run_activate" last_modification_time="Thu, 21 Apr 2005 13:51:12 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:38 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12226,6 +12239,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_run_activate" last_modification_time="Thu, 21 Apr 2005 13:51:12 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:47 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12243,6 +12257,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_normal_run_activate" last_modification_time="Thu, 21 Apr 2005 13:51:12 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:56 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12667,6 +12682,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_run_interval_activate" last_modification_time="Tue, 16 Aug 2005 13:31:27 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:57:14 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12685,6 +12701,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_run_interval_activate" last_modification_time="Tue, 16 Aug 2005 13:31:27 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:57:24 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......@@ -12703,6 +12720,7 @@ If you need more, just repeat the operation later.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_run_interval_activate" last_modification_time="Tue, 16 Aug 2005 13:32:42 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:57:33 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
......
images/jump_abk.png

10.4 KB | W: | H:

images/jump_abk.png

10.5 KB | W: | H:

images/jump_abk.png
images/jump_abk.png
images/jump_abk.png
images/jump_abk.png
  • 2-up
  • Swipe
  • Onion skin
images/jump_sj_l.png

10.2 KB | W: | H:

images/jump_sj_l.png

10.3 KB | W: | H:

images/jump_sj_l.png
images/jump_sj_l.png
images/jump_sj_l.png
images/jump_sj_l.png
  • 2-up
  • Swipe
  • Onion skin
images/mini/jump_abk.png

5 KB | W: | H:

images/mini/jump_abk.png

5.04 KB | W: | H:

images/mini/jump_abk.png
images/mini/jump_abk.png
images/mini/jump_abk.png
images/mini/jump_abk.png
  • 2-up
  • Swipe
  • Onion skin
images/mini/jump_sj_l.png

4.84 KB | W: | H:

images/mini/jump_sj_l.png

4.92 KB | W: | H:

images/mini/jump_sj_l.png
images/mini/jump_sj_l.png
images/mini/jump_sj_l.png
images/mini/jump_sj_l.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -33,15 +33,15 @@
borderopacity="1.0"
id="base"
inkscape:current-layer="svg1507"
inkscape:cx="275.17204"
inkscape:cy="94.0082"
inkscape:cx="12.591142"
inkscape:cy="212.87957"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:window-height="691"
inkscape:window-width="1024"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:zoom="1.904"
inkscape:zoom="2.6926626"
pagecolor="#ffffff"
showguides="true"
inkscape:guide-bbox="true"
......@@ -285,10 +285,6 @@
height="114.67348"
x="7.4351883"
y="37.194675" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.68355179;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 222.08535,291.04253 L 233.71934,291.01228"
id="path4608" />
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
......@@ -339,10 +335,6 @@
id="tspan6894"
x="123.53906"
y="22.785599">DJ</tspan></text>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.68355179;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 14.439103,291.4142 L 26.072313,291.27571"
id="path3404" />
<g
id="g13357">
<g
......@@ -486,79 +478,127 @@
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g13613">
<text
id="text4624"
y="274.50583"
x="217.40425"
style="font-size:3.84811831px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
xml:space="preserve"><tspan
y="274.50583"
x="217.40425"
id="tspan4626"
sodipodi:role="line">90º</tspan></text>
id="g2629">
<g
id="g13423">
transform="translate(0,0.6387735)"
id="g9988">
<g
id="g9988"
transform="translate(0,0.6387735)">
id="g6829">
<path
sodipodi:nodetypes="cccc"
id="path4594"
d="M 194.76769,221.77246 L 194.49048,247.7019 L 194.12151,270.92511 L 193.91346,286.44535"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.32092023;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="g6829">
transform="matrix(0.1406052,-1.499527e-2,1.499527e-2,0.1406052,182.19433,208.02859)"
id="g4596">
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.32092023;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 194.76769,221.77246 L 194.49048,247.7019 L 194.12151,270.92511 L 193.91346,286.44535"
id="path4594"
sodipodi:nodetypes="cccc" />
<g
id="g4596"
transform="matrix(0.1406052,-1.499527e-2,1.499527e-2,0.1406052,182.19433,208.02859)">
<path
style="fill:#000000;stroke:none"
id="path4598"
d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z " />
<path
style="fill:#000000;stroke:none"
id="path4600"
d="" />
</g>
d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z "
id="path4598"
style="fill:#000000;stroke:none" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 194.68091,221.79113 L 210.88738,224.48791 L 218.43351,207.85656"
id="path4602"
sodipodi:nodetypes="ccc" />
d=""
id="path4600"
style="fill:#000000;stroke:none" />
</g>
<path
id="path4604"
d="M 190.0254,290.48733 L 201.25216,290.42139"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
sodipodi:nodetypes="ccc"
id="path4602"
d="M 194.68091,221.79113 L 210.88738,224.48791 L 218.43351,207.85656"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 190.0254,290.48733 L 201.25216,290.42139"
id="path4604" />
</g>
<g
id="g6820">
<g
id="g4610"
transform="matrix(0.2391512,-2.5505016e-2,2.5505016e-2,0.2391512,208.30757,223.42051)">
id="g4630"
transform="translate(207.64664,-0.6635752)">
<path
sodipodi:nodetypes="cccc"
id="path4612"
d="M 123.22692,69.6693 L 46.641966,146.83008 L 106.52795,215.35347 L 42.035353,274.0878"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
id="path4632"
d="M 62.706424,200.8781 L 62.429209,226.80754 L 62.060243,250.03075 L 61.852188,265.55099"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.32092023;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
transform="matrix(0.609252,0,0,0.609252,89.577271,20.24178)"
id="g4614">
transform="matrix(0.1406052,-1.499527e-2,1.499527e-2,0.1406052,50.133065,187.13423)"
id="g4634">
<path
d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z "
id="path4616"
id="path4636"
style="fill:#000000;stroke:none" />
<path
d=""
id="path4618"
id="path4638"
style="fill:#000000;stroke:none" />
</g>
<path
sodipodi:nodetypes="ccc"
id="path4620"
d="M 125.53023,67.941824 L 102.9692,131.80853 L 127.35271,186.46219"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
id="path4642"
d="M 60.50767,268.20638 L 63.38999,279.05704"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 270.23303,199.95803 L 271.78134,178.63172 L 272.60915,162.00037"
id="path4653"
sodipodi:nodetypes="ccc" />
</g>
<path
id="path6771"
d="M 254.68912,261.92697 L 254.68912,246.50334"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#008b00;stroke-width:3.71499991;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#TriangleOutS);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path6773"
d="M 209.33207,242.79502 L 209.33207,258.21865"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#008b00;stroke-width:3.71499991;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#TriangleOutS);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path9986"
d="M 186.58274,293.0441 L 210.16189,292.97123"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="g2617">
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.68355179;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 222.08535,291.04253 L 233.71934,291.01228"
id="path4608" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.40507388;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 239.55435,236.9391 L 223.20696,257.3455 L 239.27645,272.20555 L 225.35099,287.89682"
id="path4612"
sodipodi:nodetypes="cccc" />
<g
id="g4614"
transform="matrix(0.1457033,-1.5538982e-2,1.5538982e-2,0.1457033,230.24635,225.97669)">
<path
transform="matrix(-0.7482846,0.6633778,-0.6633778,-0.7482846,255.38286,306.00194)"
style="fill:#000000;stroke:none"
id="path4616"
d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z " />
<path
style="fill:#000000;stroke:none"
id="path4618"
d="" />
</g>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.68355167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 240.06113,236.46723 L 236.29456,252.31645 L 243.51984,264.76503"
id="path4620"
sodipodi:nodetypes="ccc" />
<g
id="g2612">
<text
id="text4624"
y="274.50583"
x="217.40425"
style="font-size:3.84811831px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
xml:space="preserve"><tspan
y="274.50583"
x="217.40425"
id="tspan4626"
sodipodi:role="line">90º</tspan></text>
<path
transform="matrix(-0.1620337,0.1777326,-0.1777326,-0.1620337,277.18727,290.0877)"
sodipodi:end="1.5740502"
sodipodi:start="0"
d="M 106.52795,173.89394 A 47.793621,47.793621 0 0 1 58.578815,221.6873 L 58.734329,173.89394 z"
......@@ -570,60 +610,15 @@
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.3794643"
sodipodi:type="arc" />
</g>
<g
id="g6820">
<g
transform="translate(207.64664,-0.6635752)"
id="g4630">
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.32092023;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 62.706424,200.8781 L 62.429209,226.80754 L 62.060243,250.03075 L 61.852188,265.55099"
id="path4632"
sodipodi:nodetypes="cccc" />
<g
id="g4634"
transform="matrix(0.1406052,-1.499527e-2,1.499527e-2,0.1406052,50.133065,187.13423)">
<path
style="fill:#000000;stroke:none"
id="path4636"
d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z " />
<path
style="fill:#000000;stroke:none"
id="path4638"
d="" />
</g>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 60.50767,268.20638 L 63.38999,279.05704"
id="path4642" />
</g>
<path
sodipodi:nodetypes="ccc"
id="path4653"
d="M 270.23303,199.95803 L 271.78134,178.63172 L 272.60915,162.00037"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.62464416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#008b00;stroke-width:3.71499991;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#TriangleOutS);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 254.68912,261.92697 L 254.68912,246.50334"
id="path6771" />
<path
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#008b00;stroke-width:3.71499991;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#TriangleOutS);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 209.33207,242.79502 L 209.33207,258.21865"
id="path6773" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 186.58274,293.0441 L 210.16189,292.97123"
id="path9986" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 217.96529,293.0441 L 241.54444,292.97123"
id="path10007" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 257.69734,293.0441 L 281.27649,292.97123"
id="path10009" />
</g>
<path
id="path10007"
d="M 217.96529,293.0441 L 241.54444,292.97123"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path10009"
d="M 257.69734,293.0441 L 281.27649,292.97123"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g11255">
......@@ -1051,7 +1046,7 @@
sodipodi:role="line">l</tspan></text>
</g>
<g
id="g2550">
id="g2799">
<g
id="g2537">
<g
......@@ -1115,7 +1110,11 @@
d="M 49.376625,293.14191 L 72.955773,293.06904"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="g2521">
id="g2783">
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.68355179;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 14.439103,291.4142 L 26.072313,291.27571"
id="path3404" />
<g
id="g2481">
<rect
......@@ -1186,11 +1185,11 @@
id="tspan4433"
x="9.7576132"
y="274.82339">90º</tspan></text>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 9.3880482,293.10567 L 32.967196,293.0328"
id="path8993" />
</g>
<path
id="path8993"
d="M 9.3880482,293.10567 L 32.967196,293.0328"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006f8a;stroke-width:2.06560731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
......
......@@ -171,6 +171,7 @@ public class ChronoJump
[Widget] Gtk.Frame frame_image_test;
[Widget] Gtk.Image image_test;
[Widget] Gtk.Button button_image_test;
[Widget] Gtk.Label label_image_test;
private Random rand;
......@@ -1864,10 +1865,60 @@ Console.Write("7");
reportWin = ReportWindow.Show(app1, report);
}
private void on_enter_notify (object o, Gtk.EnterNotifyEventArgs args) {
Console.WriteLine("enter notify");
}
private void on_button_enter (object o, EventArgs args) {
//jump simple
if(o == (object) button_free || o == (object) menuitem_jump_free) {
currentEventType = new JumpType("Free");
} else if(o == (object) button_sj) {
currentEventType = new JumpType("SJ");
} else if(o == (object) button_sj_plus) {
currentEventType = new JumpType("SJl");
} else if(o == (object) button_cmj) {
currentEventType = new JumpType("CMJ");
} else if(o == (object) button_abk) {
currentEventType = new JumpType("ABK");
} else if(o == (object) button_dj) {
currentEventType = new JumpType("DJ");
} else if(o == (object) button_rocket) {
currentEventType = new JumpType("Rocket");
//jumpRJ
} else if(o == (object) button_rj_j) {
currentEventType = new JumpType("RJ(j)");
} else if(o == (object) button_rj_t) {
currentEventType = new JumpType("RJ(t)");
} else if(o == (object) button_rj_unlimited) {
currentEventType = new JumpType("RJ(unlimited)");
//run
} else if(o == (object) button_run_custom) {
currentEventType = new RunType("Custom");
} else if(o == (object) button_run_20m) {
currentEventType = new RunType("20m");
} else if(o == (object) button_run_20m) {
currentEventType = new RunType("100m");
} else if(o == (object) button_run_100m) {
currentEventType = new RunType("200m");
} else if(o == (object) button_run_200m) {
currentEventType = new RunType("400m");
//run interval
} else if(o == (object) button_run_interval_by_laps) {
currentEventType = new RunType("byLaps");
} else if(o == (object) button_run_interval_by_time) {
currentEventType = new RunType("byTime");
} else if(o == (object) button_run_interval_unlimited) {
currentEventType = new RunType("unlimited");
}
//reactionTime
//pulse
changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
}
private void changeTestImage(string tableName, string eventName, string fileNameString) {
//string fileNameString = SqliteEvent.SelectFileName(tableName, eventName);
//string fileNameString = currentRunType.ImageFileName;
Pixbuf pixbuf;
if(fileNameString != "") {
pixbuf = new Pixbuf (null, "mini/" + fileNameString);
......@@ -1876,6 +1927,8 @@ Console.Write("7");
pixbuf = new Pixbuf (null, "mini/no_image.png");
button_image_test.Sensitive=false;
}
label_image_test.Text = "<b>" + eventName + "</b>";
label_image_test.UseMarkup = true;
image_test.Pixbuf = pixbuf;
}
......@@ -1889,6 +1942,12 @@ Console.Write("7");
{
jumpsMoreWin = JumpsMoreWindow.Show(app1);
jumpsMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_accepted);
jumpsMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_draw_image_test);
}
private void on_more_jumps_draw_image_test (object o, EventArgs args) {
currentJumpType = new JumpType(jumpsMoreWin.SelectedEventName);
changeTestImage("jump", currentJumpType.Name, currentJumpType.ImageFileName);
}
private void on_button_last_clicked (object o, EventArgs args)
......@@ -1907,7 +1966,9 @@ Console.Write("7");
jumpsMoreWin.Button_accept.Clicked -= new EventHandler(on_more_jumps_accepted);
currentJumpType = new JumpType(
jumpsMoreWin.SelectedJumpType,
//jumpsMoreWin.SelectedJumpType,
jumpsMoreWin.SelectedEventName, //type of jump
//SelectedEventType would be: jump, or run, ...
jumpsMoreWin.SelectedStartIn,
jumpsMoreWin.SelectedExtraWeight,
false, //isRepetitive
......@@ -1915,7 +1976,7 @@ Console.Write("7");
0, //limitValue
false, //unlimited
jumpsMoreWin.SelectedDescription,
SqliteEvent.SelectFileName("jump", jumpsMoreWin.SelectedJumpType)
SqliteEvent.SelectFileName("jump", jumpsMoreWin.SelectedEventName)
);
//destroy the win for not having updating problems if a new jump type is created
......@@ -1952,12 +2013,6 @@ Console.Write("7");
//suitable for all jumps not repetitive
private void on_normal_jump_activate (object o, EventArgs args)
{
/*
Pixbuf pixbuf = new Pixbuf (null, "mini/jump_sj.png");
image_test.Pixbuf = pixbuf;
button_image_test.Sensitive=true;
*/
if(o == (object) button_free || o == (object) menuitem_jump_free) {
currentJumpType = new JumpType("Free");
}else if(o == (object) button_sj || o == (object) sj) {
......@@ -2068,6 +2123,12 @@ Console.Write("7");
{
jumpsRjMoreWin = JumpsRjMoreWindow.Show(app1);
jumpsRjMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_rj_accepted);
jumpsRjMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_rj_draw_image_test);
}
private void on_more_jumps_rj_draw_image_test (object o, EventArgs args) {
currentJumpType = new JumpType(jumpsRjMoreWin.SelectedEventName);
changeTestImage("jumpRj", currentJumpType.Name, currentJumpType.ImageFileName);
}
private void on_button_last_rj_clicked (object o, EventArgs args)
......@@ -2087,7 +2148,8 @@ Console.Write("7");
jumpsRjMoreWin.Button_accept.Clicked -= new EventHandler(on_more_jumps_rj_accepted);
currentJumpType = new JumpType(
jumpsRjMoreWin.SelectedJumpType,
//jumpsRjMoreWin.SelectedJumpType,
jumpsRjMoreWin.SelectedEventName,
jumpsRjMoreWin.SelectedStartIn,
jumpsRjMoreWin.SelectedExtraWeight,
true, //isRepetitive
......@@ -2095,7 +2157,7 @@ Console.Write("7");
jumpsRjMoreWin.SelectedLimitedValue,
jumpsRjMoreWin.SelectedUnlimited,
jumpsRjMoreWin.SelectedDescription,
SqliteEvent.SelectFileName("jumpRj", jumpsRjMoreWin.SelectedJumpType)
SqliteEvent.SelectFileName("jumpRj", jumpsRjMoreWin.SelectedEventName)
);
//destroy the win for not having updating problems if a new jump type is created
......
This diff is collapsed.
This diff is collapsed.
......@@ -993,23 +993,30 @@ public class JumpExtraWindow
//---------------- jumps_more widget ---------------------
//--------------------------------------------------------
public class JumpsMoreWindow
public class JumpsMoreWindow : EventMoreWindow
{
[Widget] Gtk.Window jumps_runs_more;
private TreeStore store;
[Widget] Gtk.TreeView treeview_more;
[Widget] Gtk.Button button_accept;
// private TreeStore store;
// [Widget] Gtk.TreeView treeview_more;
// [Widget] Gtk.Button button_accept;