[chronojump] Better encoder exercise images



commit 2ef64ce40e38fc4972439efcd84317e763950652
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Jun 8 18:43:34 2017 -0300

    Better encoder exercise images

 glade/app1.glade                       |   12 +-
 images/extra-mass.png                  |  Bin 1781 -> 923 bytes
 images/laterality-both.png             |  Bin 0 -> 679 bytes
 images/laterality-left.png             |  Bin 0 -> 518 bytes
 images/laterality-right.png            |  Bin 0 -> 634 bytes
 images/muscle-concentric.png           |  Bin 2127 -> 700 bytes
 images/muscle-excentric-concentric.png |  Bin 2174 -> 686 bytes
 images/svg/contraction-laterality.svg  |  709 ++++++++++++++++++++++++++++++++
 images/svg/extra-mass.svg              |  450 ++------------------
 src/Makefile.am                        |    3 +
 src/gui/chronojumpIcons.cs             |    4 +
 src/gui/encoder.cs                     |   31 +-
 12 files changed, 790 insertions(+), 419 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 381245e..c6bb907 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1266,6 +1266,9 @@
                                                             <placeholder/>
                                                             </child>
                                                             <child>
+                                                            <placeholder/>
+                                                            </child>
+                                                            <child>
                                                             <widget class="GtkLabel" 
id="label_start_selector_jumps">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
@@ -14716,6 +14719,7 @@ Concentric</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
+                                                            <property name="pack_type">end</property>
                                                             <property name="position">1</property>
                                                             </packing>
                                                             </child>
@@ -14750,10 +14754,10 @@ Concentric</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkLabel" 
id="label_encoder_top_laterality">
+                                                            <widget class="GtkImage" id="image_laterality">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label">RL</property>
+                                                            <property 
name="stock">gtk-missing-image</property>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -14765,7 +14769,6 @@ Concentric</property>
                                                             <widget class="GtkHBox" id="hbox73">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="spacing">4</property>
                                                             <child>
                                                             <widget class="GtkImage" id="image_extra_mass">
                                                             <property name="visible">True</property>
