[gbrainy] Nicer clock for all clock games
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy] Nicer clock for all clock games
- Date: Fri, 4 Jan 2013 22:48:55 +0000 (UTC)
commit 011b89e4f7ee52ee453eb5ec013b3be844d9ca9b
Author: Jordi Mas <jmas softcatala org>
Date: Fri Jan 4 23:51:16 2013 +0100
Nicer clock for all clock games
data/game-graphics/clock.svg | 812 ++++++++++++++++++++++----------------
src/Core/Main/CairoContextEx.cs | 29 +-
src/Games/Logic/PuzzleClocks.cs | 50 +---
src/Games/Logic/PuzzleTimeNow.cs | 8 +-
4 files changed, 498 insertions(+), 401 deletions(-)
---
diff --git a/data/game-graphics/clock.svg b/data/game-graphics/clock.svg
index 3181e20..349a81e 100644
--- a/data/game-graphics/clock.svg
+++ b/data/game-graphics/clock.svg
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:cc="http://creativecommons.org/ns#";
@@ -8,15 +10,378 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="100"
- height="100"
- viewBox="0 0 80 80"
- version="1.1"
+ width="400"
+ height="400"
id="svg2"
- inkscape:version="0.47 r22583"
- sodipodi:docname="clock.svg">
+ sodipodi:version="0.32"
+ inkscape:version="0.48.3.1 r9886"
+ version="1.0"
+ sodipodi:docname="clock3.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="C:\Documents and Settings\Piotrek\Pulpit\analog clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3357">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3359" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3361" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3342">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3344" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3346" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3223">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3225" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3227" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3961">
+ <stop
+ id="stop3965"
+ offset="0"
+ style="stop-color:#f0f7f9;stop-opacity:1;" />
+ <stop
+ id="stop3963"
+ offset="1"
+ style="stop-color:#cccccc;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3135">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3137" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3139" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3121">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3123" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3125" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3121"
+ id="linearGradient3127"
+ x1="358.93213"
+ y1="516.56403"
+ x2="261.60901"
+ y2="185.8992"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3135"
+ id="linearGradient3141"
+ x1="289.70889"
+ y1="191.53207"
+ x2="325.64322"
+ y2="295.89066"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3961"
+ id="radialGradient3967"
+ cx="-485.71429"
+ cy="332.36218"
+ fx="-485.71429"
+ fy="332.36218"
+ r="262.85715"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3961"
+ id="radialGradient4039"
+ gradientUnits="userSpaceOnUse"
+ cx="-485.71429"
+ cy="332.36218"
+ fx="-485.71429"
+ fy="332.36218"
+ r="262.85715" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3135"
+ id="linearGradient4041"
+ gradientUnits="userSpaceOnUse"
+ x1="289.70889"
+ y1="191.53207"
+ x2="325.64322"
+ y2="295.89066" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3121"
+ id="linearGradient4043"
+ gradientUnits="userSpaceOnUse"
+ x1="358.93213"
+ y1="516.56403"
+ x2="261.60901"
+ y2="185.8992" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223"
+ id="linearGradient3229"
+ x1="-485.71429"
+ y1="614.71124"
+ x2="-221.35715"
+ y2="332.36218"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3357"
+ id="radialGradient3401"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.9921852,0.1247736,-7.5182612e-2,-0.5978435,-502.19922,415.88046)"
+ cx="-260.00867"
+ cy="219.2083"
+ fx="-260.00867"
+ fy="219.2083"
+ r="37.015625" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3342"
+ id="radialGradient3405"
+ cx="-257.14285"
+ cy="352.99625"
+ fx="-257.14285"
+ fy="352.99625"
+ r="52.319111"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.6357018,-1.4126707e-2,8.6361586e-3,0.9999627,160.41765,-3.6194177)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223"
+ id="linearGradient3457"
+ gradientUnits="userSpaceOnUse"
+ x1="-485.71429"
+ y1="614.71124"
+ x2="-221.35715"
+ y2="332.36218" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3961"
+ id="radialGradient3459"
+ gradientUnits="userSpaceOnUse"
+ cx="-485.71429"
+ cy="332.36218"
+ fx="-485.71429"
+ fy="332.36218"
+ r="262.85715" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3342"
+ id="radialGradient3461"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.6357018,-1.4126707e-2,8.6361586e-3,0.9999627,160.41765,-3.6194177)"
+ cx="-257.14285"
+ cy="352.99625"
+ fx="-257.14285"
+ fy="352.99625"
+ r="52.319111" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3357"
+ id="radialGradient3463"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.9921852,0.1247736,-7.5182612e-2,-0.5978435,-502.19922,415.88046)"
+ cx="-260.00867"
+ cy="219.2083"
+ fx="-260.00867"
+ fy="219.2083"
+ r="37.015625" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3135"
+ id="linearGradient3465"
+ gradientUnits="userSpaceOnUse"
+ x1="289.70889"
+ y1="191.53207"
+ x2="325.64322"
+ y2="295.89066" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3121"
+ id="linearGradient3467"
+ gradientUnits="userSpaceOnUse"
+ x1="358.93213"
+ y1="516.56403"
+ x2="261.60901"
+ y2="185.8992" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223"
+ id="linearGradient2582"
+ gradientUnits="userSpaceOnUse"
+ x1="-485.71429"
+ y1="614.71124"
+ x2="-221.35715"
+ y2="332.36218" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3961"
+ id="radialGradient2584"
+ gradientUnits="userSpaceOnUse"
+ cx="-485.71429"
+ cy="332.36218"
+ fx="-485.71429"
+ fy="332.36218"
+ r="262.85715" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3342"
+ id="radialGradient2586"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.6357018,-1.4126707e-2,8.6361586e-3,0.9999627,160.41765,-3.6194177)"
+ cx="-257.14285"
+ cy="352.99625"
+ fx="-257.14285"
+ fy="352.99625"
+ r="52.319111" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3357"
+ id="radialGradient2588"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.9921852,0.1247736,-7.5182612e-2,-0.5978435,-502.19922,415.88046)"
+ cx="-260.00867"
+ cy="219.2083"
+ fx="-260.00867"
+ fy="219.2083"
+ r="37.015625" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3135"
+ id="linearGradient2594"
+ gradientUnits="userSpaceOnUse"
+ x1="289.70889"
+ y1="191.53207"
+ x2="325.64322"
+ y2="295.89066" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3121"
+ id="linearGradient2596"
+ gradientUnits="userSpaceOnUse"
+ x1="358.93213"
+ y1="516.56403"
+ x2="261.60901"
+ y2="185.8992" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223"
+ id="linearGradient2640"
+ gradientUnits="userSpaceOnUse"
+ x1="-485.71429"
+ y1="614.71124"
+ x2="-221.35715"
+ y2="332.36218" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3961"
+ id="radialGradient2642"
+ gradientUnits="userSpaceOnUse"
+ cx="-485.71429"
+ cy="332.36218"
+ fx="-485.71429"
+ fy="332.36218"
+ r="262.85715" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3135"
+ id="linearGradient2648"
+ gradientUnits="userSpaceOnUse"
+ x1="289.70889"
+ y1="191.53207"
+ x2="325.64322"
+ y2="295.89066" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3121"
+ id="linearGradient2650"
+ gradientUnits="userSpaceOnUse"
+ x1="358.93213"
+ y1="516.56403"
+ x2="261.60901"
+ y2="185.8992" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.95282639"
+ inkscape:cx="207.62532"
+ inkscape:cy="204.22988"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1152"
+ inkscape:window-height="709"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="1,0"
+ position="300,352.63507"
+ id="guide3076" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="247.1594,300"
+ id="guide3078" />
+ <sodipodi:guide
+ orientation="-0.70710678,0.70710678"
+ position="-31.485274,225.64446"
+ id="guide3059" />
+ </sodipodi:namedview>
<metadata
- id="metadata124">
+ id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -26,345 +391,126 @@
</cc:Work>
</rdf:RDF>
</metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1152"
- inkscape:window-height="694"
- id="namedview122"
- showgrid="false"
- inkscape:zoom="0.944"
- inkscape:cx="125"
- inkscape:cy="122.88136"
- inkscape:window-x="0"
- inkscape:window-y="52"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" />
- <defs
- id="defs4">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 125 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="250 : 125 : 1"
- inkscape:persp3d-origin="125 : 83.333333 : 1"
- id="perspective126" />
- <g
- id="g6">
- <symbol
- overflow="visible"
- id="glyph0-0"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 0.203125,0.71875 0,-3.640625 2.078125,0 0,3.640625 -2.078125,0 z M 0.4375,0.484375 l 1.609375,0 0,-3.171875 -1.609375,0 0,3.171875 z m 0,0"
- id="path9" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-1"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 1.6875,-1.515625 c 0.1875,0.03125 0.332031,0.109375 0.4375,0.234375 0.113281,0.117188 0.171875,0.261719 0.171875,0.4375 0,0.273438 -0.105469,0.480469 -0.3125,0.625 C 1.785156,-0.0703125 1.5,0 1.125,0 1,0 0.867188,-0.0078125 0.734375,-0.03125 0.597656,-0.0507812 0.457031,-0.0820312 0.3125,-0.125 l 0,-0.359375 c 0.113281,0.074219 0.238281,0.125 0.375,0.15625 0.132812,0.023437 0.273438,0.03125 0.421875,0.03125 0.257813,0 0.453125,-0.046875 0.578125,-0.140625 0.132812,-0.09375 0.203125,-0.226562 0.203125,-0.40625 0,-0.15625 -0.0625,-0.28125 -0.1875,-0.375 C 1.578125,-1.3125 1.40625,-1.359375 1.1875,-1.359375 l -0.34375,0 0,-0.28125 0.359375,0 c 0.195313,0 0.347656,-0.039063 0.453125,-0.125 0.113281,-0.09375 0.171875,-0.222656 0.171875,-0.390625 0,-0.175781 -0.058594,-0.3125 -0.171875,-0.40625 -0.105469,-0.09375 -0.261719,-0.140625 -0.46875,-0.140625 -0.117188,0 -0.234375,0.015625 -0.359375,0.046875 -0.125,0.03125 -0.265625,0.074219 -0.421875,0.125 l 0,-0.359375 C
0.5625,-2.929688 0.707031,-2.957031 0.84375,-2.96875 0.976562,-2.988281 1.101562,-3 1.21875,-3 c 0.3125,0 0.554688,0.074219 0.734375,0.21875 0.1875,0.136719 0.28125,0.328125 0.28125,0.578125 0,0.179687 -0.054687,0.324219 -0.15625,0.4375 -0.09375,0.117187 -0.226563,0.199219 -0.390625,0.25 z m 0,0"
- id="path12" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-2"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 1.5625,-2.578125 -1.03125,1.9375 1.03125,0 0,-1.9375 z M 1.453125,-3 l 0.515625,0 0,2.359375 0.4375,0 0,0.28125 -0.4375,0 0,0.359375 -0.40625,0 0,-0.359375 -1.359375,0 0,-0.34375 L 1.453125,-3 z m 0,0"
- id="path15" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-3"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 0.453125,-3 1.59375,0 0,0.296875 -1.21875,0 0,1.109375 C 0.878906,-1.613281 0.9375,-1.625 1,-1.625 c 0.0625,-0.00781 0.117188,-0.015625 0.171875,-0.015625 0.34375,0 0.609375,0.074219 0.796875,0.21875 0.195312,0.148437 0.296875,0.34375 0.296875,0.59375 0,0.261719 -0.101563,0.464844 -0.296875,0.609375 C 1.769531,-0.0703125 1.484375,0 1.109375,0 0.984375,0 0.851562,-0.00390625 0.71875,-0.015625 0.59375,-0.0351562 0.457031,-0.0664062 0.3125,-0.109375 l 0,-0.34375 c 0.125,0.054687 0.25,0.09375 0.375,0.125 0.132812,0.023437 0.273438,0.03125 0.421875,0.03125 0.226563,0 0.410156,-0.046875 0.546875,-0.140625 0.132812,-0.09375 0.203125,-0.222656 0.203125,-0.390625 0,-0.164063 -0.070313,-0.296875 -0.203125,-0.390625 -0.136719,-0.09375 -0.320312,-0.140625 -0.546875,-0.140625 -0.117187,0 -0.230469,0.011719 -0.34375,0.03125 C 0.660156,-1.304688 0.554688,-1.28125 0.453125,-1.25 l 0,-1.75 z m 0,0"
- id="path18" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-4"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 1.359375,-1.375 c -0.179687,0 -0.324219,0.054688 -0.4375,0.15625 -0.105469,0.09375 -0.15625,0.226562 -0.15625,0.390625 0,0.167969 0.050781,0.304687 0.15625,0.40625 0.113281,0.09375 0.257813,0.140625 0.4375,0.140625 0.1875,0 0.332031,-0.046875 0.4375,-0.140625 0.113281,-0.101563 0.171875,-0.238281 0.171875,-0.40625 0,-0.164063 -0.058594,-0.296875 -0.171875,-0.390625 -0.105469,-0.101562 -0.25,-0.15625 -0.4375,-0.15625 z m 0.8125,-1.515625 0,0.40625 c -0.09375,-0.070313 -0.199219,-0.125 -0.3125,-0.15625 -0.105469,-0.039063 -0.203125,-0.0625 -0.296875,-0.0625 -0.273438,0 -0.480469,0.117187 -0.625,0.34375 -0.148438,0.21875 -0.226562,0.558594 -0.234375,1.015625 0.070313,-0.09375 0.164063,-0.160156 0.28125,-0.203125 0.125,-0.050781 0.257813,-0.078125 0.40625,-0.078125 0.300781,0 0.539063,0.074219 0.71875,0.21875 C 2.285156,-1.257812 2.375,-1.0625 2.375,-0.8125 2.375,-0.570312 2.28125,-0.375 2.09375,-0.21875 1.914062,-0.0703125 1.671875,0 1.359375,0 1.015625,0 0.75,-
0.125 0.5625,-0.375 0.382812,-0.632812 0.296875,-1.003906 0.296875,-1.484375 0.296875,-1.953125 0.40625,-2.320312 0.625,-2.59375 0.851562,-2.863281 1.160156,-3 1.546875,-3 c 0.09375,0 0.191406,0.011719 0.296875,0.03125 0.101562,0.011719 0.210938,0.039062 0.328125,0.078125 z m 0,0"
- id="path21" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-5"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 0.34375,-3 1.9375,0 0,0.15625 L 1.1875,0 0.765625,0 l 1.03125,-2.703125 -1.453125,0 0,-0.296875 z m 0,0"
- id="path24" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-6"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 1.3125,-1.359375 c -0.1875,0 -0.339844,0.046875 -0.453125,0.140625 C 0.742188,-1.125 0.6875,-0.988281 0.6875,-0.8125 c 0,0.167969 0.054688,0.296875 0.171875,0.390625 0.113281,0.09375 0.265625,0.140625 0.453125,0.140625 0.195312,0 0.347656,-0.046875 0.453125,-0.140625 C 1.878906,-0.515625 1.9375,-0.648438 1.9375,-0.828125 1.9375,-0.992188 1.878906,-1.125 1.765625,-1.21875 1.660156,-1.3125 1.507812,-1.359375 1.3125,-1.359375 z M 0.90625,-1.515625 C 0.726562,-1.566406 0.59375,-1.648438 0.5,-1.765625 0.40625,-1.878906 0.359375,-2.03125 0.359375,-2.21875 c 0,-0.238281 0.082031,-0.425781 0.25,-0.5625 C 0.785156,-2.925781 1.019531,-3 1.3125,-3 c 0.300781,0 0.535156,0.074219 0.703125,0.21875 0.175781,0.136719 0.265625,0.324219 0.265625,0.5625 0,0.1875 -0.054688,0.339844 -0.15625,0.453125 -0.09375,0.117187 -0.226562,0.199219 -0.390625,0.25 0.1875,0.042969 0.332031,0.125 0.4375,0.25 0.113281,0.117187 0.171875,0.261719 0.171875,0.4375 0,0.273437 -0.089844,0.480469 -0.26
5625,0.625 C 1.898438,-0.0664062 1.644531,0 1.3125,0 0.976562,0 0.722656,-0.0664062 0.546875,-0.203125 0.367188,-0.347656 0.28125,-0.554688 0.28125,-0.828125 c 0,-0.175781 0.050781,-0.320313 0.15625,-0.4375 0.113281,-0.125 0.269531,-0.207031 0.46875,-0.25 z M 0.765625,-2.1875 c 0,0.167969 0.046875,0.304688 0.140625,0.40625 C 1,-1.6875 1.132812,-1.640625 1.3125,-1.640625 1.488281,-1.640625 1.625,-1.6875 1.71875,-1.78125 1.820312,-1.882812 1.875,-2.019531 1.875,-2.1875 1.875,-2.351562 1.820312,-2.484375 1.71875,-2.578125 1.625,-2.671875 1.488281,-2.71875 1.3125,-2.71875 1.132812,-2.71875 1,-2.671875 0.90625,-2.578125 0.8125,-2.484375 0.765625,-2.351562 0.765625,-2.1875 z m 0,0"
- id="path27" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-7"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 0.453125,-0.109375 0,-0.40625 c 0.101563,0.074219 0.207031,0.132813 0.3125,0.171875 0.101563,0.03125 0.207031,0.046875 0.3125,0.046875 0.269531,0 0.472656,-0.109375 0.609375,-0.328125 0.144531,-0.226562 0.226562,-0.570312 0.25,-1.03125 C 1.851562,-1.5625 1.75,-1.488281 1.625,-1.4375 1.507812,-1.394531 1.378906,-1.375 1.234375,-1.375 c -0.304687,0 -0.542969,-0.070312 -0.71875,-0.21875 -0.167969,-0.144531 -0.25,-0.34375 -0.25,-0.59375 0,-0.238281 0.085937,-0.429688 0.265625,-0.578125 C 0.71875,-2.921875 0.960938,-3 1.265625,-3 c 0.351563,0 0.617187,0.132812 0.796875,0.390625 0.1875,0.25 0.28125,0.625 0.28125,1.125 C 2.34375,-1.035156 2.226562,-0.675781 2,-0.40625 1.78125,-0.132812 1.476562,0 1.09375,0 0.988281,0 0.882812,-0.0078125 0.78125,-0.03125 0.675781,-0.0507812 0.566406,-0.078125 0.453125,-0.109375 z M 1.265625,-1.625 c 0.1875,0 0.332031,-0.046875 0.4375,-0.140625 0.101563,-0.101563 0.15625,-0.238281 0.15625,-0.40625 0,-0.164063 -0.054687,-0.296875 -0.15
625,-0.390625 -0.105469,-0.101562 -0.25,-0.15625 -0.4375,-0.15625 -0.179687,0 -0.324219,0.054688 -0.4375,0.15625 -0.105469,0.09375 -0.15625,0.226562 -0.15625,0.390625 0,0.167969 0.050781,0.304687 0.15625,0.40625 0.113281,0.09375 0.257813,0.140625 0.4375,0.140625 z m 0,0"
- id="path30" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-8"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 0.515625,-0.296875 0.671875,0 0,-2.328125 -0.734375,0.140625 0,-0.375 L 1.171875,-3 l 0.40625,0 0,2.703125 0.671875,0 L 2.25,0 0.515625,0 l 0,-0.296875 z m 0,0"
- id="path33" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-9"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 1.3125,-2.71875 c -0.210938,0 -0.367188,0.105469 -0.46875,0.3125 -0.105469,0.199219 -0.15625,0.507812 -0.15625,0.921875 0,0.398437 0.050781,0.699219 0.15625,0.90625 0.101562,0.199219 0.257812,0.296875 0.46875,0.296875 0.21875,0 0.378906,-0.097656 0.484375,-0.296875 0.101563,-0.207031 0.15625,-0.507813 0.15625,-0.90625 0,-0.414063 -0.054687,-0.722656 -0.15625,-0.921875 C 1.691406,-2.613281 1.53125,-2.71875 1.3125,-2.71875 z M 1.3125,-3 c 0.34375,0 0.601562,0.132812 0.78125,0.390625 0.175781,0.25 0.265625,0.625 0.265625,1.125 0,0.480469 -0.089844,0.851563 -0.265625,1.109375 C 1.914062,-0.125 1.65625,0 1.3125,0 0.976562,0 0.71875,-0.125 0.53125,-0.375 0.351562,-0.632812 0.265625,-1.003906 0.265625,-1.484375 c 0,-0.5 0.085937,-0.875 0.265625,-1.125 C 0.71875,-2.867188 0.976562,-3 1.3125,-3 z m 0,0"
- id="path36" />
- </symbol>
- <symbol
- overflow="visible"
- id="glyph0-10"
- style="overflow:visible">
- <path
- style="stroke:none"
- d="m 0.796875,-0.296875 1.421875,0 0,0.296875 -1.921875,0 0,-0.296875 c 0.15625,-0.15625 0.367187,-0.367187 0.640625,-0.640625 0.269531,-0.28125 0.4375,-0.460938 0.5,-0.546875 0.132812,-0.144531 0.226562,-0.269531 0.28125,-0.375 0.050781,-0.101563 0.078125,-0.203125 0.078125,-0.296875 0,-0.15625 -0.058594,-0.285156 -0.171875,-0.390625 -0.117188,-0.101563 -0.261719,-0.15625 -0.4375,-0.15625 -0.125,0 -0.261719,0.023437 -0.40625,0.0625 C 0.632812,-2.597656 0.484375,-2.53125 0.328125,-2.4375 l 0,-0.390625 c 0.15625,-0.0625 0.304687,-0.101563 0.453125,-0.125 C 0.925781,-2.984375 1.054688,-3 1.171875,-3 c 0.3125,0 0.5625,0.078125 0.75,0.234375 0.1875,0.15625 0.28125,0.367187 0.28125,0.625 0,0.117187 -0.027344,0.230469 -0.078125,0.34375 C 2.082031,-1.691406 2,-1.5625 1.875,-1.40625 1.84375,-1.375 1.734375,-1.265625 1.546875,-1.078125 c -0.179687,0.1875 -0.429687,0.449219 -0.75,0.78125 z m 0,0"
- id="path39" />
- </symbol>
- </g>
- </defs>
<g
- id="surface0"
- transform="translate(-10,-10)">
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-278.33586,-412.88999)"
+ style="display:inline">
+ <path
+ transform="matrix(0.72851328,0,0,0.72851328,832.18517,373.77857)"
+ d="m -222.85715,332.36218 c 0,145.172 -117.68515,262.85715 -262.85714,262.85715 -145.172,0 -262.85715,-117.68515 -262.85715,-262.85715 0,-145.17199 117.68515,-262.857145 262.85715,-262.857145 145.17199,0 262.85714,117.685155 262.85714,262.857145 z"
+ sodipodi:ry="262.85715"
+ sodipodi:rx="262.85715"
+ sodipodi:cy="332.36218"
+ sodipodi:cx="-485.71429"
+ id="path3243"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3249);enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3951"
+ sodipodi:cx="-485.71429"
+ sodipodi:cy="332.36218"
+ sodipodi:rx="262.85715"
+ sodipodi:ry="262.85715"
+ d="m -222.85715,332.36218 c 0,145.172 -117.68515,262.85715 -262.85714,262.85715 -145.172,0 -262.85715,-117.68515 -262.85715,-262.85715 0,-145.17199 117.68515,-262.857145 262.85715,-262.857145 145.17199,0 262.85714,117.685155 262.85714,262.857145 z"
+ transform="matrix(0.72851328,0,0,0.72851328,832.18517,367.74085)" />
+ <path
+ transform="matrix(0.67659399,0,0,0.67659399,806.96728,384.25917)"
+ d="m -222.85715,332.36218 c 0,145.172 -117.68515,262.85715 -262.85714,262.85715 -145.172,0 -262.85715,-117.68515 -262.85715,-262.85715 0,-145.17199 117.68515,-262.857145 262.85715,-262.857145 145.17199,0 262.85714,117.685155 262.85714,262.857145 z"
+ sodipodi:ry="262.85715"
+ sodipodi:rx="262.85715"
+ sodipodi:cy="332.36218"
+ sodipodi:cx="-485.71429"
+ id="path3949"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3957);enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.65488176,0,0,0.65488176,796.42157,391.47936)"
+ d="m -222.85715,332.36218 c 0,145.172 -117.68515,262.85715 -262.85714,262.85715 -145.172,0 -262.85715,-117.68515 -262.85715,-262.85715 0,-145.17199 117.68515,-262.857145 262.85715,-262.857145 145.17199,0 262.85714,117.685155 262.85714,262.857145 z"
+ sodipodi:ry="262.85715"
+ sodipodi:rx="262.85715"
+ sodipodi:cy="332.36218"
+ sodipodi:cx="-485.71429"
+ id="path2451"
+ style="fill:none;stroke:url(#linearGradient2640);stroke-width:4.14111948;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3239);enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#radialGradient2642);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path2383"
+ sodipodi:cx="-485.71429"
+ sodipodi:cy="332.36218"
+ sodipodi:rx="262.85715"
+ sodipodi:ry="262.85715"
+ d="m -222.85715,332.36218 c 0,145.172 -117.68515,262.85715 -262.85714,262.85715 -145.172,0 -262.85715,-117.68515 -262.85715,-262.85715 0,-145.17199 117.68515,-262.857145 262.85715,-262.857145 145.17199,0 262.85714,117.685155 262.85714,262.857145 z"
+ transform="matrix(0.65488176,0,0,0.65488176,796.42157,391.47936)" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="m 75.5,50.5 c 0,13.808594 -11.191406,25 -25,25 -13.808594,0 -25,-11.191406 -25,-25 0,-13.808594 11.191406,-25 25,-25 13.808594,0 25,11.191406 25,25"
- id="path42" />
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ d="m 473.51157,450.30685 1.20845,21.31764 7.25063,0 1.20844,-21.31764 -9.66752,0 z m -9.76191,0.66087 -4.02186,0.43428 2.58682,15.80413 2.20918,-0.22658 -0.77414,-16.01183 z m 29.19137,0 -0.77417,16.01183 2.20919,0.22658 2.58681,-15.80413 -4.02183,-0.43428 z m -45.6375,2.39801 -3.9652,0.83079 4.22954,15.46426 2.17142,-0.47205 -2.43576,-15.823 z m 62.08361,0 -2.43576,15.84188 2.17142,0.45317 4.21065,-15.44537 -3.94631,-0.84968 z m -78.20874,4.09737 -3.83301,1.24619 5.79673,14.93556 2.13365,-0.69862 -4.09737,-15.48313 z m 94.31498,0 -4.07848,15.502 2.13365,0.67975 5.79673,-14.93556 -3.8519,-1.24619 z m -109.91139,5.75896 -3.68198,1.64273 7.32618,14.23693 2.03925,-0.90634 -5.68345,-14.97332 z m 125.50782,0 -5.66456,14.99221 2.03923,0.90634 7.32618,-14.25582 -3.70085,-1.64273 z m -137.96986,5.94778 -8.38356,4.83377 11.70676,17.86225 6.28767,-3.62532 -9.61087,-19.0707 z m 150.45077,0 -9.62975,19.0707 6.28767,3.62532 11.70676,-17.86225 -8.36468,-4.83377 z m -166.95354,10.29
064 -3.26655,2.36023 10.13955,12.40539 1.79379,-1.30286 -8.66679,-13.46276 z m 183.43742,0 -8.66677,13.48165 1.81265,1.30285 10.13957,-12.4054 -3.28545,-2.3791 z m -196.48478,10.29062 -3.00223,2.7001 11.36689,11.27248 1.66161,-1.47278 -10.02627,-12.4998 z m 209.55104,0.0189 -10.02628,12.48092 1.64273,1.49166 11.38576,-11.27247 -3.00221,-2.70011 z m -221.44663,11.59346 -2.71899,3.00222 12.4998,10.02628 1.49167,-1.6616 -11.27248,-11.3669 z m 233.34222,0 -11.27249,11.38578 1.49167,1.64272 12.48091,-10.02628 -2.70009,-3.00222 z m -243.97272,12.78304 -2.37912,3.26656 13.46279,8.66678 1.32173,-1.81266 -12.4054,-10.12068 z m 254.6032,0.0189 -12.40539,10.12068 1.30285,1.81265 13.48167,-8.66677 -2.37913,-3.26656 z m -262.43917,11.36688 -4.83376,8.38355 19.07069,9.61088 3.62532,-6.28767 -17.86225,-11.70676 z m 270.25627,0 -17.86225,11.70676 3.62531,6.28767 19.0707,-9.61088 -4.83376,-8.38355 z m -279.3951,17.14474 -1.64272,3.70085 14.97332,5.68344 0.90634,-2.03924 -14.23694,-7.34505 z
m 288.53393,0.0189 -14.23694,7.34506 0.90634,2.02035 14.97333,-5.66455 -1.64273,-3.70086 z m -294.68942,15.4265 -1.24621,3.8519 15.48315,4.07849 0.69862,-2.11478 -14.93556,-5.81561 z m 300.8449,0.0189 -14.91667,5.8156 0.67975,2.11478 15.48313,-4.07848 -1.24621,-3.8519 z m -305.35767,15.99294 -0.83081,3.94631 15.82302,2.43575 0.47205,-2.1714 -15.46426,-4.21066 z m 309.87046,0.0189 -15.46426,4.21064 0.47204,2.17142 15.82301,-2.43575 -0.83079,-3.94631 z m -312.68385,16.37057 -0.41541,4.00295 15.99294,0.77416 0.24547,-2.20918 -15.823,-2.56793 z m 315.49724,0.0189 -15.82302,2.56794 0.24547,2.20917 15.99295,-0.77415 -0.4154,-4.00296 z m -316.57352,13.7649 0,9.6675 21.31764,-1.20843 0,-7.25065 -21.31764,-1.20842 z m 317.64978,0 -21.31763,1.20842 0,7.25065 21.31763,1.20843 0,-9.6675 z m -300.99597,18.6364 -15.99294,0.77416 0.41541,4.02184 15.823,-2.56795 -0.24547,-2.22805 z m 284.34216,0.0189 -0.24547,2.22805 15.82302,2.56794 0.4154,-4.02184 -15.99295,-0.77415 z m -282.11409,14.7656
2 -15.82302,2.43576 0.83081,3.96519 15.46426,-4.21066 -0.47205,-2.19029 z m 279.88603,0.0189 -0.47204,2.19029 15.46426,4.21066 0.83079,-3.96519 -15.82301,-2.43576 z m -276.12853,14.46351 -15.48315,4.07848 1.24621,3.83303 14.91669,-5.79673 -0.67975,-2.11478 z m 272.37104,0.0189 -0.69862,2.11478 14.93554,5.79674 1.24621,-3.83303 -15.48313,-4.07849 z m -267.12189,13.9726 -14.97332,5.68343 1.64272,3.68198 14.23694,-7.32618 -0.90634,-2.03923 z m 261.87273,0.0189 -0.90634,2.03925 14.23694,7.32617 1.64273,-3.68197 -14.97333,-5.68345 z m -251.82757,8.53461 -19.07069,9.61088 4.83376,8.36467 17.86225,-11.70677 -3.62532,-6.26878 z m 241.7824,0 -3.62531,6.26878 17.86225,11.70677 4.83376,-8.36467 -19.0707,-9.61088 z m -237.09969,17.42798 -13.48166,8.66677 2.37912,3.26656 12.40538,-10.13956 -1.30284,-1.79377 z m 232.41699,0.0189 -1.32173,1.79378 12.40539,10.13956 2.37912,-3.26656 -13.46278,-8.66678 z m -223.10823,11.669 -12.48092,10.02628 2.70011,3.00222 11.27249,-11.36689 -1.49168,-1.661
61 z m 213.78058,0.0189 -1.49165,1.6616 11.27246,11.36689 2.71899,-3.00222 -12.4998,-10.02627 z m -203.28226,10.63049 -11.38576,11.29136 3.0022,2.70011 10.02629,-12.49981 -1.64273,-1.49166 z m 192.80283,0.0189 -1.6616,1.49167 10.02627,12.4998 3.00221,-2.71899 -11.36688,-11.27248 z m -181.266,9.49758 -10.13958,12.4054 3.28545,2.36022 8.66679,-13.46277 -1.81266,-1.30285 z m 169.71029,0 -1.79377,1.32174 8.66677,13.46277 3.26657,-2.37911 -10.13957,-12.4054 z m -156.73845,2.37912 -11.70676,17.84337 8.38356,4.83375 9.61087,-19.0518 -6.28767,-3.62532 z m 143.78549,0 -6.28767,3.62532 9.62975,19.0518 8.36468,-4.83375 -11.70676,-17.84337 z m -131.02134,12.74526 -7.32617,14.23693 3.70086,1.64274 5.66455,-14.97333 -2.03924,-0.90634 z m 118.2383,0 -2.03924,0.90634 5.68345,14.9922 3.68196,-1.64272 -7.32617,-14.25582 z m -104.32235,5.47575 -5.79675,14.91669 3.8519,1.24619 4.07849,-15.48314 -2.13364,-0.67974 z m 90.40641,0 -2.13365,0.67974 4.09737,15.50202 3.83302,-1.2462 -5.79674,-14.93556
z m -48.80964,2.00148 -1.20845,21.31764 9.66752,0 -1.20844,-21.31764 -7.25063,0 z m -27.17102,1.98259 -4.21067,15.44537 3.94633,0.84969 2.43575,-15.84189 -2.17141,-0.45317 z m 61.55491,0 -2.17142,0.45317 2.43578,15.84189 3.96518,-0.84969 -4.22954,-15.44537 z m -46.80817,2.45465 -2.58681,15.80413 4.02183,0.4154 0.77417,-15.99295 -2.20919,-0.22658 z m 32.06142,0 -2.20917,0.22658 0.77415,15.99295 4.02184,-0.4154 -2.58682,-15.80413 z"
+ id="path2385"
+ inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="m 73,50.5 2.5,0"
- id="path44" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g46">
- <use
- xlink:href="#glyph0-1"
- x="68.25"
- y="52.5"
- id="use48"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:57.03669739px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 359.15186,623.82258 c -5.05519,0 -8.69518,-0.60596 -10.91998,-1.81791 -2.22483,-1.21193 -3.21875,-3.13812 -2.98178,-5.77866 l 0,-0.58904 7.14836,0 0,0.58904 c -3e-5,1.46244 0.57264,2.57283 1.71796,3.33112 1.14531,0.7583 2.82377,1.13747 5.03544,1.13747 3.71238,0 6.04248,-0.64998 6.99036,-1.94994 0.84251,-1.16453 1.30328,-3.77796 1.38228,-7.84033 l 0,0 c -3.18583,1.36768 -6.55596,2.04474 -10.11036,2.03118 -4.47597,0 -7.66836,-0.65334 -9.5772,-1.96008 -1.90887,-1.30669 -2.8633,-3.4902 -2.86329,-6.55051 l 0,-1.09683 c -1e-5,-2.96547 1.20456,-5.18624 3.61367,-6.66222 2.40909,-1.47597 6.03592,-2.21394 10.88049,-2.21399 5.92401,5e-5 9.91945,0.81251 11.9863,2.4374 2.06682,1.62496 3.08705,4.77328 3.06077,9.44493 l 0,3.43269 c -0.0264,5.52478 -1.09269,9.24859 -3.19899,11.17143 -2.08002,1.92282 -6.13469,2.88424 -12.16403,2.88424 l 0,0 z m 8.13567,-20.57573 c -1e-5,-2.15301 -0.5266,-3.61884 -1.57972,-4.39747 -1.0532,-0.77859 -3.04103,-1.1679 -5.96354,-1.16793 -2.71192,3e-5 -
4.6471,0.42658 -5.80557,1.27963 -1.15849,0.85311 -1.73773,2.28171 -1.73772,4.28577 l 0,1.09683 c -1e-5,1.89576 0.5924,3.26343 1.77723,4.10295 1.18476,0.83957 3.10682,1.25933 5.76606,1.25933 2.4749,0 4.35086,-0.45699 5.62784,-1.37103 1.27693,-0.91401 1.91541,-2.24444 1.91542,-3.99125 l 0,-1.09683 z"
+ id="text3054" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 69.984375,61.75 72.152344,63"
- id="path50" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g52">
- <use
- xlink:href="#glyph0-2"
- x="65.738281"
- y="61.875"
- id="use54"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 603.88587,605.52039 c -3e-5,-1.42177 -0.53979,-2.43399 -1.61924,-3.03658 -1.07953,-0.60257 -2.89621,-0.90386 -5.45013,-0.90387 -2.31697,1e-5 -4.07445,0.36901 -5.27241,1.10698 -1.19799,0.73802 -1.75746,1.78406 -1.67845,3.13815 l 0,0.8531 -7.22735,0 0,-0.8531 c -0.28962,-2.35612 0.79646,-4.174 3.25823,-5.45368 2.46175,-1.27961 6.1149,-1.91944 10.95948,-1.91946 4.66023,2e-5 8.20146,0.54507 10.62378,1.6351 2.42224,1.09008 3.63337,2.68455 3.6334,4.7834 l 0,0.83278 c -3e-5,2.43743 -1.06636,4.15715 -3.19897,5.15916 -1.21116,0.58229 -2.9489,0.98852 -5.21315,1.21871 l 0,0 c 2.44856,0.23021 4.25211,0.62966 5.41062,1.19837 2.00096,0.96144 3.00147,2.83011 3.0015,5.60604 l 0,1.5843 c -3e-5,2.45096 -1.27041,4.28916 -3.81112,5.51462 -2.54079,1.22547 -6.36509,1.8382 -11.47289,1.8382 -4.66029,0 -8.2081,-0.66351 -10.64353,-1.99054 -2.43545,-1.32702 -3.57417,-3.216 -3.41621,-5.66696 l 0,-0.85308 7.14834,0 0,0.85308 c -0.0528,1.53015 0.48051,2.66423 1.5995,3.40221 1.11897,0.738 2.85
01,1.10699 5.19339,1.10699 2.81722,0 4.89721,-0.38931 6.24001,-1.16793 1.34276,-0.77861 2.01414,-1.97361 2.01417,-3.585 l 0,-1.5843 c -3e-5,-1.43535 -0.67141,-2.55588 -2.01417,-3.36161 -1.3428,-0.80568 -3.21216,-1.20852 -5.60811,-1.20853 l -2.13262,0 0,-3.29049 0.75034,0 c 3.10682,10e-6 5.37113,-0.32835 6.79292,-0.98511 1.42176,-0.65673 2.13264,-1.70279 2.13267,-3.13815 l 0,-0.8328 z"
+ id="text3058" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 61.75,69.984375 63,72.152344"
- id="path56" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g58">
- <use
- xlink:href="#glyph0-3"
- x="58.875"
- y="68.738281"
- id="use60"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:57.03669739px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 487.88593,476.02137 c -5.00253,3e-5 -8.65281,0.58812 -10.99609,1.77972 -2.34329,1.19165 -3.37235,2.97417 -3.0827,5.37092 l 0,0.85809 7.21418,0 0,-0.85809 c -0.079,-1.53014 0.39786,-2.57546 1.39836,-3.17805 1.0005,-0.60255 2.80702,-0.92162 5.46625,-0.92163 2.05367,10e-6 3.72575,0.34462 4.98957,1.04875 1.26377,0.70416 1.90682,1.66397 1.90683,2.82846 -10e-6,2.07182 -1.57585,4.46069 -4.73532,7.18244 -3.15951,2.72176 -8.78155,6.4797 -16.81192,11.31387 l 0,1.74795 0,1.74792 29.26992,0 0,-3.11451 -22.15106,0 c 7.97771,-4.88832 13.5035,-8.61395 16.55768,-11.18676 3.39642,-2.88425 5.08486,-5.47953 5.08488,-7.75446 -2e-5,-2.2478 -1.19526,-3.95211 -3.59118,-5.11667 -2.39598,-1.17805 -5.9118,-1.74792 -10.5194,-1.74795 z m -23.8672,0.28604 c -1.68509,0.86667 -3.24455,1.53766 -4.63998,2.06572 -1.36913,0.51461 -3.10568,1.0839 -5.21202,1.6526 l 0,3.43231 c 2.81719,-0.74473 5.14324,-1.48401 6.95994,-2.16109 l 1.43016,-0.54026 0,24.18503 3.62298,0 3.59119,0 0,-28.63431 -5.75227,0
z"
+ id="path3256" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="m 50.5,73 0,2.5"
- id="path62" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g64">
- <use
- xlink:href="#glyph0-4"
- x="49.5"
- y="71.25"
- id="use66"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:57.03669739px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 478.88242,712.22522 c 5.05515,6e-5 8.69516,0.60599 10.91999,1.81791 2.22477,1.21193 3.2187,3.13815 2.98176,5.77866 l 0,0.589 -7.14834,0 0,-0.589 c -3e-5,-1.46244 -0.57267,-2.57275 -1.71797,-3.33111 -1.14534,-0.75828 -2.82382,-1.13746 -5.03544,-1.13746 -3.37014,0 -5.56861,0.73121 -6.59544,2.19367 -0.89519,1.25931 -1.38228,3.73734 -1.46127,7.43409 l 0,0 c 3.18582,-1.24578 6.66126,-1.86867 10.42634,-1.86867 4.23895,0 7.2668,0.65339 9.08354,1.96005 1.81665,1.30672 2.72502,3.49026 2.72505,6.5505 l 0,1.09684 c -3e-5,2.96552 -1.23092,5.18624 -3.69264,6.66225 -2.46182,1.476 -6.15448,2.21393 -11.07798,2.21393 -5.10786,0 -8.84,-0.74472 -11.19642,-2.23422 -2.35649,-1.48958 -3.53469,-3.84573 -3.53469,-7.06848 l 0,-3.4327 c 0.0264,-6.87885 1.01367,-11.3745 2.96202,-13.48689 1.92201,-2.09888 6.04251,-3.14831 12.36149,-3.14837 l 0,0 z m -8.09619,20.57572 c -10e-6,2.15304 0.52656,3.61893 1.57974,4.39748 1.05315,0.77862 3.02783,1.16794 5.92404,1.16794 2.7119,0 4.64705,-0.42651 5.
80557,-1.2796 1.15847,-0.85311 1.73768,-2.28169 1.73772,-4.28582 l 0,-1.09683 c -4e-5,-1.89573 -0.59244,-3.26337 -1.77721,-4.10296 -1.18484,-0.83952 -3.10685,-1.25925 -5.76608,-1.25933 -2.44863,8e-5 -4.3114,0.45707 -5.58834,1.37105 -1.27698,0.91407 -1.91545,2.24443 -1.91544,3.99124 l 0,1.09683 z"
+ id="text3050" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 39.25,69.984375 38,72.152344"
- id="path68" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g70">
- <use
- xlink:href="#glyph0-5"
- x="40.125"
- y="68.738281"
- id="use72"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:57.03669739px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 411.19359,495.03249 c -1.68505,0.86666 -3.24454,1.56944 -4.63995,2.0975 -1.36914,0.51459 -3.1057,1.05213 -5.21203,1.62082 l 0,3.43232 c 2.81719,-0.74475 5.14323,-1.45224 6.95995,-2.12931 l 1.43013,-0.54027 0,24.18502 3.623,0 3.59119,0 0,-28.66608 -5.75229,0 z m 24.2486,0 c -1.68507,0.86666 -3.21279,1.56944 -4.60818,2.0975 -1.36913,0.51459 -3.10571,1.05213 -5.21204,1.62082 l 0,3.43232 c 2.8172,-0.74475 5.11143,-1.45224 6.92817,-2.12931 l 1.43013,-0.54027 0,24.18502 3.623,0 3.62298,0 0,-28.66608 -5.78406,0 z"
+ id="path3310" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 31.015625,61.75 28.847656,63"
- id="path74" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g76">
- <use
- xlink:href="#glyph0-6"
- x="33.261719"
- y="61.875"
- id="use78"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:57.03669739px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 396.26195,536.98824 c -5.00253,10e-6 -8.68233,0.62253 -11.09142,1.87505 -2.40915,1.25259 -3.623,3.18418 -3.62298,5.78406 l 0,13.50675 c -2e-5,2.62698 1.25976,4.64827 3.81367,6.07009 2.5539,1.42182 6.18783,2.1293 10.90073,2.12931 4.81819,0 8.51343,-0.70279 11.02788,-2.09752 2.51439,-1.39475 3.75007,-3.42074 3.7501,-6.10188 l 0,-13.50675 c -6e-5,-2.70819 -1.14715,-4.68098 -3.46407,-5.87942 -2.317,-1.19835 -6.10075,-1.77968 -11.31391,-1.77969 z m -23.51762,0.28602 c -1.68508,0.86666 -3.21277,1.56945 -4.60821,2.09751 -1.36911,0.51459 -3.10567,1.0521 -5.212,1.62081 l 0,3.4323 c 2.81719,-0.74472 5.14321,-1.45221 6.95995,-2.12929 l 1.39835,-0.57204 0,24.21681 3.65476,0 3.5912,0 0,-28.6661 -5.78405,0 z m 23.51762,2.86026 c 2.65921,2e-5 4.59925,0.34463 5.78407,1.04874 1.18476,0.70416 1.77969,1.86627 1.77972,3.46409 l 0,13.50675 c -4e-5,1.62495 -0.62989,2.87202 -1.90684,3.71833 -1.27698,0.84633 -3.18203,1.23944 -5.65695,1.23945 -2.55393,0 -4.43267,-0.3952 -5.65692,-1.20766
-1.22436,-0.81248 -1.84331,-2.05746 -1.84329,-3.75013 l 0,-13.50675 c -2e-5,-1.67907 0.57855,-2.8641 1.68436,-3.52762 1.1058,-0.6635 3.02496,-0.98519 5.81585,-0.9852 z"
+ id="path3318" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="m 28,50.5 -2.5,0"
- id="path80" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g82">
- <use
- xlink:href="#glyph0-7"
- x="30.75"
- y="52.5"
- id="use84"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 384.1764,668.33047 0,0 c 2.42223,0.27084 4.21261,0.72447 5.37112,1.36089 2.00096,1.09684 3.00146,3.21603 3.00152,6.35755 l 0,-0.60934 c -6e-5,2.59989 -1.29677,4.63444 -3.89012,6.10365 -2.59344,1.46922 -6.19396,2.20381 -10.80151,2.20383 -4.97621,-2e-5 -8.66228,-0.67706 -11.05821,-2.03118 -2.39597,-1.35411 -3.59393,-3.44621 -3.59393,-6.2763 l 0,0.60934 c 0,-2.93842 1.10582,-5.01021 3.31748,-6.21538 1.36908,-0.74474 3.34377,-1.25253 5.92402,-1.52337 l 0,0 c -2.10633,-0.29789 -3.7914,-0.75828 -5.05518,-1.3812 -2.21166,-1.11035 -3.31746,-2.87069 -3.31746,-5.28102 l 0,0.56871 c 0,-2.50508 1.20456,-4.43807 3.61367,-5.79897 2.40909,-1.36085 5.83846,-2.04131 10.28808,-2.04134 4.84453,3e-5 8.37919,0.62631 10.60404,1.87884 2.22478,1.25258 3.33718,3.23975 3.33721,5.96147 l 0,-0.56871 c -3e-5,2.41033 -1.0137,4.17744 -3.04101,5.30134 -1.18483,0.65 -2.75142,1.11039 -4.69972,1.38119 l 0,0 z m -6.20052,-1.60461 c 2.29062,10e-6 3.98224,-0.40623 5.07493,-1.21871 1.09263,-0.81244 1.
63896,-2.065 1.63898,-3.75765 l 0,0.56871 c -2e-5,-1.70616 -0.52661,-2.935 -1.57973,-3.68656 -1.05318,-0.7515 -2.76459,-1.12727 -5.13418,-1.1273 -2.21166,3e-5 -3.87698,0.40287 -4.99595,1.20854 -1.11898,0.80572 -1.67848,2.00749 -1.67845,3.60532 l 0,-0.56871 c -3e-5,1.69265 0.55287,2.94521 1.65873,3.75765 1.07944,0.81248 2.75136,1.21872 5.01567,1.21871 l 0,0 z m -0.1185,3.20923 c -2.68559,2e-5 -4.59446,0.42318 -5.72658,1.2695 -1.13216,0.84633 -1.69824,2.25798 -1.69824,4.23498 l 0,-0.60936 c 0,2.19366 0.52,3.68995 1.56001,4.48888 1.03998,0.79893 2.99492,1.1984 5.86481,1.19838 2.68554,2e-5 4.60098,-0.43669 5.7463,-1.31008 1.14531,-0.87341 1.71797,-2.33246 1.718,-4.37718 l 0,0.60936 c -3e-5,-2.12595 -0.52661,-3.57485 -1.57977,-4.3467 -1.02686,-0.77184 -2.98836,-1.15776 -5.88453,-1.15778 l 0,0 z"
+ id="text3283" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 31.015625,39.25 28.847656,38"
- id="path86" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g88">
- <use
- xlink:href="#glyph0-8"
- x="31.261719"
- y="43.125"
- id="use90"
- width="200"
- height="200" />
- <use
- xlink:href="#glyph0-9"
- x="34.261719"
- y="43.125"
- id="use92"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 407.63351,724.09878 18.64096,-25.53178 0,0 -21.40554,0 0,-3.128 27.843,0 0,1.56399 0,1.56401 -16.50831,25.53178 -8.57011,0 z"
+ id="text3287" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 39.25,31.015625 38,28.847656"
- id="path94" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g96">
- <use
- xlink:href="#glyph0-8"
- x="38.125"
- y="36.261719"
- id="use98"
- width="200"
- height="200" />
- <use
- xlink:href="#glyph0-8"
- x="41.125"
- y="36.261719"
- id="use100"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 552.98793,715.8221 c -3e-5,3.23634 -1.05979,5.51463 -3.17925,6.83488 -2.11951,1.32026 -5.77269,1.98038 -10.95948,1.98038 -5.13418,0 -8.70835,-0.48071 -10.72251,-1.44213 -2.01418,-0.96141 -3.13974,-2.71499 -3.37669,-5.26071 l 0,-0.8531 7.14834,0 0,0.8531 c 0.15799,1.20516 0.73062,2.0887 1.71795,2.65066 0.98733,0.56196 2.48152,0.84294 4.48252,0.84294 3.05418,0 5.10783,-0.41638 6.16101,-1.24917 1.05317,-0.83277 1.57974,-2.45431 1.57977,-4.86463 l 0,-1.90932 c -3e-5,-1.80095 -0.48054,-3.05688 -1.44154,-3.76782 -0.96102,-0.71088 -2.66583,-1.06634 -5.11442,-1.06635 -2.3433,10e-6 -4.0876,0.32161 -5.23291,0.96481 -1.1453,0.64322 -1.69163,1.60802 -1.63898,2.8944 l -7.38529,0 0.5134,-16.87899 0,0 26.0658,0 0,3.22955 -19.47036,0 0,0 -0.27646,9.11994 0,0 c 1.23747,-0.63641 2.26429,-1.11036 3.08052,-1.42181 1.84302,-0.69058 4.09414,-1.03588 6.75339,-1.0359 4.21264,2e-5 7.14834,0.61952 8.80707,1.85852 1.65871,1.23903 2.48809,3.44284 2.48812,6.61146 l 0,1.90929 z"
+ id="text3291" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="m 50.5,28 0,-2.5"
- id="path102" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g104">
- <use
- xlink:href="#glyph0-8"
- x="47.5"
- y="33.75"
- id="use106"
- width="200"
- height="200" />
- <use
- xlink:href="#glyph0-10"
- x="50.5"
- y="33.75"
- id="use108"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 581.96336,675.92269 -20.10226,0 0,-1.48277 0,-1.48273 17.29819,-18.66645 5.01572,0 5.01567,0 0,18.50395 0,0 6.39799,0 0,3.128 -6.39799,0 0,0 0,7.02784 -7.22732,0 0,-7.02784 0,0 z m 0,-3.128 0,0 0,-14.9494 0,0 0,0 -13.7043,14.9494 0,0 13.7043,0 z"
+ id="text3295" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 61.75,31.015625 63,28.847656"
- id="path110" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g112">
- <use
- xlink:href="#glyph0-8"
- x="58.875"
- y="36.261719"
- id="use114"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 593.89568,543.11766 c -2e-5,2.27493 -1.69827,4.85449 -5.09467,7.73874 -3.0542,2.57283 -8.57013,6.3034 -16.54782,11.19174 l 0,0 22.15591,0 0,3.12799 -29.26479,0 0,-1.74679 0,-1.74681 c 8.03037,-4.83417 13.62531,-8.61213 16.78481,-11.33391 3.15947,-2.72175 4.73922,-5.11853 4.73922,-7.19034 0,-1.16451 -0.63191,-2.09885 -1.89568,-2.80301 -1.26381,-0.70411 -2.92254,-1.05618 -4.97621,-1.05621 -2.65923,3e-5 -4.48909,0.30131 -5.48959,0.90387 -1.00052,0.6026 -1.46129,1.66896 -1.3823,3.19908 l 0,0.8531 -7.22731,0 0,-0.8531 c -0.28962,-2.39676 0.7372,-4.19094 3.0805,-5.3826 2.34329,-1.19157 6.01617,-1.78738 11.0187,-1.78741 4.60758,3e-5 8.10935,0.58906 10.50531,1.76712 2.39592,1.16455 3.5939,2.87074 3.59393,5.11854 l 0,0 z"
+ id="text3299" />
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
- d="M 69.984375,39.25 72.152344,38"
- id="path116" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="g118">
- <use
- xlink:href="#glyph0-10"
- x="65.738281"
- y="43.125"
- id="use120"
- width="200"
- height="200" />
- </g>
+ inkscape:connector-curvature="0"
+ style="font-size:29.2809906px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Univers Condensed;-inkscape-font-specification:'Univers Condensed,'"
+ d="m 539.67821,520.73002 0,-24.19122 0,0 -1.42178,0.54842 c -1.81671,0.67708 -4.13368,1.38798 -6.95086,2.13271 l 0,-3.43266 c 2.10631,-0.56871 3.84402,-1.11034 5.21314,-1.62493 1.39541,-0.52808 2.93567,-1.22546 4.62075,-2.09211 l 5.76606,0 0,0 0,28.65979 0,0 -3.59391,0 -3.6334,0 0,0 z"
+ id="text3303" />
</g>
</svg>
diff --git a/src/Core/Main/CairoContextEx.cs b/src/Core/Main/CairoContextEx.cs
index 5c53440..1327023 100644
--- a/src/Core/Main/CairoContextEx.cs
+++ b/src/Core/Main/CairoContextEx.cs
@@ -21,6 +21,7 @@ using System;
using Cairo;
using gbrainy.Core.Libraries;
+using gbrainy.Core.Services;
namespace gbrainy.Core.Main
{
@@ -140,24 +141,16 @@ namespace gbrainy.Core.Main
const double radian = Math.PI / 180;
double radius = size / 2;
double x0, y0;
- int num, degrees;
+ int degrees;
+ string dir;
+ IConfiguration config;
- Arc (x, y, radius, 0, 2 * Math.PI);
- Stroke ();
- for (degrees = 0; degrees < 360; degrees+= 30) {
- x0 = radius * Math.Cos (degrees * radian);
- y0 = radius * Math.Sin (degrees * radian);
- // Small lines
- MoveTo (x + 0.9 * x0, y + 0.9 * y0);
- LineTo (x + x0, y + y0);
- Stroke ();
- // Numbers
- num = (degrees / 30) + 3;
- if (num > 12) num = num - 12;
+ config = ServiceLocator.Instance.GetService <IConfiguration> ();
+ dir = config.Get <string> (ConfigurationKeys.GamesGraphics);
+ DrawImageFromFile (System.IO.Path.Combine (dir, "clock.svg"), x, y, size, size);
- DrawTextCentered (x + x0 * 0.75, y + y0 * 0.75, num.ToString ());
- Stroke ();
- }
+ x += size / 2;
+ y += size / 2;
if (hand_large >=1 && hand_large <= 12 ) {
// Hand Large
@@ -165,7 +158,7 @@ namespace gbrainy.Core.Main
x0 = radius * Math.Cos (degrees * radian);
y0 = radius * Math.Sin (degrees * radian);
MoveTo (x, y);
- LineTo (x + x0 * 0.55, y + y0 * 0.55);
+ LineTo (x + x0 * 0.45, y + y0 * 0.45);
Stroke ();
}
@@ -175,7 +168,7 @@ namespace gbrainy.Core.Main
x0 = radius * Math.Cos (degrees * radian);
y0 = radius * Math.Sin (degrees * radian);
MoveTo (x, y);
- LineTo (x + x0 * 0.4, y + y0 * 0.4);
+ LineTo (x + x0 * 0.30, y + y0 * 0.30);
Stroke ();
}
}
diff --git a/src/Games/Logic/PuzzleClocks.cs b/src/Games/Logic/PuzzleClocks.cs
index 7f89430..81e8dbf 100644
--- a/src/Games/Logic/PuzzleClocks.cs
+++ b/src/Games/Logic/PuzzleClocks.cs
@@ -100,7 +100,7 @@ namespace gbrainy.Games.Logic
drawable_area.DrawEventHandler += delegate (object sender, DrawEventArgs e)
{
- DrawClock (e.Context, 0.2, 0.16, handles[0], handles[1], true);
+ e.Context.DrawClock (0.05, 0, figure_size, handles[0], handles[1]);
e.Context.DrawTextCentered (drawable_area.Width / 2, 0.36, Answer.GetFigureName (0));
e.Context.Stroke ();
};
@@ -111,7 +111,7 @@ namespace gbrainy.Games.Logic
drawable_area.DrawEventHandler += delegate (object sender, DrawEventArgs e)
{
- DrawClock (e.Context, 0.2, 0.16, handles[2], handles[3], true);
+ e.Context.DrawClock (0.05, 0, figure_size, handles[2], handles[3]);
e.Context.MoveTo (0.03, 0.29);
e.Context.DrawTextCentered (drawable_area.Width / 2, 0.36, Answer.GetFigureName (1));
e.Context.Stroke ();
@@ -127,7 +127,7 @@ namespace gbrainy.Games.Logic
drawable_area.DrawEventHandler += delegate (object sender, DrawEventArgs e)
{
- DrawClock (e.Context, 0.2, 0.16, handles[4], handles[5], true);
+ e.Context.DrawClock (0.05, 0, figure_size, handles[4], handles[5]);
e.Context.DrawTextCentered (drawable_area.Width / 2, 0.36, Answer.GetFigureName (2));
e.Context.Stroke ();
};
@@ -138,7 +138,7 @@ namespace gbrainy.Games.Logic
drawable_area.DrawEventHandler += delegate (object sender, DrawEventArgs e)
{
- DrawClock (e.Context, 0.2, 0.16, handles[6], handles[7], Answer.Draw == true);
+ e.Context.DrawClock (0.05, 0, figure_size, handles[6], Answer.Draw == true ? handles[7] : 0);
e.Context.MoveTo (0.03, 0.29);
e.Context.DrawTextCentered (drawable_area.Width / 2, 0.36, Answer.GetFigureName (3));
e.Context.Stroke ();
@@ -161,48 +161,6 @@ namespace gbrainy.Games.Logic
Console.WriteLine ("t1 {0}", dt1);
Console.WriteLine ("t2 {0}", dt2);
Console.WriteLine ("Time diff {0} from 1st to 2nd", dt2-dt1);*/
-
- }
-
- static void DrawClock (CairoContextEx gr, double x, double y, int hand_short, int hand_large, bool draw_large)
- {
- const double radius = figure_size / 2;
- double x0, y0;
- int num, degrees;
-
- gr.Arc (x, y, radius, 0, 2 * Math.PI);
- gr.Stroke ();
- for (degrees = 0; degrees < 360; degrees+= 30) {
- x0 = radius * Math.Cos (degrees * radian);
- y0 = radius * Math.Sin (degrees * radian);
- // Small lines
- gr.MoveTo (x + 0.9 * x0, y + 0.9 * y0);
- gr.LineTo (x + x0, y + y0);
- gr.Stroke ();
- // Numbers
- num = (degrees / 30) + 3;
- if (num > 12) num = num - 12;
-
- gr.DrawTextCentered (x + x0 * 0.75, y + y0 * 0.75, num.ToString ());
- gr.Stroke ();
- }
-
- if (draw_large) {
- // Hand Large
- degrees = (hand_large - 3) * 30;
- x0 = radius * Math.Cos (degrees * radian);
- y0 = radius * Math.Sin (degrees * radian);
- gr.MoveTo (x, y);
- gr.LineTo (x + x0 * 0.55, y + y0 * 0.55);
- gr.Stroke ();
- }
- // Hand Short
- degrees = (hand_short - 3) * 30;
- x0 = radius * Math.Cos (degrees * radian);
- y0 = radius * Math.Sin (degrees * radian);
- gr.MoveTo (x, y);
- gr.LineTo (x + x0 * 0.4, y + y0 * 0.4);
- gr.Stroke ();
}
}
}
diff --git a/src/Games/Logic/PuzzleTimeNow.cs b/src/Games/Logic/PuzzleTimeNow.cs
index 8a2c010..f275bc0 100644
--- a/src/Games/Logic/PuzzleTimeNow.cs
+++ b/src/Games/Logic/PuzzleTimeNow.cs
@@ -25,7 +25,7 @@ namespace gbrainy.Games.Logic
{
public class PuzzleTimeNow : Game
{
- const double figure_size = 0.3;
+ const double figure_size = 0.5;
int after;
DateTime position_a, position_b, ans, sample;
@@ -90,10 +90,10 @@ namespace gbrainy.Games.Logic
public override void Draw (CairoContextEx gr, int area_width, int area_height, bool rtl)
{
base.Draw (gr, area_width, area_height, rtl);
- gr.DrawClock (DrawAreaX + 0.4, DrawAreaY + 0.4, figure_size,
- 0, 0 /* No hands */);
- gr.DrawTextCentered (0.5, DrawAreaY + 0.3 + figure_size, Translations.GetString ("Sample clock"));
+ gr.DrawClock (DrawAreaX + 0.15, DrawAreaY + 0.1, figure_size,0, 0 /* No hands */);
+ gr.SetPangoLargeFontSize ();
+ gr.DrawTextCentered (0.5, DrawAreaY + 0.2 + figure_size, Translations.GetString ("Sample clock"));
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
