Browse Source

Fix Notes and MIDI Map display size.

tags/v2.0.0
Andrew Belt 3 years ago
parent
commit
53df270a6e
4 changed files with 62 additions and 70 deletions
  1. +43
    -51
      res/Core/MIDIMap.svg
  2. +17
    -17
      res/Core/Notes.svg
  3. +1
    -1
      src/core/MIDIMap.cpp
  4. +1
    -1
      src/core/Notes.cpp

+ 43
- 51
res/Core/MIDIMap.svg View File

@@ -11,11 +11,11 @@
height="380" height="380"
viewBox="0 0 150 380" viewBox="0 0 150 380"
version="1.1" version="1.1"
id="svg65"
id="svg38"
sodipodi:docname="MIDIMAP.svg" sodipodi:docname="MIDIMAP.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"> inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata <metadata
id="metadata69">
id="metadata42">
<rdf:RDF> <rdf:RDF>
<cc:Work <cc:Work
rdf:about=""> rdf:about="">
@@ -34,21 +34,21 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="716"
inkscape:window-height="480"
id="namedview67"
inkscape:window-width="1920"
inkscape:window-height="1017"
id="namedview40"
showgrid="false" showgrid="false"
inkscape:zoom="0.62105263" inkscape:zoom="0.62105263"
inkscape:cx="75" inkscape:cx="75"
inkscape:cy="190" inkscape:cy="190"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg65" />
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg38" />
<defs <defs
id="defs7"> id="defs7">
<linearGradient <linearGradient
id="ffb21069-7f23-43a5-a149-d83506b66a61"
id="e6b89c84-daa5-40e5-9bdc-4ca58430145f"
x1="75" x1="75"
x2="75" x2="75"
y2="380" y2="380"
@@ -64,95 +64,87 @@
</linearGradient> </linearGradient>
</defs> </defs>
<g <g
id="a3e343cd-be1c-44a0-b2c9-f063b430a449"
id="f9210fd4-47c5-4d1d-9711-86ebe6344d1b"
data-name="FND BG"> data-name="FND BG">
<rect <rect
width="150" width="150"
height="380" height="380"
fill="url(#ffb21069-7f23-43a5-a149-d83506b66a61)"
fill="url(#e6b89c84-daa5-40e5-9bdc-4ca58430145f)"
id="rect9" /> id="rect9" />
</g> </g>
<g <g
id="e21cd275-29f1-458a-82ea-b836e2917fac"
id="fed3cd06-42bc-4ee7-87d4-1fce3c850e91"
data-name="FND GRAPH"> data-name="FND GRAPH">
<g <g
id="g16"> id="g16">
<path <path
id="ba9d8385-a93a-4d5e-a3d8-982921861738"
id="b3405776-74b5-4087-a983-4efe1be00b3e"
data-name="path21209" data-name="path21209"
d="M66.86005,359.7628a.90889.90889,0,0,1-.81508-.50122l-2.96664-5.9293a.91123.91123,0,1,1,1.63005-.815l2.15167,4.29518,2.14759-4.29518a.91123.91123,0,1,1,1.63.815l-2.96266,5.9293a.91821.91821,0,0,1-.815.50122" d="M66.86005,359.7628a.90889.90889,0,0,1-.81508-.50122l-2.96664-5.9293a.91123.91123,0,1,1,1.63005-.815l2.15167,4.29518,2.14759-4.29518a.91123.91123,0,1,1,1.63.815l-2.96266,5.9293a.91821.91821,0,0,1-.815.50122"
fill="#1f1f1f" /> fill="#1f1f1f" />
<path <path
id="f301f9a5-79db-41c8-90d3-73c645048bee"
id="f774ab20-064d-4751-baa5-11632dd31e08"
data-name="path21211" data-name="path21211"
d="M83.14005,359.7628a.91335.91335,0,0,1-.815-.50122l-2.96267-5.9293a.91123.91123,0,1,1,1.63-.815l2.14758,4.29518,2.14759-4.29518a.913.913,0,1,1,1.63411.815l-2.96664,5.9293a.90914.90914,0,0,1-.81508.50122" d="M83.14005,359.7628a.91335.91335,0,0,1-.815-.50122l-2.96267-5.9293a.91123.91123,0,1,1,1.63-.815l2.14758,4.29518,2.14759-4.29518a.913.913,0,1,1,1.63411.815l-2.96664,5.9293a.90914.90914,0,0,1-.81508.50122"
fill="#1f1f1f" /> fill="#1f1f1f" />
<path <path
id="b6bf1983-005c-4f3b-8f31-1f221bd7bd58"
id="bd42b57c-2a9e-4cc7-a268-70bc560923d7"
data-name="path21213" data-name="path21213"
d="M75.44216,359.7628a3.87544,3.87544,0,1,1,2.32692-6.9766.91236.91236,0,0,1-1.09624,1.45873,2.02326,2.02326,0,0,0-1.23068-.41161,2.05385,2.05385,0,0,0,0,4.10769,2.0238,2.0238,0,0,0,1.23068-.41157.91241.91241,0,0,1,1.09624,1.45883,3.85741,3.85741,0,0,1-2.32692.77426" d="M75.44216,359.7628a3.87544,3.87544,0,1,1,2.32692-6.9766.91236.91236,0,0,1-1.09624,1.45873,2.02326,2.02326,0,0,0-1.23068-.41161,2.05385,2.05385,0,0,0,0,4.10769,2.0238,2.0238,0,0,0,1.23068-.41157.91241.91241,0,0,1,1.09624,1.45883,3.85741,3.85741,0,0,1-2.32692.77426"
fill="#1f1f1f" /> fill="#1f1f1f" />
<path <path
id="ff69275d-bf03-48ea-8839-50460b148393"
id="e2520435-d4b5-45d8-8264-c033ec31cfb4"
data-name="path21215" data-name="path21215"
d="M76.68913,355.84252a1.18583,1.18583,0,1,1-1.18989-1.18584,1.18786,1.18786,0,0,1,1.18989,1.18584" d="M76.68913,355.84252a1.18583,1.18583,0,1,1-1.18989-1.18584,1.18786,1.18786,0,0,1,1.18989,1.18584"
fill="#1f1f1f" /> fill="#1f1f1f" />
</g> </g>
</g> </g>
<g <g
id="bd7ad640-942f-458b-b3d0-00947d50dff9"
data-name="FND TXT"
style="display:inline">
id="ecaef459-9ecf-489e-9746-fcfbb9a86e9d"
data-name="FND TXT">
<g <g
id="g33"> id="g33">
<path <path
d="M 45.20312,20.44141 A 0.95618,0.95618 0 0 1 46.167,19.478 h 0.21192 a 0.99,0.99 0 0 1 0.877,0.50049 l 2.32617,3.791 2.33985,-3.80371 a 0.94553,0.94553 0 0 1 0.86328,-0.48779 h 0.21289 a 0.95557,0.95557 0 0 1 0.96386,0.96338 v 6.957 a 0.95753,0.95753 0 1 1 -1.915,0 v -4.36712 l -1.68857,2.60254 a 0.90078,0.90078 0 0 1 -1.60156,0 l -1.66407,-2.56445 v 4.354 a 0.93972,0.93972 0 0 1 -0.95117,0.93848 0.92956,0.92956 0 0 1 -0.93848,-0.93848 z"
id="path19"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M45.20312,20.44141A.95618.95618,0,0,1,46.167,19.478h.21192a.99.99,0,0,1,.877.50049l2.32617,3.791,2.33985-3.80371a.94553.94553,0,0,1,.86328-.48779h.21289a.95557.95557,0,0,1,.96386.96338v6.957a.95753.95753,0,1,1-1.915,0V23.03125L50.3584,25.63379a.90078.90078,0,0,1-1.60156,0l-1.66407-2.56445v4.354a.93972.93972,0,0,1-.95117.93848.92956.92956,0,0,1-.93848-.93848Z"
fill="#1f1f1f"
id="path19" />
<path <path
d="m 56.2832,20.4165 a 0.96289,0.96289 0 1 1 1.92578,0 v 6.98194 a 0.96289,0.96289 0 1 1 -1.92578,0 z"
id="path21"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M56.2832,20.4165a.96289.96289,0,1,1,1.92578,0v6.98194a.96289.96289,0,1,1-1.92578,0Z"
fill="#1f1f1f"
id="path21" />
<path <path
d="m 60.49805,20.49121 a 0.95629,0.95629 0 0 1 0.96484,-0.96289 h 2.45117 a 4.36535,4.36535 0 0 1 4.65528,4.354 v 0.02491 a 4.3849,4.3849 0 0 1 -4.65528,4.37939 h -2.45117 a 0.95639,0.95639 0 0 1 -0.96484,-0.96338 z m 3.416,6.05615 a 2.49574,2.49574 0 0 0 2.64063,-2.61474 v -0.02539 a 2.5154,2.5154 0 0 0 -2.64063,-2.63965 h -1.48827 v 5.27978 z"
id="path23"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M60.49805,20.49121a.95629.95629,0,0,1,.96484-.96289h2.45117a4.36535,4.36535,0,0,1,4.65528,4.354v.02491a4.3849,4.3849,0,0,1-4.65528,4.37939H61.46289a.95639.95639,0,0,1-.96484-.96338Zm3.416,6.05615a2.49574,2.49574,0,0,0,2.64063-2.61474v-.02539a2.5154,2.5154,0,0,0-2.64063-2.63965H62.42578v5.27978Z"
fill="#1f1f1f"
id="path23" />
<path <path
d="m 70.39453,20.4165 a 0.96387,0.96387 0 0 1 1.92774,0 v 6.98194 a 0.96387,0.96387 0 0 1 -1.92774,0 z"
id="path25"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M70.39453,20.4165a.96387.96387,0,0,1,1.92774,0v6.98194a.96387.96387,0,0,1-1.92774,0Z"
fill="#1f1f1f"
id="path25" />
<path <path
d="m 78.26953,20.44141 a 0.95536,0.95536 0 0 1 0.96289,-0.96338 h 0.21289 a 0.98789,0.98789 0 0 1 0.875,0.50049 l 2.32813,3.791 2.33984,-3.80371 a 0.94142,0.94142 0 0 1 0.86328,-0.48779 h 0.21289 a 0.956,0.956 0 0 1 0.96289,0.96338 v 6.957 a 0.95705,0.95705 0 1 1 -1.91406,0 v -4.36715 l -1.68945,2.60254 a 0.90078,0.90078 0 0 1 -1.60156,0 L 80.1582,23.06934 v 4.354 a 0.94033,0.94033 0 0 1 -0.95117,0.93848 0.92874,0.92874 0 0 1 -0.9375,-0.93848 z"
id="path27"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M78.26953,20.44141a.95536.95536,0,0,1,.96289-.96338h.21289a.98789.98789,0,0,1,.875.50049l2.32813,3.791,2.33984-3.80371a.94142.94142,0,0,1,.86328-.48779h.21289a.956.956,0,0,1,.96289.96338v6.957a.95705.95705,0,1,1-1.91406,0V23.03125l-1.68945,2.60254a.90078.90078,0,0,1-1.60156,0L80.1582,23.06934v4.354a.94033.94033,0,0,1-.95117.93848.92874.92874,0,0,1-.9375-.93848Z"
fill="#1f1f1f"
id="path27" />
<path <path
d="m 88.55566,27.04785 3.05372,-6.894 a 1.18835,1.18835 0 0 1 1.125,-0.76319 h 0.11328 a 1.174,1.174 0 0 1 1.11328,0.76319 l 3.05273,6.894 a 0.94139,0.94139 0 0 1 0.10059,0.3877 0.91339,0.91339 0 0 1 -0.91309,0.92627 0.97932,0.97932 0 0 1 -0.92578,-0.66358 l -0.58887,-1.376 H 90.833 l -0.61328,1.439 a 0.94563,0.94563 0 0 1 -0.8877,0.60059 0.88655,0.88655 0 0 1 -0.88867,-0.90088 1.02332,1.02332 0 0 1 0.11231,-0.4131 z m 5.418,-2.42724 -1.21386,-2.89014 -1.21289,2.89014 z"
id="path29"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M88.55566,27.04785l3.05372-6.894a1.18835,1.18835,0,0,1,1.125-.76319h.11328a1.174,1.174,0,0,1,1.11328.76319l3.05273,6.894a.94139.94139,0,0,1,.10059.3877.91339.91339,0,0,1-.91309.92627.97932.97932,0,0,1-.92578-.66358l-.58887-1.376H90.833l-.61328,1.439a.94563.94563,0,0,1-.8877.60059.88655.88655,0,0,1-.88867-.90088A1.02332,1.02332,0,0,1,88.55566,27.04785Zm5.418-2.42724-1.21386-2.89014-1.21289,2.89014Z"
fill="#1f1f1f"
id="path29" />
<path <path
d="m 98.53516,20.49121 a 0.95607,0.95607 0 0 1 0.96386,-0.96289 h 2.61426 c 2.08984,0 3.35352,1.23828 3.35352,3.02783 v 0.0249 c 0,2.02686 -1.57618,3.07813 -3.541,3.07813 h -1.46289 v 1.73926 a 0.96387,0.96387 0 0 1 -1.92773,0 z m 3.45312,3.45361 a 1.35676,1.35676 0 0 0 1.52734,-1.32617 v -0.0249 c 0,-0.86328 -0.60156,-1.32617 -1.56445,-1.32617 h -1.48828 v 2.67724 z"
id="path31"
inkscape:connector-curvature="0"
style="fill:#1f1f1f" />
d="M98.53516,20.49121a.95607.95607,0,0,1,.96386-.96289h2.61426c2.08984,0,3.35352,1.23828,3.35352,3.02783v.0249c0,2.02686-1.57618,3.07813-3.541,3.07813h-1.46289v1.73926a.96387.96387,0,0,1-1.92773,0Zm3.45312,3.45361a1.35676,1.35676,0,0,0,1.52734-1.32617v-.0249c0-.86328-.60156-1.32617-1.56445-1.32617h-1.48828v2.67724Z"
fill="#1f1f1f"
id="path31" />
</g> </g>
</g> </g>
<g <g
id="f88c7a9b-bc14-4a4a-aa3a-d7bb4b2ce41b"
id="fafe829e-6e9a-45d9-9a7e-0352fdc67f1e"
data-name="components" data-name="components"
inkscape:groupmode="layer" inkscape:groupmode="layer"
style="display:none"> style="display:none">
<rect <rect
id="b52b4bc3-e540-43b2-820d-465d3eb6a996"
id="b8893b2a-34f5-4411-939c-6732d6411d2a"
data-name="Screen" data-name="Screen"
y="38" y="38"
width="150" width="150"
height="311.71326"
height="310.21326"
x="0" x="0"
style="fill:#ffff00" /> style="fill:#ffff00" />
</g> </g>