@@ -20327,6 +20330,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/images/extra-mass.png b/images/extra-mass.png
index b06964f..e8e3be2 100644
Binary files a/images/extra-mass.png and b/images/extra-mass.png differ
diff --git a/images/laterality-both.png b/images/laterality-both.png
new file mode 100644
index 0000000..0e958b8
Binary files /dev/null and b/images/laterality-both.png differ
diff --git a/images/laterality-left.png b/images/laterality-left.png
new file mode 100644
index 0000000..c3005cb
Binary files /dev/null and b/images/laterality-left.png differ
diff --git a/images/laterality-right.png b/images/laterality-right.png
new file mode 100644
index 0000000..a102c1e
Binary files /dev/null and b/images/laterality-right.png differ
diff --git a/images/muscle-concentric.png b/images/muscle-concentric.png
index fcab239..c0c4d2a 100644
Binary files a/images/muscle-concentric.png and b/images/muscle-concentric.png differ
diff --git a/images/muscle-excentric-concentric.png b/images/muscle-excentric-concentric.png
index c6d95dc..474f690 100644
Binary files a/images/muscle-excentric-concentric.png and b/images/muscle-excentric-concentric.png differ
diff --git a/images/svg/contraction-laterality.svg b/images/svg/contraction-laterality.svg
new file mode 100644
index 0000000..5c8e149
--- /dev/null
+++ b/images/svg/contraction-laterality.svg
@@ -0,0 +1,709 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   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";
+   version="1.1"
+   id="svg4409"
+   viewBox="0 0 2788.7755 2287.0203"
+   height="2287.0203"
+   width="2788.7754"
+   sodipodi:docname="contraction-laterality.svg"
+   inkscape:version="0.92.1 r15371"
+   
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/muscle-excentric-concentric.png"
+   inkscape:export-xdpi="0.41393492"
+   inkscape:export-ydpi="0.41393492">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="702"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="0.078535119"
+     inkscape:cx="2801.4568"
+     inkscape:cy="1868.8851"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4409"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <defs
+     id="defs4411">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path8843"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         
style="fill:#fff200;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker9316"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path8985"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         
style="fill:#fff200;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="scale(0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient5962-14-8-5-8-67">
+      <stop
+         style="stop-color:#fff842;stop-opacity:1;"
+         offset="0"
+         id="stop5964-61-5-0-58-5" />
+      <stop
+         style="stop-color:#f3ff80;stop-opacity:0;"
+         offset="1"
+         id="stop5966-8-0-3-6-3" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInL"
+       style="overflow:visible">
+      <path
+         id="path12556"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="scale(-0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path12565"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="scale(0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker7704"
+       style="overflow:visible">
+      <path
+         id="path7702"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="scale(-0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker7708"
+       style="overflow:visible">
+      <path
+         id="path7706"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="scale(0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient30038-0-4-1-3-7-1-8-67-4-5-5-1-9-4-7-9"
+       y2="737.02002"
+       gradientUnits="userSpaceOnUse"
+       x2="470"
+       gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+       y1="737.02002"
+       x1="175.72">
+      <stop
+         id="stop12003-8-7-3-2-58-7-4-0-2-2-1-8-1-3-0-3"
+         stop-color="#1b4a78"
+         offset="0"
+         style="stop-color:#dddddd;stop-opacity:1;" />
+      <stop
+         id="stop12005-3-5-4-7-2-6-9-8-41-0-0-9-6-3-9-6"
+         stop-color="#5dacd1"
+         offset="1"
+         style="stop-color:#244457;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30038-0-4-1-3-8-11-1-7-0-1-2-4-3-1-3-6"
+       y2="737.02002"
+       gradientUnits="userSpaceOnUse"
+       x2="470"
+       gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+       y1="737.02002"
+       x1="175.72">
+      <stop
+         id="stop12003-8-7-3-2-5-9-3-8-17-3-7-5-2-4-3-2"
+         stop-color="#1b4a78"
+         offset="0"
+         style="stop-color:#19262e;stop-opacity:1;" />
+      <stop
+         id="stop12005-3-5-4-7-7-4-6-6-4-1-7-1-1-3-6-6"
+         stop-color="#5dacd1"
+         offset="1"
+         style="stop-color:#244457;stop-opacity:1;" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInL-3"
+       style="overflow:visible">
+      <path
+         id="path12556-6"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="scale(-0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL-7"
+       style="overflow:visible">
+      <path
+         id="path12565-5"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="scale(0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata4414">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <image
+     y="-657.40338"
+     x="-3579.4707"
+     id="image6247"
+     
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAAaklEQVR4Ae3NQQqAIBSE4bmNSJcX
 xXOFoW6tRUUulfcW0vyznw9LxTZEVBQEWJ37A+1e0iAi2mdeHqgdkOWBog2EDnDygEV673cYQIPw 
yNccDH5bk9k0QGAcnokAAQIECDwRIDAUAQJsgU4o2sid5ZUWVgAAAABJRU5ErkJggg== "
+     preserveAspectRatio="none"
+     height="942.23315"
+     width="942.23315"
+     style="stroke-width:0.0509428" />
+  <path
+     
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m -4011.6332,-140.27759 h 238.0426 v -165.5946 h 232.8674 v -82.7973 h -716.714 v 77.6225 h 245.804 
z"
+     id="path6250"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccc" />
+  <circle
+     
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path6252"
+     cx="-3899.0801"
+     cy="-502.75369"
+     r="72.447632" />
+  <g
+     id="g5604"
+     
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/muscle-concentric.png"
+     inkscape:export-xdpi="3.4689491"
+     inkscape:export-ydpi="3.4689491">
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path6250-2"
+       d="M 12.466255,663.68367 H 364.08436 V 414.79951 H 637.15608 V 290.35743 l -624.689225,-3.9e-4 v 
116.66449 4e-4 z"
+       
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <ellipse
+       ry="108.88681"
+       rx="108.76627"
+       cy="118.89236"
+       cx="189.94984"
+       id="path6252-3"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <rect
+       y="95.914787"
+       x="557.42932"
+       height="303.54044"
+       width="70.226784"
+       id="rect6272"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <g
+       style="stroke-width:1.60345781"
+       transform="matrix(-0.44074452,-0.44123297,0.44074452,-0.44123297,2895.5325,1690.1157)"
+       id="g4809">
+      <rect
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:32.06916046;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect9593-06-5"
+         width="253.12444"
+         height="45.541386"
+         x="3811.3381"
+         y="-846.11713" />
+      <path
+         sodipodi:type="star"
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:41.09461975;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path9576-5-32-6"
+         sodipodi:sides="3"
+         sodipodi:cx="-532.12085"
+         sodipodi:cy="-1470.6187"
+         sodipodi:r1="166.9901"
+         sodipodi:r2="81.63327"
+         sodipodi:arg1="1.0471976"
+         sodipodi:arg2="2.0943951"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -448.62581,-1326.001 -124.31167,-73.9212 -126.17347,-70.6965 126.17347,-70.6964 
124.31169,-73.9212 -1.86179,144.6176 z"
+         inkscape:transform-center-x="-32.389062"
+         transform="matrix(-0.78076725,0,0,-0.77997996,3699.0065,-1970.3995)"
+         inkscape:transform-center-y="-6.4912368e-06" />
+    </g>
+    <ellipse
+       ry="49.487057"
+       rx="87.355141"
+       cy="305.33344"
+       cx="453.4552"
+       id="path4811"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+  </g>
+  <g
+     id="g5242"
+     transform="translate(-7898.8487,2492.0325)"
+     
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/laterality-right.png"
+     inkscape:export-xdpi="2.8743165"
+     inkscape:export-ydpi="2.8743165">
+    <g
+       transform="translate(1066.4671,-932.49115)"
+       id="g5047">
+      <path
+         
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 8232.5261,126.9287 h 359.2901 v 83.8343 h -236.2603 v 511.71596 h -81.6568 V 477.5085 h 
-41.373"
+         id="path4952-22"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+      <g
+         id="g4976-8"
+         transform="translate(3620.518,1617.501)"
+         style="fill:none">
+        <path
+           sodipodi:nodetypes="cccccccc"
+           inkscape:connector-curvature="0"
+           id="path4952-2-9"
+           d="M 4616.0081,-1490.5723 H 4256.718 v 83.8343 h 236.2603 v 511.71596 h 81.6568 v -244.97046 h 
41.373"
+           
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+      </g>
+      <circle
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path6252-37-7"
+         cx="8234.5264"
+         cy="8.3446789"
+         r="72.447632" />
+    </g>
+    <text
+       id="text5078"
+       y="-318.6315"
+       x="9434.8838"
+       
style="font-style:normal;font-weight:normal;font-size:388.52755737px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:400px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#0e1e46;fill-opacity:1;stroke-width:0.99999994px"
+         y="-318.6315"
+         x="9434.8838"
+         id="tspan5076"
+         sodipodi:role="line">R</tspan></text>
+  </g>
+  <g
+     id="g5233"
+     transform="translate(-7898.8487,2492.0325)"
+     
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/laterality-both.png"
+     inkscape:export-xdpi="2.8743165"
+     inkscape:export-ydpi="2.8743165">
+    <g
+       transform="translate(2873.4373,596.67555)"
+       id="g5003">
+      <g
+         id="g4981"
+         transform="translate(773.69337,88.3343)">
+        <path
+           sodipodi:nodetypes="cccccccc"
+           inkscape:connector-curvature="0"
+           id="path4952"
+           d="m 4612.0081,-1490.5723 h 359.2901 v 83.8343 h -236.2603 v 511.71596 h -81.6568 v -244.97046 h 
-41.373"
+           
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+        <g
+           id="g4976">
+          <path
+             
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 4616.0081,-1490.5723 H 4256.718 v 83.8343 h 236.2603 v 511.71596 h 81.6568 v -244.97046 h 
41.373"
+             id="path4952-2"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccccccc" />
+        </g>
+      </g>
+      <circle
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path6252-37"
+         cx="5387.7017"
+         cy="-1520.822"
+         r="72.447632" />
+    </g>
+    <g
+       transform="translate(6.28125e-5,-8.6086796)"
+       id="g5162">
+      <text
+         xml:space="preserve"
+         
style="font-style:normal;font-weight:normal;font-size:388.52755737px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="8394.542"
+         y="-310.02283"
+         id="text5078-4"><tspan
+           sodipodi:role="line"
+           id="tspan5076-0"
+           x="8394.542"
+           y="-310.02283"
+           
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:400px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#0e1e46;fill-opacity:1;stroke-width:0.99999994px">R</tspan></text>
+      <text
+         xml:space="preserve"
+         
style="font-style:normal;font-weight:normal;font-size:388.52755737px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="7864.4487"
+         y="-311.42285"
+         id="text5078-0-3"><tspan
+           sodipodi:role="line"
+           id="tspan5076-3-9"
+           x="7864.4487"
+           y="-311.42285"
+           
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:400px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#0e1e46;fill-opacity:1;stroke-width:0.99999994px">L</tspan></text>
+    </g>
+  </g>
+  <g
+     id="g5251"
+     transform="translate(-7898.8487,2492.0325)"
+     
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/laterality-left.png"
+     inkscape:export-xdpi="2.8743165"
+     inkscape:export-ydpi="2.8743165">
+    <g
+       id="g5047-3"
+       transform="matrix(-1,0,0,1,18559.86,-932.49115)">
+      <path
+         
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 8232.5261,126.9287 h 359.2901 v 83.8343 h -236.2603 v 511.71596 h -81.6568 V 477.5085 h 
-41.373"
+         id="path4952-22-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+      <g
+         id="g4976-8-1"
+         transform="translate(3620.518,1617.501)"
+         style="fill:none">
+        <path
+           sodipodi:nodetypes="cccccccc"
+           inkscape:connector-curvature="0"
+           id="path4952-2-9-2"
+           d="M 4616.0081,-1490.5723 H 4256.718 v 83.8343 h 236.2603 v 511.71596 h 81.6568 v -244.97046 h 
41.373"
+           
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+      </g>
+      <circle
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path6252-37-7-9"
+         cx="8234.5264"
+         cy="8.3446789"
+         r="72.447632" />
+    </g>
+    <text
+       id="text5078-0-6"
+       y="-320.03149"
+       x="9928.6436"
+       
style="font-style:normal;font-weight:normal;font-size:388.52755737px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:400px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#0e1e46;fill-opacity:1;stroke-width:0.99999994px"
+         y="-320.03149"
+         x="9928.6436"
+         id="tspan5076-3-93"
+         sodipodi:role="line">L</tspan></text>
+  </g>
+  <text
+     xml:space="preserve"
+     
style="font-style:normal;font-weight:normal;font-size:161.53770447px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="-992.46576"
+     y="-875.1073"
+     id="text9997-3"><tspan
+       sodipodi:role="line"
+       id="tspan9995-8"
+       x="-992.46576"
+       y="-875.1073"
+       style="stroke-width:1px">concentric</tspan><tspan
+       sodipodi:role="line"
+       x="-992.46576"
+       y="-673.18518"
+       style="stroke-width:1px"
+       id="tspan9999-0">muscle-concentric.png</tspan><tspan
+       sodipodi:role="line"
+       x="-992.46576"
+       y="-471.26303"
+       style="stroke-width:1px"
+       id="tspan10001-5">seleccio, height 24</tspan></text>
+  <text
+     xml:space="preserve"
+     
style="font-style:normal;font-weight:normal;font-size:161.53770447px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1595.5214"
+     y="-879.92133"
+     id="text9997-3-3"><tspan
+       sodipodi:role="line"
+       id="tspan9995-8-6"
+       x="1595.5214"
+       y="-879.92133"
+       style="stroke-width:1px">concentric</tspan><tspan
+       sodipodi:role="line"
+       x="1595.5214"
+       y="-677.99921"
+       style="stroke-width:1px"
+       id="tspan9999-0-7">muscle-excentric-concentric.png</tspan><tspan
+       sodipodi:role="line"
+       x="1595.5214"
+       y="-476.07706"
+       style="stroke-width:1px"
+       id="tspan10001-5-5">seleccio, height 24</tspan></text>
+  <text
+     xml:space="preserve"
+     
style="font-style:normal;font-weight:normal;font-size:161.53770447px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="-1028.9579"
+     y="2834.3757"
+     id="text9997-3-35"><tspan
+       sodipodi:role="line"
+       x="-1028.9579"
+       y="2834.3757"
+       style="stroke-width:1px"
+       id="tspan9999-0-9">laterality-both.png</tspan><tspan
+       sodipodi:role="line"
+       x="-1028.9579"
+       y="3036.2979"
+       style="stroke-width:1px"
+       id="tspan10001-5-1">seleccio, height 24</tspan></text>
+  <text
+     xml:space="preserve"
+     
style="font-style:normal;font-weight:normal;font-size:161.53770447px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="2040.7804"
+     y="2823.271"
+     id="text9997-3-35-2"><tspan
+       sodipodi:role="line"
+       x="2040.7804"
+       y="2823.271"
+       style="stroke-width:1px"
+       id="tspan9999-0-9-7">laterality-left.png</tspan><tspan
+       sodipodi:role="line"
+       x="2040.7804"
+       y="3025.1931"
+       style="stroke-width:1px"
+       id="tspan10001-5-1-0">seleccio, height 24</tspan></text>
+  <text
+     xml:space="preserve"
+     
style="font-style:normal;font-weight:normal;font-size:161.53770447px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="920.12225"
+     y="3433.4072"
+     id="text9997-3-35-9"><tspan
+       sodipodi:role="line"
+       x="920.12225"
+       y="3433.4072"
+       style="stroke-width:1px"
+       id="tspan9999-0-9-3">laterality-right.png</tspan><tspan
+       sodipodi:role="line"
+       x="920.12225"
+       y="3635.3293"
+       style="stroke-width:1px"
+       id="tspan10001-5-1-6">seleccio, height 24</tspan></text>
+  <g
+     id="g5595"
+     
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/muscle-excentric-concentric.png"
+     inkscape:export-xdpi="3.4689484"
+     inkscape:export-ydpi="3.4689484">
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path6250-2-9"
+       d="m 1334.8464,686.98998 h 351.6181 V 438.10582 h 273.0717 V 313.66373 l -624.6892,-3.9e-4 v 116.6645 
3.9e-4 z"
+       
style="fill:#0e1e46;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <ellipse
+       ry="108.88681"
+       rx="108.76627"
+       cy="142.19867"
+       cx="1512.3298"
+       id="path6252-3-1"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <rect
+       y="119.22109"
+       x="1879.8094"
+       height="303.54044"
+       width="70.226784"
+       id="rect6272-2"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <ellipse
+       ry="49.487057"
+       rx="87.355141"
+       cy="328.63974"
+       cx="1775.8352"
+       id="path4811-3"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <g
+       style="stroke-width:1.60345781"
+       transform="matrix(0.44123297,0.44074452,0.44123297,-0.44074452,691.84873,-1845.0203)"
+       id="g4809-0">
+      <rect
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:32.06916046;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect9593-06-5-6"
+         width="253.12444"
+         height="45.541386"
+         x="3811.3381"
+         y="-846.11713" />
+      <path
+         sodipodi:type="star"
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:41.09461975;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path9576-5-32-6-2"
+         sodipodi:sides="3"
+         sodipodi:cx="-532.12085"
+         sodipodi:cy="-1470.6187"
+         sodipodi:r1="166.9901"
+         sodipodi:r2="81.63327"
+         sodipodi:arg1="1.0471976"
+         sodipodi:arg2="2.0943951"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -448.62581,-1326.001 -124.31167,-73.9212 -126.17347,-70.6965 126.17347,-70.6964 
124.31169,-73.9212 -1.86179,144.6176 z"
+         inkscape:transform-center-x="-32.389062"
+         transform="matrix(-0.78076725,0,0,-0.77997996,3699.0065,-1970.3995)"
+         inkscape:transform-center-y="-6.4912368e-06" />
+    </g>
+  </g>
+  <g
+     id="g5579"
+     
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/muscle-concentric.png"
+     inkscape:export-xdpi="3.5842578"
+     inkscape:export-ydpi="3.5842578">
+    <ellipse
+       ry="108.88681"
+       rx="108.76627"
+       cy="184.01778"
+       cx="3208.1731"
+       id="path6252-3-18"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <g
+       style="stroke-width:1.60345781"
+       transform="matrix(-0.44074452,-0.44123297,0.44074452,-0.44123297,5913.7557,1755.2412)"
+       id="g4809-9">
+      <rect
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:32.06916046;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect9593-06-5-2"
+         width="253.12444"
+         height="45.541386"
+         x="3811.3381"
+         y="-846.11713" />
+      <path
+         sodipodi:type="star"
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:41.09461975;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path9576-5-32-6-0"
+         sodipodi:sides="3"
+         sodipodi:cx="-532.12085"
+         sodipodi:cy="-1470.6187"
+         sodipodi:r1="166.9901"
+         sodipodi:r2="81.63327"
+         sodipodi:arg1="1.0471976"
+         sodipodi:arg2="2.0943951"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -448.62581,-1326.001 -124.31167,-73.9212 -126.17347,-70.6965 126.17347,-70.6964 
124.31169,-73.9212 -1.86179,144.6176 z"
+         inkscape:transform-center-x="-32.389062"
+         transform="matrix(-0.78076725,0,0,-0.77997996,3699.0065,-1970.3995)"
+         inkscape:transform-center-y="-6.4912368e-06" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5472"
+       d="M 3041.5335,687.94181 H 3371.064 V 454.77233 h 255.9181 V 148.32852 h -79.469 v 191.09595 l 
-16.8693,-0.0233 c -60.1097,-65.61169 -93.8002,-66.97333 -161.4726,0 h -328.1753 z"
+       
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:40;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+  </g>
+  <g
+     id="g5586">
+    <ellipse
+       ry="108.88681"
+       rx="108.76627"
+       cy="229.73914"
+       cx="4322.0273"
+       id="path6252-3-18-7"
+       
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:#0e1e46;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <g
+       style="stroke-width:1.60345781"
+       transform="matrix(0.44074452,0.44123297,-0.44074452,0.44123297,2761.1545,-1017.0707)"
+       id="g4809-9-5">
+      <rect
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:32.06916046;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect9593-06-5-2-9"
+         width="253.12444"
+         height="45.541386"
+         x="3811.3381"
+         y="-846.11713" />
+      <path
+         sodipodi:type="star"
+         
style="opacity:1;fill:#0e1e46;fill-opacity:1;stroke:none;stroke-width:41.09461975;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path9576-5-32-6-0-2"
+         sodipodi:sides="3"
+         sodipodi:cx="-532.12085"
+         sodipodi:cy="-1470.6187"
+         sodipodi:r1="166.9901"
+         sodipodi:r2="81.63327"
+         sodipodi:arg1="1.0471976"
+         sodipodi:arg2="2.0943951"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -448.62581,-1326.001 -124.31167,-73.9212 -126.17347,-70.6965 126.17347,-70.6964 
124.31169,-73.9212 -1.86179,144.6176 z"
+         inkscape:transform-center-x="-32.389062"
+         transform="matrix(-0.78076725,0,0,-0.77997996,3699.0065,-1970.3995)"
+         inkscape:transform-center-y="-6.4912368e-06" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5472-2"
+       d="m 4155.3877,733.66316 h 329.5305 V 500.49368 h 255.9181 V 194.04987 h -79.469 v 191.09595 l 
-16.8693,-0.0233 c -60.1097,-65.61169 -93.8002,-66.97333 -161.4726,0 h -328.1753 z"
+       
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:40;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+  </g>
+</svg>
diff --git a/images/svg/extra-mass.svg b/images/svg/extra-mass.svg
index a6052fb..7fb168b 100644
--- a/images/svg/extra-mass.svg
+++ b/images/svg/extra-mass.svg
@@ -12,11 +12,14 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
    id="svg2"
    version="1.0"
-   viewBox="0 0 294.22182 221.44447"
+   viewBox="0 0 612.25101 377.12212"
    inkscape:version="0.92.1 r15371"
    sodipodi:docname="extra-mass.svg"
-   width="313.83661"
-   height="236.20744">
+   width="653.06775"
+   height="402.26361"
+   inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/extra-mass.png"
+   inkscape:export-xdpi="9.754138"
+   inkscape:export-ydpi="9.754138">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -30,9 +33,9 @@
      inkscape:window-height="702"
      id="namedview46"
      showgrid="false"
-     inkscape:zoom="0.73777387"
-     inkscape:cx="237.75545"
-     inkscape:cy="191.80359"
+     inkscape:zoom="0.61831187"
+     inkscape:cx="-102.93698"
+     inkscape:cy="93.024009"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -184,16 +187,6 @@
        x1="429.60999"
        gradientTransform="matrix(1.6027,0,0,1,-531.46,-432.3318)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5962-52"
-       id="linearGradient23840"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93749998,0,0,0.93749998,-329.95431,-3294.4746)"
-       x1="-1016.8681"
-       y1="4258.1187"
-       x2="-833.49841"
-       y2="3232.9158" />
-    <linearGradient
        id="linearGradient5962-52">
       <stop
          style="stop-color:#fff842;stop-opacity:1;"
