Merge pull request #16 from srobo/displays

WillB97 · web-flow · commit 96d497a43944 · 2022-04-20T14:57:46.000+01:00
Correct screen locations
diff --git a/2022/templates/L2.svg b/2022/templates/L2.svg
@@ -7,7 +7,7 @@
    viewBox="0 0 54244.346 51250.717"
    version="1.1"
    id="svg8291"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
    sodipodi:docname="L2.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -316,16 +316,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.79817562"
-     inkscape:cx="918.34426"
-     inkscape:cy="511.1657"
+     inkscape:zoom="1.687371"
+     inkscape:cx="878.28936"
+     inkscape:cy="569.52502"
      inkscape:document-units="cm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer9"
      showgrid="true"
      units="cm"
-     inkscape:window-width="2558"
-     inkscape:window-height="1401"
-     inkscape:window-x="1920"
+     inkscape:window-width="1918"
+     inkscape:window-height="1041"
+     inkscape:window-x="0"
      inkscape:window-y="18"
      inkscape:window-maximized="0"
      fit-margin-top="300"
@@ -1654,34 +1654,21 @@
        id="layer9"
        inkscape:label="Displays">
       <rect
-         y="25192.314"
-         x="26185.736"
+         y="10167.375"
+         x="20401.691"
          height="295.89868"
          width="299.65427"
-         id="rect1222"
-         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:18.2581;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect1222-8"
+         style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:18.2581;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          transform="matrix(0.99990632,0.01368759,-0.00126324,0.9999992,0,0)" />
       <rect
-         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.99999905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1272"
-         width="300"
-         height="300"
-         x="7950.7119"
-         y="40350.715" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:352.778px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="7441.4185"
-         y="40942.129"
-         id="text1276"><tspan
-           sodipodi:role="line"
-           id="tspan1280"
-           x="7441.4185"
-           y="40942.129">Computer</tspan><tspan
-           sodipodi:role="line"
-           id="tspan1282"
-           x="7441.4185"
-           y="41383.102">Screen</tspan></text>
+         y="10130.422"
+         x="23100.611"
+         height="295.89868"
+         width="299.65427"
+         id="rect1222-8-3"
+         style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:18.2581;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0.99990632,0.01368759,-0.00126324,0.9999992,0,0)" />
     </g>
   </g>
   <g
diff --git a/2022/templates/L3.svg b/2022/templates/L3.svg
@@ -3,7 +3,7 @@
 
 <svg
    sodipodi:docname="L3.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
    id="svg13569"
    version="1.1"
    viewBox="0 0 68699.999 56901.42"
@@ -634,16 +634,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.8720732"
-     inkscape:cx="497.84377"
-     inkscape:cy="794.30654"
+     inkscape:zoom="1.4220868"
+     inkscape:cx="149.42829"
+     inkscape:cy="563.25677"
      inkscape:document-units="cm"
-     inkscape:current-layer="layer5"
+     inkscape:current-layer="layer11"
      showgrid="true"
      units="cm"
-     inkscape:window-width="2558"
-     inkscape:window-height="1401"
-     inkscape:window-x="1920"
+     inkscape:window-width="1918"
+     inkscape:window-height="1041"
+     inkscape:window-x="0"
      inkscape:window-y="18"
      inkscape:window-maximized="1"
      fit-margin-left="300"
@@ -2824,12 +2824,33 @@
        id="layer11"
        inkscape:label="Displays">
       <rect
-         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.99999905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect1405"
          width="300"
          height="300"
-         x="12952.898"
-         y="12635.557" />
+         x="3050"
+         y="11317.378" />
+      <rect
+         style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect1405-2"
+         width="300"
+         height="300"
+         x="3050"
+         y="17684.045" />
+      <rect
+         style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect1405-3"
+         width="300"
+         height="300"
+         x="3350"
+         y="24050.711" />
+      <rect
+         style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect1405-38"
+         width="300"
+         height="300"
+         x="3350"
+         y="4950.7119" />
       <rect
          y="35250.707"
          x="34050"
diff --git a/2022/templates/cube.svg b/2022/templates/cube.svg
@@ -324,17 +324,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.2862611"
-     inkscape:cx="387.55739"
-     inkscape:cy="418.26655"
+     inkscape:zoom="2.4396777"
+     inkscape:cx="247.57369"
+     inkscape:cy="463.17594"
      inkscape:document-units="cm"
-     inkscape:current-layer="layer17"
+     inkscape:current-layer="layer10"
      showgrid="true"
      units="cm"
-     inkscape:window-width="2558"
-     inkscape:window-height="1401"
-     inkscape:window-x="1920"
-     inkscape:window-y="18"
+     inkscape:window-width="1918"
+     inkscape:window-height="1041"
+     inkscape:window-x="960"
+     inkscape:window-y="1458"
      inkscape:window-maximized="0"
      fit-margin-top="100"
      fit-margin-left="100"
@@ -1087,8 +1087,7 @@
        inkscape:groupmode="layer"
        id="layer10"
        inkscape:label="Displays"
-       style="display:inline"
-       sodipodi:insensitive="true">
+       style="display:inline">
       <rect
          y="6030.2598"
          x="11550"
@@ -1138,6 +1137,13 @@
          width="300"
          id="rect17853"
          style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="11338.26"
+         x="999.99994"
+         height="300"
+         width="300"
+         id="rect17853-3"
+         style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
   </g>
   <g