+ 17
- 17
res/Core/Notes.svg View File

@@ -34,21 +34,21 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="716"
inkscape:window-height="480"
inkscape:window-width="1920"
inkscape:window-height="1017"
id="namedview36" id="namedview36"
showgrid="false" showgrid="false"
inkscape:zoom="0.62105263" inkscape:zoom="0.62105263"
inkscape:cx="120" inkscape:cx="120"
inkscape:cy="190" inkscape:cy="190"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg34" /> inkscape:current-layer="svg34" />
<defs <defs
id="defs7"> id="defs7">
<linearGradient <linearGradient
id="a90e154b-8548-4d2f-b9ad-36b9909f4122"
id="a2d41a32-129a-467c-88bb-0081d4967003"
x1="120" x1="120"
x2="120" x2="120"
y2="380" y2="380"
@@ -64,43 +64,43 @@
</linearGradient> </linearGradient>
</defs> </defs>
<g <g
id="ba145140-ce77-4bb3-9030-17e43bdd6a03"
id="ff212d66-6d77-44f8-85c7-307f2d84ecf1"
data-name="FND BG"> data-name="FND BG">
<rect <rect
width="240" width="240"
height="380" height="380"
fill="url(#a90e154b-8548-4d2f-b9ad-36b9909f4122)"
fill="url(#a2d41a32-129a-467c-88bb-0081d4967003)"
id="rect9" /> id="rect9" />
</g> </g>
<g <g
id="e2d20ba7-6100-4846-a507-c4a3f2a3c137"
id="b4dd66e7-8e7e-494a-8612-34274361d97e"
data-name="FND GRAPH"> data-name="FND GRAPH">
<g <g
id="g16"> id="g16">
<path <path
id="e0ca7dab-2c85-4822-aaf4-39d470af4021"
id="b4cb817a-ff42-4dfc-8866-e3d83608b518"
data-name="path6935" data-name="path6935"
d="M111.8588,359.76681a.90968.90968,0,0,1-.815-.50533l-2.96266-5.92926a.91122.91122,0,0,1,1.63-.815l2.14759,4.29517,2.15167-4.29517a.91122.91122,0,1,1,1.63.815l-2.96663,5.92926a.91016.91016,0,0,1-.81508.50533" d="M111.8588,359.76681a.90968.90968,0,0,1-.815-.50533l-2.96266-5.92926a.91122.91122,0,0,1,1.63-.815l2.14759,4.29517,2.15167-4.29517a.91122.91122,0,1,1,1.63.815l-2.96663,5.92926a.91016.91016,0,0,1-.81508.50533"
fill="#1f1f1f" /> fill="#1f1f1f" />
<path <path
id="f62823e1-4a85-4ce9-8fd1-15a61a4491b7"
id="a58877fa-d57b-4d74-bbda-a883bf30a365"
data-name="path6937" data-name="path6937"
d="M128.13889,359.76681a.91459.91459,0,0,1-.81508-.50533l-2.96255-5.92926a.91122.91122,0,1,1,1.63-.815l2.14758,4.29517,2.15167-4.29517a.91122.91122,0,0,1,1.63005.815l-2.96256,5.92926a.91635.91635,0,0,1-.81914.50533" d="M128.13889,359.76681a.91459.91459,0,0,1-.81508-.50533l-2.96255-5.92926a.91122.91122,0,1,1,1.63-.815l2.14758,4.29517,2.15167-4.29517a.91122.91122,0,0,1,1.63005.815l-2.96256,5.92926a.91635.91635,0,0,1-.81914.50533"
fill="#1f1f1f" /> fill="#1f1f1f" />
<path <path
id="adb69cb6-76c4-4c27-99f6-d75d78c1c665"
id="aa48af94-af91-4b1f-b663-ef6af4b5cf3b"
data-name="path6939" data-name="path6939"
d="M120.441,359.76681a3.87747,3.87747,0,1,1,2.32692-6.98067.91239.91239,0,1,1-1.09622,1.45879,2.05219,2.05219,0,1,0-1.23068,3.69616,2.02393,2.02393,0,0,0,1.23068-.41157.9124.9124,0,1,1,1.09622,1.45883,3.82664,3.82664,0,0,1-2.32692.77837" d="M120.441,359.76681a3.87747,3.87747,0,1,1,2.32692-6.98067.91239.91239,0,1,1-1.09622,1.45879,2.05219,2.05219,0,1,0-1.23068,3.69616,2.02393,2.02393,0,0,0,1.23068-.41157.9124.9124,0,1,1,1.09622,1.45883,3.82664,3.82664,0,0,1-2.32692.77837"
fill="#1f1f1f" /> fill="#1f1f1f" />
<path <path
id="ec986fea-06d7-4525-8ce3-271ae520a51b"
id="a3b43b3b-5987-49ba-834a-210c6d95bb7d"
data-name="path6941" data-name="path6941"
d="M121.688,355.84246a1.18584,1.18584,0,1,1-1.18583-1.18588,1.18437,1.18437,0,0,1,1.18583,1.18588" d="M121.688,355.84246a1.18584,1.18584,0,1,1-1.18583-1.18588,1.18437,1.18437,0,0,1,1.18583,1.18588"
fill="#1f1f1f" /> fill="#1f1f1f" />
</g> </g>
</g> </g>
<g <g
id="b04dd9aa-fb1f-45f0-8948-883dcd223ffe"
id="be2da85e-1478-4d1b-867a-5b13dcd701fb"
data-name="FND TXT"> data-name="FND TXT">
<g <g
id="g29"> id="g29">
@@ -127,16 +127,16 @@
</g> </g>
</g> </g>
<g <g
id="b3dd6515-ba5c-43bf-91e6-f54e41ad2342"
id="b660f694-0f3e-42b6-93f7-7ede9c067179"
data-name="components" data-name="components"
inkscape:groupmode="layer" inkscape:groupmode="layer"
style="display:none"> style="display:none">
<rect <rect
id="e18c885a-5554-4474-8863-d5fc32e3f96f"
id="abeeb0d9-2e17-439a-8711-ace9121243e1"
data-name="Screen" data-name="Screen"
y="38" y="38"
width="240" width="240"
height="311.71326"
height="310.21326"
x="0" x="0"
style="fill:#ffff00" /> style="fill:#ffff00" />
</g> </g>