@@ -205,16 +198,6 @@
          id="stop5966-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30038-0-4-1-3-7-1-8-8"
-       id="linearGradient23842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.57480056,-0.57480056,0,-1324.47,399.60174)"
-       x1="175.72"
-       y1="737.02002"
-       x2="470"
-       y2="737.02002" />
-    <linearGradient
        id="linearGradient30038-0-4-1-3-7-1-8-8"
        y2="737.02002"
        gradientUnits="userSpaceOnUse"
@@ -234,16 +217,6 @@
          style="stop-color:#244457;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30038-0-4-1-3-8-11-1-78"
-       id="linearGradient23844"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.27444602,-0.27444602,0,688.33761,440.17634)"
-       x1="175.72"
-       y1="737.02002"
-       x2="470"
-       y2="737.02002" />
-    <linearGradient
        id="linearGradient30038-0-4-1-3-8-11-1-78"
        y2="737.02002"
        gradientUnits="userSpaceOnUse"
@@ -262,46 +235,6 @@
          offset="1"
          style="stop-color:#244457;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30038-0-4-1-3-7-1-8-8"
-       id="linearGradient23848"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.29130186,-0.29130186,0,-740.81677,611.25274)"
-       x1="175.72"
-       y1="737.02002"
-       x2="470"
-       y2="737.02002" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30038-0-4-1-3-8-11-1-78"
-       id="linearGradient9268"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.27444602,-0.27444602,0,688.33761,440.17634)"
-       x1="175.72"
-       y1="737.02002"
-       x2="470"
-       y2="737.02002" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30038-0-4-1-3-8-11-1-78"
-       id="linearGradient9270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.27444602,-0.27444602,0,688.33761,440.17634)"
-       x1="175.72"
-       y1="737.02002"
-       x2="470"
-       y2="737.02002" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30038-0-4-1-3-8-11-1-78"
-       id="linearGradient9272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.27444602,-0.27444602,0,688.33761,440.17634)"
-       x1="175.72"
-       y1="737.02002"
-       x2="470"
-       y2="737.02002" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient30038-0-4-1-3-7-1-8-8"
@@ -316,7 +249,7 @@
   </defs>
   <g
      id="g9465"
