From c8d7f70dba4a80790b1d280421e2b7ac0f5158f6 Mon Sep 17 00:00:00 2001
From: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date: Tue, 28 Oct 2014 02:03:07 +0100
Subject: [PATCH] Sketcher: Ellipse implementation: Art by Jim

---
 src/Mod/Sketcher/Gui/CommandCreateGeo.cpp     |  10 +-
 src/Mod/Sketcher/Gui/Resources/Sketcher.qrc   |   1 +
 .../icons/Sketcher_CreateEllipse.svg          |  26 +-
 .../icons/Sketcher_CreateEllipse_3points.svg  | 335 ++++++++++++++++++
 4 files changed, 354 insertions(+), 18 deletions(-)
 create mode 100644 src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg

diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index f116ee44f..eba7bc5c9 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -2569,7 +2569,7 @@ CmdSketcherCreateEllipseBy3Points::CmdSketcherCreateEllipseBy3Points()
     sToolTipText    = QT_TR_NOOP("Create an ellipse by 3 points in the sketch");
     sWhatsThis      = sToolTipText;
     sStatusTip      = sToolTipText;
-    sPixmap         = "Sketcher_Conics_Ellipse_3points";
+    sPixmap         = "Sketcher_CreateEllipse_3points";
     eType           = ForEdit;
 }
 
@@ -3009,19 +3009,19 @@ Gui::Action * CmdSketcherCompCreateConic::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* ellipseByCenter = pcAction->addAction(QString());
-    ellipseByCenter->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_CreateEllipse", QSize(32,32)));
+    ellipseByCenter->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_CreateEllipse", QSize(24,24)));
      /// @todo replace with correct icon
     QAction* ellipseBy3Points = pcAction->addAction(QString());
-    ellipseBy3Points->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Conics_Ellipse_3points", QSize(32,32)));
+    ellipseBy3Points->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_CreateEllipse_3points", QSize(24,24)));
     
     QAction* arcofellipse = pcAction->addAction(QString());
-    arcofellipse->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Elliptical_Arc", QSize(32,32)));
+    arcofellipse->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Elliptical_Arc", QSize(24,24)));
 
     _pcAction = pcAction;
     languageChange();
 
     // set ellipse by center, a, b as default method
-    pcAction->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Conics", QSize(32,32)));
+    pcAction->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Conics", QSize(24,24)));
     int defaultId = 0;
     pcAction->setProperty("defaultAction", QVariant(defaultId));
 
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 61547237f..6f210b450 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -49,6 +49,7 @@
         <file>icons/Sketcher_CreateArc.svg</file>
         <file>icons/Sketcher_CreateCircle.svg</file>
         <file>icons/Sketcher_CreateEllipse.svg</file>
+        <file>icons/Sketcher_CreateEllipse_3points.svg</file>
         <file>icons/Sketcher_CreateFillet.svg</file>
         <file>icons/Sketcher_CreateHeptagon.svg</file>
         <file>icons/Sketcher_CreateHexagon.svg</file>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
index e0ed135a0..1b22b95bf 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
@@ -15,7 +15,7 @@
    id="svg2918"
    sodipodi:version="0.32"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Ellipse_1 .svg"
+   sodipodi:docname="Sketcher_CreateEllipse.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
@@ -118,7 +118,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="19.467681"
+     inkscape:cx="32"
      inkscape:cy="32"
      inkscape:current-layer="g4470"
      showgrid="true"
@@ -138,7 +138,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -156,37 +156,37 @@
          sodipodi:nodetypes="cssssc"
          inkscape:connector-curvature="0"
          id="path3035"
-         d="m 1863.9406,439.88374 c -0.7646,0.0212 -1.5036,0.0874 -2.2743,0.14812 -24.6668,1.94685 -43.099,23.31118 -41.1139,47.68757 1.985,24.37639 23.6151,42.5753 48.2817,40.62845 24.6669,-1.94686 43.0991,-23.31117 41.1139,-47.68758 -1.9231,-23.61462 -22.3111,-41.45576 -46.0074,-40.77656 z"
+         d="m 1876.0597,429.77721 c -0.7933,0.0219 -1.56,0.0905 -2.3598,0.15345 -25.5938,2.0169 -44.7188,24.14994 -42.6591,49.40342 2.0596,25.25348 24.5027,44.10722 50.0964,42.09031 25.5939,-2.01691 44.7189,-24.14993 42.6591,-49.40343 -1.9954,-24.46431 -23.1497,-42.94739 -47.7366,-42.24375 z"
          style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1745.4647,564.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