+ 1
- 1
src/core/MIDIMap.cpp View File

@@ -485,7 +485,7 @@ struct MIDIMapWidget : ModuleWidget {
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));


MIDIMapDisplay* midiWidget = createWidget<MIDIMapDisplay>(mm2px(Vec(0.0, 12.869))); MIDIMapDisplay* midiWidget = createWidget<MIDIMapDisplay>(mm2px(Vec(0.0, 12.869)));
midiWidget->box.size = mm2px(Vec(50.8, 105.567));
midiWidget->box.size = mm2px(Vec(50.8, 105.059));
midiWidget->setMidiPort(module ? &module->midiInput : NULL); midiWidget->setMidiPort(module ? &module->midiInput : NULL);
midiWidget->setModule(module); midiWidget->setModule(module);
addChild(midiWidget); addChild(midiWidget);


+ 1
- 1
src/core/Notes.cpp View File

@@ -78,7 +78,7 @@ struct NotesWidget : ModuleWidget {
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));


NotesDisplay* notesDisplay = createWidget<NotesDisplay>(mm2px(Vec(0.0, 12.869))); NotesDisplay* notesDisplay = createWidget<NotesDisplay>(mm2px(Vec(0.0, 12.869)));
notesDisplay->box.size = mm2px(Vec(81.28, 105.567));
notesDisplay->box.size = mm2px(Vec(81.28, 105.059));
notesDisplay->setModule(module); notesDisplay->setModule(module);
addChild(notesDisplay); addChild(notesDisplay);
} }


Loading…
Cancel
Save