-     transform="translate(81.358193,12.729145)"
+     transform="translate(399.38737,12.729145)"
      
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/extra-mass.png"
      inkscape:export-xdpi="11.78625"
      inkscape:export-ydpi="11.78625">
@@ -389,333 +322,42 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <rect
-     inkscape:export-ydpi="15.721952"
-     inkscape:export-xdpi="15.721952"
-     inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/rect5960.png"
-     style="fill:url(#linearGradient23840);fill-opacity:1;stroke:none;stroke-width:0.9375"
-     id="rect5960-1"
-     width="1540.5377"
-     height="1073.34"
-     x="-2075.3203"
-     y="-291.66275" />
-  <rect
-     x="-1765.2876"
-     height="46.541264"
-     width="920.49042"
-     y="-158.21626"
-     id="rect4381-2"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-1888.1132"
-     height="263.729"
-     width="56.885178"
-     y="-266.81299"
-     id="rect4891-33"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-1818.9475"
-     height="201.68364"
-     width="41.370213"
-     y="-235.79036"
-     id="rect4893-84"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-1941.7664"
-     height="201.68364"
-     width="41.370213"
-     y="-235.79036"
-     id="rect4895-92"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-2047.1326"
-     height="46.541264"
-     width="93.084335"
-     y="-158.21567"
-     id="rect4897-9"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-778.86047"
-     height="263.729"
-     width="56.885178"
-     y="-266.81299"
-     id="rect4899-44"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-709.70197"
-     height="201.68364"
-     width="41.370213"
-     y="-235.79036"
-     id="rect4901-8"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-832.52557"
-     height="201.68364"
-     width="41.370213"
-     y="-235.79036"
-     id="rect4903-0"
-     style="stroke-width:2.42914796" />
-  <rect
-     x="-656.05475"
-     height="46.541264"
-     width="93.084335"
-     y="-158.21567"
-     id="rect4905-8"
-     style="stroke-width:2.42914796" />
-  <path
-     style="fill:#3a78a0;stroke-width:0.9375"
-     inkscape:connector-curvature="0"
-     id="path30020-0-3-7-3-8-0-04"
-     d="m -1755.7131,669.74723 c -18.3668,0 -33.2551,-37.86675 -33.2551,-84.57618 0,-46.71113 
14.8896,-84.57609 33.2551,-84.57609 18.3668,0 33.2551,37.86665 33.2551,84.57609 0,46.71121 -14.8896,84.57618 
-33.2551,84.57618 z" />
-  <path
-     style="fill:url(#linearGradient23842);stroke-width:0.9375"
-     inkscape:connector-curvature="0"
-     id="path30018-4-3-3-7-0-9-8-6"
-     d="m -1705.2109,500.58296 h -0.3592 c 0.1189,0.0131 0.2406,0.0253 0.3592,0.0356 z m 0,169.05834 c 
-0.403,0.0366 -0.8149,0.0722 -1.2214,0.0722 h 1.2214 z m -1.2214,0.0722 c -18.3571,0 -33.2482,-37.89843 
-33.2482,-84.58528 0,-45.95737 14.4252,-83.38996 32.386,-84.54862 h -49.6126 c -0.2851,-0.0188 
-0.5574,-0.0188 -0.8442,-0.0188 -0.275,0 -0.5529,0 -0.8263,0.0188 -17.9778,1.11169 -32.4396,38.56191 
-32.4396,84.54862 0,45.98803 14.4618,83.43769 32.4396,84.54872 v 0.0356 h 52.1444 z" />
-  <path
-     style="fill:#19262e;fill-opacity:1;stroke-width:0.9375"
-     inkscape:connector-curvature="0"
-     id="path30020-0-3-7-7-6-5-5-1"
-     d="m -1709.0036,669.74723 c -18.3668,0 -33.2551,-37.86675 -33.2551,-84.57618 0,-46.71113 
14.8896,-84.57609 33.2551,-84.57609 18.3668,0 33.2551,37.86665 33.2551,84.57609 0,46.71121 -14.8896,84.57618 
-33.2551,84.57618 z" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m -1713.3655,482.12535 49.6825,1.90218 4.9711,196.68633 -49.6826,-1.90231 z"
-     style="fill:#e9e9ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.17009115"
-     id="path7729-3-7-5" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m -1750.9374,488.10749 4.9711,196.6862 37.5718,-5.98214 -4.971,-196.68619 z"
-     style="fill:#353564;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.17009115"
-     id="path7731-9-7-4" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m -1745.9663,684.79369 49.6825,1.90231 37.5719,-5.98214 -49.6826,-1.90231 z"
-     style="fill:#afafde;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.17009115"
-     id="path7733-2-5-33" />
-  <path
-     sodipodi:nodetypes="ccccc"
-     inkscape:connector-curvature="0"
-     d="m -1750.9374,488.10749 113.5796,13.64963 45.386,-30.53217 -68.6716,0.19555 z"
-     style="fill:#4d4d9f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.17009115"
-     id="path7735-7-6-9" />
-  <path
-     sodipodi:nodetypes="ccccc"
-     inkscape:connector-curvature="0"
-     d="m -1667.0644,490.00967 1.1461,199.40718 75.3981,-22.99069 -1.3318,-194.8296 z"
-     style="fill:#d7d7ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.17009115"
-     id="path7737-8-1-0" />
-  <path
-     sodipodi:nodetypes="ccccc"
-     inkscape:connector-curvature="0"
-     d="m -1750.9374,488.10749 84.4335,1.48258 1.7395,200.83974 -81.2019,-5.63612 z"
-     style="fill:#8686bf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.17009115"
-     id="path7739-5-6-0" />
-  <path
-     
style="fill:none;stroke:#19262e;stroke-width:1.84490669;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m -1554.595,634.25817 c 0,0 29.8959,40.60388 -0.834,62.02669 -30.7299,21.42281 -7.5297,51.06759 
8.3078,59.62003"
-     id="path6847-5-3-7"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="czc" />
-  <g
-     transform="matrix(1.5697807,0,0,1.5697807,-2378.5606,-242.54218)"
-     id="g6686-2-1-7-3">
-    <path
-       d="m 482.43498,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-4-6-2-2"
-       inkscape:connector-curvature="0"
-       style="fill:#3a78a0" />
-    <path
-       d="m 506.54791,488.39117 h -0.17153 c 0.0568,0.006 0.11488,0.0122 0.17153,0.0169 z m 0,80.71907 c 
-0.19242,0.0175 -0.3891,0.0344 -0.58318,0.0344 h 0.58318 z m -0.58318,0.0344 c -8.76485,0 -15.87479,-18.09512 
-15.87479,-40.38633 -1e-5,-21.94298 6.8875,-39.81566 15.4631,-40.36885 h -23.68815 c -0.13612,-0.009 
-0.26614,-0.009 -0.40309,-0.009 -0.13129,0 -0.26399,5.3e-4 -0.39452,0.009 -8.58375,0.53077 -15.48872,18.41189 
-15.48872,40.36885 0,21.95755 6.90497,39.83838 15.48872,40.36886 v 0.0169 h 24.89702 z"
-       id="path30018-4-3-3-7-1-8-2-65"
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient9268)" />
-    <path
-       d="m 504.73704,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-7-0-7-1-8"
-       inkscape:connector-curvature="0"
-       style="fill:#19262e;fill-opacity:1" />
-  </g>
-  <g
-     id="g6686-9-2-15"
-     transform="matrix(1.5697807,0,0,1.5697807,-2342.3586,-242.54218)">
-    <path
-       d="m 482.43498,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-3-8-20"
-       inkscape:connector-curvature="0"
-       style="fill:#3a78a0" />
-    <path
-       d="m 506.54791,488.39117 h -0.17153 c 0.0568,0.006 0.11488,0.0122 0.17153,0.0169 z m 0,80.71907 c 
-0.19242,0.0175 -0.3891,0.0344 -0.58318,0.0344 h 0.58318 z m -0.58318,0.0344 c -8.76485,0 -15.87479,-18.09512 
-15.87479,-40.38633 -1e-5,-21.94298 6.8875,-39.81566 15.4631,-40.36885 h -23.68815 c -0.13612,-0.009 
-0.26614,-0.009 -0.40309,-0.009 -0.13129,0 -0.26399,5.3e-4 -0.39452,0.009 -8.58375,0.53077 -15.48872,18.41189 
-15.48872,40.36885 0,21.95755 6.90497,39.83838 15.48872,40.36886 v 0.0169 h 24.89702 z"
-       id="path30018-4-3-3-7-0-9-9"
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient9270)" />
-    <path
-       d="m 504.73704,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-7-6-5-3"
-       inkscape:connector-curvature="0"
-       style="fill:#19262e;fill-opacity:1" />
-  </g>
-  <path
-     sodipodi:nodetypes="cc"
-     
style="fill:none;stroke:#000000;stroke-width:1.875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M -1689.6254,480.66727 V -133.48868"
-     id="path5597-7"
-     inkscape:connector-curvature="0" />
-  <rect
-     style="fill:#003366;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9375"
-     id="rect23202"
-     width="493.14438"
-     height="526.82684"
-     x="-1027.9269"
-     y="254.85028" />
-  <path
-     style="fill:#eeeeee;fill-opacity:1;stroke-width:1.22339606"
-     d="m -681.69078,324.02031 c 0,19.69215 -15.96397,35.65478 -35.65478,35.65478 -19.69202,0 
-35.65477,-15.96397 -35.65477,-35.65478 0,-19.69203 15.96409,-35.65465 35.65477,-35.65465 19.69215,0 
35.65478,15.96397 35.65478,35.65465 z"
-     id="path3925"
-     inkscape:connector-curvature="0" />
-  <rect
-     style="fill:#eeeeee;fill-opacity:1;stroke-width:1.22339606"
-     x="367.03516"
-     y="681.20178"
-     width="155.3186"
-     height="72.287354"
-     ry="33.339409"
-     rx="33.339409"
-     id="rect3927"
-     transform="rotate(90)" />
-  <rect
-     style="fill:#eeeeee;fill-opacity:1;stroke-width:1.22339606"
-     x="753.03479"
-     y="14.236609"
-     width="37.120831"
-     height="165.08328"
-     ry="33.339409"
-     rx="33.339409"
-     transform="matrix(-0.8786505,0.4774655,0.4774655,0.8786505,0,0)"
-     id="rect3931" />
-  <rect
-     style="fill:#eeeeee;fill-opacity:1;stroke-width:1.22339606"
-     x="-762.3584"
-     y="525.43402"
-     width="40.051601"
-     height="222.72772"
-     ry="33.339409"
-     rx="33.339409"
-     id="rect3929" />
-  <rect
-     style="fill:#eeeeee;fill-opacity:1;stroke-width:1.22339606"
-     x="-712.38434"
-     y="525.43402"
-     width="40.051601"
-     height="222.72772"
-     ry="33.339409"
-     rx="33.339409"
-     id="rect3929-5" />
-  <rect
-     style="fill:#eeeeee;fill-opacity:1;stroke-width:1.22339606"
-     x="-507.55722"
-     y="699.2522"
-     width="37.120831"
-     height="165.08328"
-     ry="33.339409"
-     rx="33.339409"
-     transform="rotate(28.52)"
-     id="rect3931-1" />
-  <path
-     style="fill:#3a78a0;stroke-width:0.9375"
-     inkscape:connector-curvature="0"
-     id="path30020-0-3-7-3-8-0-04-0"
-     d="m -959.36531,748.15905 c -9.3082,0 -16.8535,-19.19034 -16.8535,-42.86221 0,-23.67254 7.546,-42.86213 
16.8535,-42.86213 9.3078,0 16.8532,19.19044 16.8532,42.86213 0,23.67281 -7.5458,42.86221 -16.8532,42.86221 z" 
/>
-  <path
-     style="fill:url(#linearGradient23848);stroke-width:0.9375"
-     inkscape:connector-curvature="0"
-     id="path30018-4-3-3-7-0-9-8-6-1"
-     d="m -933.77161,662.42871 h -0.1821 c 0.06,0.0122 0.1224,0.0122 0.1821,0.0178 z m 0,85.67662 c 
-0.2043,0.0188 -0.4131,0.0366 -0.6189,0.0366 h 0.6189 z m -0.6189,0.0366 c -9.3033,0 -16.8499,-19.20647 
-16.8499,-42.86691 0,-23.29059 7.3105,-42.2609 16.4129,-42.84815 h -25.1431 c -0.1446,-0.0122 -0.2824,-0.0122 
-0.4279,-0.0122 -0.1393,0 -0.2802,0 -0.4187,0.0122 -9.1111,0.56343 -16.44,19.54265 -16.44,42.84815 0,23.30634 
7.3289,42.28528 16.44,42.84825 v 0.0178 h 26.4261 z" />
-  <path
-     style="fill:#19262e;fill-opacity:1;stroke-width:0.9375"
-     inkscape:connector-curvature="0"
-     id="path30020-0-3-7-7-6-5-5-1-6"
-     d="m -935.69381,748.15905 c -9.3079,0 -16.8532,-19.19034 -16.8532,-42.86221 0,-23.67254 
7.5458,-42.86213 16.8532,-42.86213 9.3082,0 16.8533,19.19044 16.8533,42.86213 0,23.67281 -7.5458,42.86221 
-16.8533,42.86221 z" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m -937.90431,653.07466 25.17849,0.964 2.51929,99.67822 -25.17848,-0.96407 z"
-     style="fill:#e9e9ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59298784"
-     id="path7729-3-7-5-4" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m -956.94531,656.10633 2.5193,99.67815 19.041,-3.03167 -2.5193,-99.67815 z"
-     style="fill:#353564;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59298784"
-     id="path7731-9-7-4-0" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m -954.42601,755.78448 25.1785,0.96407 19.04098,-3.03167 -25.17848,-0.96407 z"
-     style="fill:#afafde;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59298784"
-     id="path7733-2-5-33-4" />
-  <path
-     sodipodi:nodetypes="ccccc"
-     inkscape:connector-curvature="0"
-     d="m -956.94531,656.10633 57.56076,6.91747 23.00109,-15.47333 -34.80193,0.0991 z"
-     style="fill:#4d4d9f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59298784"
-     id="path7735-7-6-9-1" />
-  <path
-     sodipodi:nodetypes="ccccc"
-     inkscape:connector-curvature="0"
-     d="m -914.43946,657.07033 0.58084,101.05712 38.2108,-11.6514 -0.67494,-98.73726 z"
-     style="fill:#d7d7ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59298784"
-     id="path7737-8-1-0-8" />
-  <path
-     sodipodi:nodetypes="ccccc"
-     inkscape:connector-curvature="0"
-     d="m -956.94531,656.10633 42.78991,0.75136 0.88153,101.78311 -41.15214,-2.85632 z"
-     style="fill:#8686bf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59298784"
-     id="path7739-5-6-0-5" />
-  <path
-     
style="fill:none;stroke:#19262e;stroke-width:0.77113116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m -856.37142,730.09174 c 0,0 17.31488,12.24806 -0.48291,18.71034 -17.79768,6.4621 -4.36106,15.40444 
4.81163,17.98435"
-     id="path6847-5-3-7-6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="czc" />
   <g