+         d="m 1744.4042,565.93689 c -0.7934,0.0218 -1.5602,0.0904 -2.3599,0.15344 -25.5938,2.0169 -44.7187,24.14996 -42.659,49.40343 2.0596,25.25348 24.5025,44.1072 50.0963,42.0903 25.5939,-2.01691 44.7189,-24.14993 42.6592,-49.40343 -1.9956,-24.4643 -23.1497,-42.94738 -47.7366,-42.24374 z"
          id="path3766"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cssssc" />
       <path
          style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1657.4054,486.58594 c -0.7645,0.0211 -1.5036,0.0873 -2.2744,0.14812 -24.6668,1.94685 -43.0989,23.31119 -41.1139,47.68757 1.9852,24.37639 23.615,42.57531 48.2818,40.62846 24.6669,-1.94687 43.099,-23.31117 41.1139,-47.68759 -1.9232,-23.61463 -22.3112,-41.45576 -46.0074,-40.77655 z"
+         d="m 1661.7622,478.15981 c -0.7932,0.0218 -1.5601,0.0904 -2.3598,0.15345 -25.5939,2.0169 -44.7188,24.14995 -42.6591,49.40342 2.0598,25.25348 24.5024,44.10723 50.0963,42.09032 25.594,-2.01692 44.7189,-24.14993 42.6592,-49.40344 -1.9955,-24.46432 -23.1498,-42.94739 -47.7366,-42.24374 z"
          id="path3766-1"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cssssc" />
       <path
          id="path4439"
-         d="m 1707.1022,485.15879 c -96.5373,53.45994 -164.0206,155.6071 -150.6208,227.98999 13.3994,72.38298 105.6144,92.62454 202.152,39.1645 78.0671,-43.23157 142.1205,-118.49709 154.7792,-183.91914 2.5969,-31.81491 -6.8951,-53.65324 -16.6436,-75.27816 -28.3316,-49.19466 -106.279,-54.13519 -189.6668,-7.95719 z m 3.4058,26.68003 c 65.6677,-36.36511 127.1517,-33.23336 150.9065,4.20444 6.9609,24.06438 7.5369,43.79719 7.6009,61.94525 -11.3837,51.75023 -58.1351,110.29442 -119.548,144.30338 -77.4647,42.89798 -149.0684,30.57319 -159.8206,-27.50928 -10.7524,-58.08246 43.3965,-140.0458 120.8612,-182.94379 z"
+         d="m 1713.3268,476.68131 c -100.1655,55.38349 -170.1851,161.20602 -156.2817,236.19334 13.9031,74.9874 109.5838,95.95727 209.7496,40.57369 81.0012,-44.78711 142.2749,-115.28006 155.4094,-183.05607 5.5762,-27.20526 2.0671,-61.33814 -8.0478,-83.74115 -29.3964,-50.96474 -114.3077,-57.80935 -200.8295,-9.96981 z m 3.5338,27.64 c 68.1358,-37.67356 131.9305,-34.42913 156.5781,4.35572 7.2225,24.93025 7.8201,45.37307 7.8866,64.17412 -11.8116,53.61227 -60.3201,114.26294 -124.0411,149.49559 -80.376,44.44149 -154.6709,31.67325 -165.8272,-28.49909 -11.1565,-60.17235 45.0275,-145.08482 125.4036,-189.52634 z"
          style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="sssccssccsss" />
       <g
          id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)">
