From ea94e7d9fd9628ddede670c4f7afdbccc4665c08 Mon Sep 17 00:00:00 2001
From: felixh <felixh@github.com>
Date: Sun, 16 Jun 2024 10:31:36 +0930
Subject: [PATCH] move clock and output arround

---
 res/additive.svg | 50 +++++++++++++++++++++++++++---------------------
 src/additive.cpp |  8 ++++----
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/res/additive.svg b/res/additive.svg
index 59eaed9..96f823c 100644
--- a/res/additive.svg
+++ b/res/additive.svg
@@ -32,7 +32,7 @@
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showguides="true">
     <sodipodi:guide
        position="-43.90905,59.249156"
@@ -95,24 +95,24 @@
        y="9.2836275" />
     <g
        aria-label="V/Oct"
-       id="text286"
-       style="font-size:3.175px;stroke-width:0.264583"
-       transform="translate(-1.9302327,0.10080387)">
+       id="text286-8"
+       style="font-size:3.175px;display:inline;stroke-width:0.264583"
+       transform="translate(-1.3555242,52.907419)">
       <path
          d="m 11.8159,11.156673 -0.809625,2.26695 h -0.28575 L 9.9109001,11.156673 H 10.20935 l 0.511175,1.45415 q 0.0508,0.1397 0.08255,0.263525 0.03492,0.12065 0.06033,0.231775 0.02222,-0.111125 0.05715,-0.23495 0.03492,-0.123825 0.08573,-0.2667 l 0.508,-1.4478 z"
-         id="path652" />
+         id="path652-8" />
       <path
          d="m 12.965251,11.156673 -0.84455,2.26695 h -0.27305 l 0.84455,-2.26695 z"
-         id="path654" />
+         id="path654-1" />
       <path
          d="m 15.283,12.286973 q 0,0.352425 -0.12065,0.61595 -0.117475,0.26035 -0.352425,0.4064 -0.231775,0.14605 -0.5715,0.14605 -0.352425,0 -0.587375,-0.14605 -0.231775,-0.14605 -0.346075,-0.409575 -0.1143,-0.263525 -0.1143,-0.61595 0,-0.346075 0.1143,-0.606425 0.1143,-0.263525 0.346075,-0.409575 0.23495,-0.14605 0.59055,-0.14605 0.339725,0 0.5715,0.14605 0.231775,0.142875 0.34925,0.4064 0.12065,0.26035 0.12065,0.612775 z m -1.7907,0 q 0,0.428625 0.180975,0.676275 0.180975,0.244475 0.56515,0.244475 0.384175,0 0.561975,-0.244475 0.180975,-0.24765 0.180975,-0.676275 0,-0.428625 -0.1778,-0.669925 -0.1778,-0.244475 -0.561975,-0.244475 -0.38735,0 -0.568325,0.244475 -0.180975,0.2413 -0.180975,0.669925 z"
-         id="path656" />
+         id="path656-4" />
       <path
          d="m 16.429176,13.455373 q -0.2286,0 -0.403225,-0.09207 -0.174625,-0.09207 -0.276225,-0.28575 -0.09843,-0.193675 -0.09843,-0.4953 0,-0.314325 0.1016,-0.511175 0.104775,-0.19685 0.28575,-0.288925 0.180975,-0.09207 0.409575,-0.09207 0.127,0 0.24765,0.02858 0.123825,0.0254 0.200025,0.0635 l -0.08573,0.231775 q -0.0762,-0.02858 -0.1778,-0.05397 -0.1016,-0.0254 -0.1905,-0.0254 -0.50165,0 -0.50165,0.644525 0,0.307975 0.12065,0.473075 0.123825,0.161925 0.365125,0.161925 0.136525,0 0.244475,-0.02858 0.10795,-0.02858 0.19685,-0.06985 v 0.24765 q -0.08573,0.04445 -0.1905,0.06668 -0.1016,0.0254 -0.24765,0.0254 z"
-         id="path658" />
+         id="path658-9" />
       <path
          d="m 17.838874,13.226773 q 0.0635,0 0.130175,-0.0095 0.06668,-0.0095 0.10795,-0.0254 v 0.212725 q -0.04445,0.02223 -0.127,0.03493 -0.08255,0.01587 -0.15875,0.01587 -0.13335,0 -0.24765,-0.04445 -0.111125,-0.04763 -0.180975,-0.161925 -0.06985,-0.1143 -0.06985,-0.320675 v -0.9906 h -0.2413 v -0.13335 l 0.244475,-0.111125 0.111125,-0.36195 h 0.1651 v 0.390525 h 0.492125 v 0.2159 h -0.492125 v 0.98425 q 0,0.155575 0.07303,0.231775 0.0762,0.07302 0.193675,0.07302 z"