-     transform="matrix(0.79554558,0,0,0.79554558,-1275.0169,285.82204)"
-     id="g6686-2-1-7-3-8">
-    <path
-       d="m 482.43498,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-4-6-2-2-8"
-       inkscape:connector-curvature="0"
-       style="fill:#3a78a0" />
-    <path
-       d="m 506.54791,488.39117 h -0.17153 c 0.0568,0.006 0.11488,0.0122 0.17153,0.0169 z m 0,80.71907 c 
-0.19242,0.0175 -0.3891,0.0344 -0.58318,0.0344 h 0.58318 z m -0.58318,0.0344 c -8.76485,0 -15.87479,-18.09512 
-15.87479,-40.38633 -1e-5,-21.94298 6.8875,-39.81566 15.4631,-40.36885 h -23.68815 c -0.13612,-0.009 
-0.26614,-0.009 -0.40309,-0.009 -0.13129,0 -0.26399,5.3e-4 -0.39452,0.009 -8.58375,0.53077 -15.48872,18.41189 
-15.48872,40.36885 0,21.95755 6.90497,39.83838 15.48872,40.36886 v 0.0169 h 24.89702 z"
-       id="path30018-4-3-3-7-1-8-2-65-6"
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient9272)" />
-    <path
-       d="m 504.73704,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-7-0-7-1-8-5"
-       inkscape:connector-curvature="0"
-       style="fill:#19262e;fill-opacity:1" />
-  </g>
-  <g
-     id="g6686-9-2-15-3"
-     transform="matrix(0.79554558,0,0,0.79554558,-1256.6702,285.82204)">
-    <path
-       d="m 482.43498,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-3-8-20-9"
-       inkscape:connector-curvature="0"
-       style="fill:#3a78a0" />
-    <path
-       d="m 506.54791,488.39117 h -0.17153 c 0.0568,0.006 0.11488,0.0122 0.17153,0.0169 z m 0,80.71907 c 
-0.19242,0.0175 -0.3891,0.0344 -0.58318,0.0344 h 0.58318 z m -0.58318,0.0344 c -8.76485,0 -15.87479,-18.09512 
-15.87479,-40.38633 -1e-5,-21.94298 6.8875,-39.81566 15.4631,-40.36885 h -23.68815 c -0.13612,-0.009 
-0.26614,-0.009 -0.40309,-0.009 -0.13129,0 -0.26399,5.3e-4 -0.39452,0.009 -8.58375,0.53077 -15.48872,18.41189 
-15.48872,40.36885 0,21.95755 6.90497,39.83838 15.48872,40.36886 v 0.0169 h 24.89702 z"
-       id="path30018-4-3-3-7-0-9-9-4"
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient23844)" />
-    <path
-       d="m 504.73704,569.16084 c -8.76946,0 -15.87809,-18.07996 -15.87809,-40.38199 0,-22.30286 
7.10924,-40.38199 15.87809,-40.38199 8.76945,0 15.87808,18.07996 15.87808,40.38199 0,22.30285 
-7.10923,40.38199 -15.87808,40.38199 z"
-       id="path30020-0-3-7-7-6-5-3-9"
-       inkscape:connector-curvature="0"
-       style="fill:#19262e;fill-opacity:1" />
+     id="g5524">
+    <ellipse
+       ry="31.667551"
+       rx="31.417463"
+       cy="94.683655"
+       cx="102.25775"
+       id="path4654"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#0e1e46;stroke-width:18.75;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
 />