+         transform="matrix(1.0075123,-0.53237817,0.10889871,0.76794087,-58.280308,1054.9072)">
         <g
            id="g4428">
           <path
              inkscape:connector-curvature="0"
              id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 124.7524,-41.01889 153.2227,-75.28061 23.1749,-36.08004 31.4591,-91.69452 28.804,-128.25834 -2.6923,-98.00357 -91.2036,-181.25544 -189.244,-181.25544 z m 43.1124,46.90779 c 78.671,-10e-6 145.7618,83.15656 140.1859,145.45661 -2.6485,29.59242 -7.2756,53.19301 -22.3021,70.30257 -43.2032,46.12195 -62.1201,61.09226 -137.9384,65.33681 -78.9983,4.42259 -136.987,-60.60034 -136.987,-140.6713 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
+             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 124.7524,-41.01889 153.2227,-75.28061 26.2171,-32.47234 31.4591,-91.69452 28.804,-128.25834 -2.6923,-98.00357 -91.2036,-181.25544 -189.244,-181.25544 z m 43.1124,46.90779 c 78.671,-10e-6 145.7618,83.15656 140.1859,145.45661 -12.5364,111.12065 -101.0834,129.61806 -151.354,132.80806 -78.9983,4.42259 -145.8735,-57.76902 -145.8735,-137.83998 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
              style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="csscccccscsscc" />
+             sodipodi:nodetypes="csscccccccscc" />
           <g
              inkscape:export-ydpi="7.2934141"
              inkscape:export-xdpi="7.2934141"
@@ -203,7 +203,7 @@
       </g>
       <g
          id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)">
+         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,112.41292,612.18331)">
         <g
            transform="translate(-10.941933,-540.84412)"
            id="g3778">
@@ -246,7 +246,7 @@
       </g>
       <g
          id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,32.778145,529.17248)">
         <g
            transform="translate(-10.941933,-540.84412)"
            id="g3778-7">
@@ -288,7 +288,7 @@
         </g>
       </g>
       <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