-         id="path660" />
+         id="path660-4" />
     </g>
     <g
        aria-label="+1st"
@@ -152,24 +152,24 @@
     </g>
     <g
        aria-label="Clock"
-       id="text832"
-       style="font-size:3.175px;stroke-width:0.264583"
-       transform="translate(-0.93014592,3.9032258)">
+       id="text832-8"
+       style="font-size:3.175px;display:inline;stroke-width:0.264583"
+       transform="translate(-1.1224157,-48.435308)">
       <path
          d="m 10.939515,60.17752 q -0.365125,0 -0.574675,0.244475 -0.20955,0.244475 -0.20955,0.669925 0,0.422275 0.193675,0.669925 0.19685,0.244475 0.587375,0.244475 0.14605,0 0.2794,-0.0254 0.13335,-0.0254 0.263525,-0.0635 v 0.24765 q -0.127,0.04762 -0.263525,0.06985 -0.13335,0.02222 -0.320675,0.02222 -0.346075,0 -0.57785,-0.142875 -0.231775,-0.142875 -0.3492497,-0.4064 -0.1143,-0.263525 -0.1143,-0.619125 0,-0.3429 0.123825,-0.60325 0.1269997,-0.263525 0.3714747,-0.409575 0.244475,-0.149225 0.593725,-0.149225 0.358775,0 0.625475,0.13335 l -0.1143,0.2413 q -0.104775,-0.04762 -0.23495,-0.08572 -0.127,-0.0381 -0.2794,-0.0381 z"
-         id="path836" />
+         id="path836-6" />
       <path
          d="m 12.215865,62.225395 h -0.2794 v -2.413 h 0.2794 z"
-         id="path838" />
+         id="path838-9" />
       <path
          d="m 14.235163,61.37132 q 0,0.422275 -0.2159,0.65405 -0.212725,0.231775 -0.57785,0.231775 -0.225425,0 -0.403225,-0.1016 -0.174625,-0.104775 -0.276225,-0.301625 -0.1016,-0.200025 -0.1016,-0.4826 0,-0.422275 0.20955,-0.650875 0.212725,-0.2286 0.581025,-0.2286 0.2286,0 0.4064,0.104775 0.1778,0.1016 0.276225,0.29845 0.1016,0.193675 0.1016,0.47625 z m -1.285875,0 q 0,0.301625 0.117475,0.479425 0.12065,0.174625 0.381,0.174625 0.257175,0 0.377825,-0.174625 0.12065,-0.1778 0.12065,-0.479425 0,-0.301625 -0.12065,-0.473075 -0.12065,-0.17145 -0.381,-0.17145 -0.26035,0 -0.377825,0.17145 -0.117475,0.17145 -0.117475,0.473075 z"
-         id="path840" />
+         id="path840-7" />
       <path
          d="m 15.359112,62.257145 q -0.2286,0 -0.403225,-0.09208 -0.174625,-0.09208 -0.276225,-0.28575 -0.09843,-0.193675 -0.09843,-0.4953 0,-0.314325 0.1016,-0.511175 0.104775,-0.19685 0.28575,-0.288925 0.180975,-0.09208 0.409575,-0.09208 0.127,0 0.24765,0.02858 0.123825,0.0254 0.200025,0.0635 l -0.08573,0.231775 q -0.0762,-0.02857 -0.1778,-0.05398 -0.1016,-0.0254 -0.1905,-0.0254 -0.50165,0 -0.50165,0.644525 0,0.307975 0.12065,0.473075 0.123825,0.161925 0.365125,0.161925 0.136525,0 0.244475,-0.02857 0.10795,-0.02858 0.19685,-0.06985 v 0.24765 q -0.08573,0.04445 -0.1905,0.06667 -0.1016,0.0254 -0.24765,0.0254 z"
-         id="path842" />
+         id="path842-0" />
       <path
          d="m 16.47671,59.812395 v 1.260475 q 0,0.0508 -0.0064,0.13335 -0.0032,0.08255 -0.0064,0.142875 h 0.0127 q 0.01905,-0.0254 0.05715,-0.07303 0.0381,-0.04762 0.0762,-0.09525 0.04127,-0.0508 0.06985,-0.08255 l 0.542925,-0.574675 h 0.327025 l -0.688975,0.727075 0.7366,0.974725 h -0.33655 l -0.59055,-0.79375 -0.193675,0.168275 v 0.625475 h -0.276225 v -2.413 z"