+    <g
+       
style="fill:none;fill-opacity:1;stroke:#0e1e46;stroke-width:1.68849778;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(11.088205,0,0,11.12091,-6259.3592,-4442.0988)"
+       id="g4675">
+      <path
+         
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:1.68849778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 573.08249,421.07375 h 8.51521 l -3.4709,-10.13105 h -5.04431"
+         id="path4656"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0e1e46;stroke-width:1.68849778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 574.3741,421.07375 h -8.51521 l 3.4709,-10.13105 h 5.04431"
+         id="path4656-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
   </g>
-  <path
-     sodipodi:nodetypes="cc"
-     
style="fill:none;stroke:#ffffff;stroke-width:1.875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M -925.87311,652.33568 V 516.36781"
-     id="path5597-7-4"
-     inkscape:connector-curvature="0" />
+  <text
+     xml:space="preserve"
+     
style="font-style:normal;font-weight:normal;font-size:37.5px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.9375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="7.3617401"
+     y="351.12714"
+     id="text5400"><tspan
+       sodipodi:role="line"
+       id="tspan5398"
+       x="7.3617401"
+       y="351.12714"
+       style="stroke-width:0.9375px">selection height 24</tspan></text>
 </svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2904a7c..cbc6153 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -453,6 +453,9 @@ RESOURCES = \
        ../images/muscle-concentric.png,muscle-concentric.png \
        ../images/extra-mass.png,extra-mass.png \
        ../images/muscle-excentric-concentric.png,muscle-excentric-concentric.png \