+         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,242.57958,480.45361)"
          id="g3019">
         <g
            id="g3021"
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg
new file mode 100644
index 000000000..c81765c1a
--- /dev/null
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg
@@ -0,0 +1,335 @@
+<?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#"
+   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"
+   width="64px"
+   height="64px"
+   id="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Sketcher_CreateEllipse_2.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-5" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3958"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-3"
+       id="radialGradient3960"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-3"
+       id="radialGradient4041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.328125"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="g4470"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="995"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata2923">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         sodipodi:nodetypes="cssssc"
+         inkscape:connector-curvature="0"
+         id="path3035"
+         d="m 1876.0597,429.77721 c -0.7933,0.0219 -1.56,0.0905 -2.3598,0.15345 -25.5938,2.0169 -44.7188,24.14994 -42.6591,49.40342 2.0596,25.25348 24.5027,44.10722 50.0964,42.09031 25.5939,-2.01691 44.7189,-24.14993 42.6591,-49.40343 -1.9954,-24.46431 -23.1497,-42.94739 -47.7366,-42.24375 z"
+         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1588.8774,687.02561 c -0.7934,0.0218 -1.5602,0.0904 -2.3599,0.15344 -25.5938,2.0169 -44.7187,24.14996 -42.659,49.40343 2.0596,25.25348 24.5025,44.1072 50.0963,42.0903 25.5939,-2.01691 44.7189,-24.14993 42.6592,-49.40343 -1.9956,-24.4643 -23.1497,-42.94738 -47.7366,-42.24374 z"
+         id="path3766"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssc" />
+      <path
+         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1661.7622,478.15981 c -0.7932,0.0218 -1.5601,0.0904 -2.3598,0.15345 -25.5939,2.0169 -44.7188,24.14995 -42.6591,49.40342 2.0598,25.25348 24.5024,44.10723 50.0963,42.09032 25.594,-2.01692 44.7189,-24.14993 42.6592,-49.40344 -1.9955,-24.46432 -23.1498,-42.94739 -47.7366,-42.24374 z"
+         id="path3766-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssc" />
+      <path
+         id="path4439"
+         d="m 1713.3268,476.68131 c -100.1655,55.38349 -170.1851,161.20602 -156.2817,236.19334 13.9031,74.9874 109.5838,95.95727 209.7496,40.57369 81.0012,-44.78711 142.2749,-115.28006 155.4094,-183.05607 5.5762,-27.20526 2.0671,-61.33814 -8.0478,-83.74115 -29.3964,-50.96474 -114.3077,-57.80935 -200.8295,-9.96981 z m 3.5338,27.64 c 68.1358,-37.67356 131.9305,-34.42913 156.5781,4.35572 7.2225,24.93025 7.8201,45.37307 7.8866,64.17412 -11.8116,53.61227 -60.3201,114.26294 -124.0411,149.49559 -80.376,44.44149 -154.6709,31.67325 -165.8272,-28.49909 -11.1565,-60.17235 45.0275,-145.08482 125.4036,-189.52634 z"
+         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sssccssccsss" />
+      <g
+         id="g3768"
+         transform="matrix(1.0075123,-0.53237817,0.10889871,0.76794087,-58.280308,1054.9072)">
+        <g
+           id="g4428">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4425"
+             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 124.7524,-41.01889 153.2227,-75.28061 26.2171,-32.47234 31.4591,-91.69452 28.804,-128.25834 -2.6923,-98.00357 -91.2036,-181.25544 -189.244,-181.25544 z m 43.1124,46.90779 c 78.671,-10e-6 145.7618,83.15656 140.1859,145.45661 -12.5364,111.12065 -101.0834,129.61806 -151.354,132.80806 -78.9983,4.42259 -145.8735,-57.76902 -145.8735,-137.83998 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:nodetypes="csscccccccscc" />
+          <g
+             inkscape:export-ydpi="7.2934141"
+             inkscape:export-xdpi="7.2934141"
+             inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+             transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+             id="g3177" />
+          <g
+             inkscape:export-ydpi="7.2934141"
+             inkscape:export-xdpi="7.2934141"
+             inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+             transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+             id="g3185" />
+        </g>
+      </g>
+      <g
+         id="g3800"
+         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,-43.113878,733.27203)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778">
+          <g
+             id="g3780">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790">
+              <path
+                 sodipodi:type="arc"
+                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+                 id="path3792"
+                 sodipodi:cx="197.14285"
+                 sodipodi:cy="655.2193"
+                 sodipodi:rx="48.57143"
+                 sodipodi:ry="48.57143"
+                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
+              <path
+                 sodipodi:type="arc"
+                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
+                 id="path3794"
+                 sodipodi:cx="225.26402"
+                 sodipodi:cy="672.79736"
+                 sodipodi:rx="34.345188"
+                 sodipodi:ry="23.991123"
+                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
+                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+            </g>
+          </g>
+        </g>
+      </g>
+      <g
+         id="g3800-6"
+         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,32.778145,529.17248)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778-7">
+          <g
+             id="g3780-2">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784-5" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790-2">
+              <path
+                 sodipodi:type="arc"
+                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+                 id="path3792-8"
+                 sodipodi:cx="197.14285"
+                 sodipodi:cy="655.2193"
+                 sodipodi:rx="48.57143"
+                 sodipodi:ry="48.57143"
+                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
+              <path
+                 sodipodi:type="arc"
+                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
+                 id="path3794-5"
+                 sodipodi:cx="225.26402"
+                 sodipodi:cy="672.79736"
+                 sodipodi:rx="34.345188"
+                 sodipodi:ry="23.991123"
+                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
+                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+            </g>
+          </g>
+        </g>
+      </g>
+      <g
+         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,242.57958,480.45361)"
+         id="g3019">
+        <g
+           id="g3021"
+           transform="translate(-10.941933,-540.84412)">
+          <g
+             id="g3023">
+            <g
+               id="g3025"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-ydpi="7.2934141" />
+            <g
+               id="g3027"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-ydpi="7.2934141">
+              <path
+                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
+                 sodipodi:ry="48.57143"
+                 sodipodi:rx="48.57143"
+                 sodipodi:cy="655.2193"
+                 sodipodi:cx="197.14285"
+                 id="path3029"
+                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+                 sodipodi:type="arc" />
+              <path
+                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
+                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
+                 sodipodi:ry="23.991123"
+                 sodipodi:rx="34.345188"
+                 sodipodi:cy="672.79736"
+                 sodipodi:cx="225.26402"
+                 id="path3031"
+                 style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none"
+                 sodipodi:type="arc" />
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>