-         id="path844" />
+         id="path844-6" />
     </g>
     <g
        aria-label="-1 st"
@@ -210,15 +210,21 @@
        id="rect3"
        width="18.096775"
        height="4.4354839"
-       x="3.7258065"
-       y="1.2419354" />
+       x="3.9032259"
+       y="5.766129" />
     <path
-       d="m 21.126953,16.647183 h -1.236328 l -0.855469,-2.431641 h -3.773437 l -0.855469,2.431641 h -1.177734 l 3.175781,-8.7246098 h 1.546875 z M 18.677734,13.219448 17.148437,8.9362451 15.613281,13.219448 Z m 11.144532,-0.925781 q 0,1.189453 -0.521485,2.15625 -0.515625,0.966797 -1.376953,1.5 -0.597656,0.369141 -1.335937,0.533203 -0.732422,0.164063 -1.933594,0.164063 H 22.451172 V 7.9225732 h 2.179687 q 1.277344,0 2.027344,0.1875 0.755859,0.1816406 1.277344,0.5039062 0.890625,0.5566407 1.388672,1.4824216 0.498047,0.925782 0.498047,2.197266 z m -1.212891,-0.01758 q 0,-1.025391 -0.357422,-1.728516 Q 27.894531,9.8444482 27.185547,9.4401513 26.669922,9.1471826 26.089844,9.0358544 25.509766,8.9186669 24.701172,8.9186669 h -1.089844 v 6.7324221 h 1.089844 q 0.83789,0 1.458984,-0.123047 0.626953,-0.123047 1.148438,-0.457031 0.65039,-0.416016 0.972656,-1.095703 0.328125,-0.679688 0.328125,-1.699219 z m 10.458984,0.01758 q 0,1.189453 -0.521484,2.15625 -0.515625,0.966797 -1.376953,1.5 -0.597656,0.369141 -1.335938,0.533203 -0.732422,0.164063 -1.933593,0.164063 H 31.697266 V 7.9225732 h 2.179687 q 1.277344,0 2.027344,0.1875 0.755859,0.1816406 1.277344,0.5039062 0.890625,0.5566407 1.388671,1.4824216 0.498047,0.925782 0.498047,2.197266 z m -1.21289,-0.01758 q 0,-1.025391 -0.357422,-1.728516 Q 37.140625,9.8444482 36.431641,9.4401513 35.916016,9.1471826 35.335937,9.0358544 34.755859,8.9186669 33.947266,8.9186669 h -1.089844 v 6.7324221 h 1.089844 q 0.83789,0 1.458984,-0.123047 0.626953,-0.123047 1.148437,-0.457031 0.650391,-0.416016 0.972657,-1.095703 0.328125,-0.679688 0.328125,-1.699219 z m 6.164062,4.371094 h -3.445312 v -0.890625 h 1.142578 V 8.8131982 h -1.142578 v -0.890625 h 3.445312 v 0.890625 h -1.142578 v 6.9433598 h 1.142578 z M 52.216797,8.9538232 H 49.099609 V 16.647183 H 47.939453 V 8.9538232 h -3.117187 v -1.03125 h 7.394531 z m 4.248047,7.6933598 h -3.445313 v -0.890625 h 1.142578 V 8.8131982 h -1.142578 v -0.890625 h 3.445313 v 0.890625 h -1.142578 v 6.9433598 h 1.142578 z M 65.318359,7.9225732 62.142578,16.647183 H 60.595703 L 57.419922,7.9225732 h 1.242187 l 2.736328,7.6757808 2.736329,-7.6757808 z m 7.072266,8.7246098 H 66.642578 V 7.9225732 h 5.748047 v 1.03125 h -4.587891 v 2.3906248 h 4.587891 v 1.03125 h -4.587891 v 3.240235 h 4.587891 z"
+       d="M 7.0091944,9.1061799 H 6.6820826 L 6.4557398,8.4628082 H 5.4573513 L 5.2310084,9.1061799 H 4.9193997 L 5.7596584,6.7977936 H 6.1689357 Z M 6.3611719,8.1992584 5.9565454,7.0659943 5.5503687,8.1992584 Z M 9.3098293,7.9543121 q 0,0.3147095 -0.1379762,0.5705078 Q 9.0354273,8.7806183 8.8075342,8.9216949 8.6494044,9.0193635 8.4540676,9.0627716 8.2602809,9.1061799 7.9424708,9.1061799 H 7.3595607 V 6.7977936 h 0.5767088 q 0.337964,0 0.5364015,0.049609 0.1999877,0.048059 0.3379639,0.1333251 0.2356445,0.1472779 0.3674195,0.3922241 0.1317749,0.2449465 0.1317749,0.5813603 z m -0.3209107,-0.00465 q 0,-0.2713014 -0.094568,-0.4573366 Q 8.7997828,7.3062897 8.6121974,7.1993194 8.4757716,7.1218048 8.3222927,7.0923492 8.1688137,7.0613434 7.9548732,7.0613434 H 7.6665186 V 8.84263 h 0.2883546 q 0.2216917,0 0.3860228,-0.032556 Q 8.5067774,8.777518 8.6447536,8.6891513 8.8168359,8.5790804 8.9021022,8.3992465 8.9889182,8.2194124 8.9889186,7.9496621 Z m 2.7672724,0.00465 q 0,0.3147095 -0.137976,0.5705078 -0.136425,0.2557984 -0.364318,0.396875 -0.15813,0.097669 -0.353467,0.1410767 -0.193787,0.043408 -0.511597,0.043408 h -0.58291 v -2.308386 h 0.576709 q 0.337964,0 0.536401,0.049609 0.199988,0.048059 0.337964,0.1333251 0.235645,0.1472779 0.367419,0.3922241 0.131775,0.2449465 0.131775,0.5813603 z m -0.32091,-0.00465 q 0,-0.2713014 -0.09457,-0.4573366 Q 11.246145,7.3062897 11.05856,7.1993194 10.922134,7.1218048 10.768655,7.0923492 10.615176,7.0613434 10.401236,7.0613434 H 10.112881 V 8.84263 h 0.288355 q 0.221691,0 0.386022,-0.032556 0.165882,-0.032556 0.303858,-0.1209227 0.172082,-0.1100709 0.257348,-0.2899048 0.08682,-0.1798341 0.08682,-0.449585 z m 1.630908,1.1565186 H 12.154617 V 8.8705348 h 0.302307 V 7.0334381 H 12.154617 V 6.7977936 h 0.911572 v 0.2356445 h -0.302307 v 1.8370973 h 0.302307 z m 2.16886,-2.0355343 H 14.410293 V 9.1061799 H 14.103335 V 7.0706451 H 13.278579 V 6.7977936 h 1.95647 z m 1.123962,2.0355348 H 15.447439 V 8.8705354 h 0.302307 V 7.0334381 H 15.447439 V 6.7977936 h 0.911572 v 0.2356445 h -0.302307 v 1.8370973 h 0.302307 z M 18.701504,6.7977936 17.861245,9.1061799 H 17.451968 L 16.611709,6.7977936 h 0.328662 l 0.723987,2.0308836 0.723987,-2.0308836 z m 1.871203,2.3083863 H 19.05187 V 6.7977936 h 1.520837 v 0.2728515 h -1.213879 v 0.6325195 h 1.213879 v 0.2728516 h -1.213879 v 0.8573121 h 1.213879 z"
        id="text1"