+       ../images/laterality-both.png,laterality-both.png \
+       ../images/laterality-right.png,laterality-right.png \
+       ../images/laterality-left.png,laterality-left.png \
        ../images/encoder-analyze-individual-current-set.png,encoder-analyze-individual-current-set.png \
        
../images/encoder-analyze-individual-current-session.png,encoder-analyze-individual-current-session.png \
        ../images/encoder-analyze-individual-all-sessions.png,encoder-analyze-individual-all-sessions.png \
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 5d21353..03459b5 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -68,6 +68,7 @@ public partial class ChronoJumpWindow
 
        //encoder images
        [Widget] Gtk.Image image_muscle;
+       [Widget] Gtk.Image image_laterality;
        [Widget] Gtk.Image image_extra_mass;
        [Widget] Gtk.Image image_recalculate;
        [Widget] Gtk.Image image_encoder_configuration;
@@ -123,6 +124,9 @@ public partial class ChronoJumpWindow
                pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
                image_muscle.Pixbuf = pixbuf;
 
+               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "laterality-both.png");
+               image_laterality.Pixbuf = pixbuf;
+
                pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "extra-mass.png");
                image_extra_mass.Pixbuf = pixbuf;
 
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c653e62..8e65f8f 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -55,7 +55,6 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Notebook notebook_encoder_top;
        [Widget] Gtk.Label label_encoder_top_selected;
        [Widget] Gtk.Label label_encoder_top_exercise;
-       [Widget] Gtk.Label label_encoder_top_laterality;
        [Widget] Gtk.Label label_encoder_top_extra_mass;
        [Widget] Gtk.Label label_encoder_top_1RM_percent;
        [Widget] Gtk.Label label_encoder_top_weights;
@@ -3405,16 +3404,9 @@ public partial class ChronoJumpWindow
                hbox_combo_encoder_analyze_curve_num_combo.Visible = false; //do not show hbox at start
 
                label_encoder_top_exercise.Text = UtilGtk.ComboGetActive(combo_encoder_exercise_capture);
+               setEcconPixbuf();
+               setLateralityPixbuf();
 
-               //label_encoder_top_eccon.Text = UtilGtk.ComboGetActive(combo_encoder_eccon);
-               Pixbuf pixbuf;
-               if(UtilGtk.ComboGetActive(combo_encoder_eccon) == Catalog.GetString("Concentric"))
-                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
-               else
-                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + 
"muscle-excentric-concentric.png");
-               image_muscle.Pixbuf = pixbuf;
-
-               label_encoder_top_laterality.Text = UtilGtk.ComboGetActive(combo_encoder_laterality);
                label_encoder_top_extra_mass.Text = entry_raspberry_extra_weight.Text + " Kg";
                label_encoder_top_1RM_percent.Text = label_encoder_1RM_percent.Text + " %1RM";
                label_encoder_top_weights.Text = Catalog.GetString("Weights") + ": " + 
entry_encoder_im_weights_n.Text;
@@ -3542,7 +3534,11 @@ public partial class ChronoJumpWindow
 
                check_encoder_analyze_eccon_together.Sensitive = true;
                block_check_encoder_analyze_eccon_together_if_needed();
-               //label_encoder_top_eccon.Text = UtilGtk.ComboGetActive(combo_encoder_eccon);
+               setEcconPixbuf();
+       }
+
+       void setEcconPixbuf()
+       {
                Pixbuf pixbuf;
                if(UtilGtk.ComboGetActive(combo_encoder_eccon) == Catalog.GetString("Concentric"))
                        pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
@@ -3553,9 +3549,20 @@ public partial class ChronoJumpWindow
 
        void on_combo_encoder_laterality_changed (object o, EventArgs args)
        {
-               label_encoder_top_laterality.Text = UtilGtk.ComboGetActive(combo_encoder_laterality);
+               setLateralityPixbuf();
        }
 
+       void setLateralityPixbuf()
+       {
+               Pixbuf pixbuf;
+               if(UtilGtk.ComboGetActive(combo_encoder_laterality) == Catalog.GetString("R"))
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "laterality-right.png");
+               else if(UtilGtk.ComboGetActive(combo_encoder_laterality) == Catalog.GetString("L"))
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "laterality-left.png");
+               else
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "laterality-both.png");
+               image_laterality.Pixbuf = pixbuf;
+       }
 
        void on_button_encoder_capture_curves_all_clicked (object o, EventArgs args) {
                encoderCaptureSaveCurvesAllNoneBest(Constants.EncoderAutoSaveCurve.ALL, 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]