-       style="white-space:pre;fill:#ffffff"
+       style="white-space:pre;fill:#ffffff;stroke-width:0.264583"
        inkscape:label="Title"
-       transform="matrix(0.26458333,0,0,0.26458333,1.2419355,0.17741935)"
        aria-label="ADDITIVE" />
+    <rect
+       style="fill:#444444;fill-opacity:1;stroke-width:0.264583"
+       id="rect4"
+       width="8.870966"
+       height="5.5887032"
+       x="7.8951607"
+       y="69.19355" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/src/additive.cpp b/src/additive.cpp
index d624ee5..aff6aae 100644
--- a/src/additive.cpp
+++ b/src/additive.cpp
@@ -127,11 +127,11 @@ struct AdditiveWidget : ModuleWidget {
 
 		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(8.25, 29.168)), module, Additive::POS1_INPUT));
 		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(17.75, 29.168)), module, Additive::NEG1_INPUT));
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(10.598, 39.267)), module, Additive::POS5_INPUT));
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(20.598, 58.932)), module, Additive::NEG5_INPUT));
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(10.598, 69.25)), module, Additive::CLKIN_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(8.25, 39.267)), module, Additive::POS5_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(17.75, 39.267)), module, Additive::NEG5_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(10.598, 18.065)), module, Additive::CLKIN_INPUT));
 
-		addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(10.598, 18.065)), module, Additive::VOCT_OUTPUT));
+		addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(10.598, 69.25)), module, Additive::VOCT_OUTPUT));
 	}
 };