From 42a52f7ed0e16fd99f3649157d04755258c58785 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 13 Mar 2018 04:32:57 -0400 Subject: [PATCH] Change colors of Rogan knobs --- res/ComponentLibrary/Rogan1PGreen.svg | 12 ++++++------ res/ComponentLibrary/Rogan1PRed.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan1PSGreen.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan1PSRed.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan2PGreen.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan2PRed.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan2PSGreen.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan2PSRed.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan3PGreen.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan3PRed.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan3PSGreen.svg | 16 ++++++++-------- res/ComponentLibrary/Rogan3PSRed.svg | 12 ++++++------ src/app/SVGKnob.cpp | 2 +- 13 files changed, 93 insertions(+), 93 deletions(-) diff --git a/res/ComponentLibrary/Rogan1PGreen.svg b/res/ComponentLibrary/Rogan1PGreen.svg index 2c08b7ec..6121583d 100644 --- a/res/ComponentLibrary/Rogan1PGreen.svg +++ b/res/ComponentLibrary/Rogan1PGreen.svg @@ -392,9 +392,9 @@ inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" + inkscape:window-width="2560" + inkscape:window-height="1440" + inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" units="px" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,11 +428,11 @@ inkscape:connector-curvature="0" id="path7717" d="m 60.430463,91.091863 c 0,2.182813 -1.768016,3.950836 -3.950828,3.950836 -2.181437,0 -3.950829,-1.768023 -3.950829,-3.950836 0,-2.181433 1.769392,-3.949456 3.950829,-3.949456 2.182812,0 3.950828,1.768023 3.950828,3.949456" - style="fill:#42c5bd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan1PRed.svg b/res/ComponentLibrary/Rogan1PRed.svg index 668d6f70..6527f8f7 100644 --- a/res/ComponentLibrary/Rogan1PRed.svg +++ b/res/ComponentLibrary/Rogan1PRed.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="35.570219" + inkscape:cx="4.6773619" inkscape:cy="11.017728" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,11 +428,11 @@ inkscape:connector-curvature="0" id="path7725" d="m 58.530155,91.196795 c 0,2.182812 -1.768016,3.950836 -3.950828,3.950836 -2.181437,0 -3.950829,-1.768024 -3.950829,-3.950836 0,-2.181433 1.769392,-3.949457 3.950829,-3.949457 2.182812,0 3.950828,1.768024 3.950828,3.949457" - style="fill:#e147c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan1PSGreen.svg b/res/ComponentLibrary/Rogan1PSGreen.svg index 2fd583f3..8d0772b0 100644 --- a/res/ComponentLibrary/Rogan1PSGreen.svg +++ b/res/ComponentLibrary/Rogan1PSGreen.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="45.219096" + inkscape:cx="14.326239" inkscape:cy="27.987957" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,7 +428,7 @@ inkscape:connector-curvature="0" id="path7691" d="m 57.439346,94.226115 c 0,2.181437 -1.769392,3.950836 -3.950829,3.950836 -2.182812,0 -3.952204,-1.769399 -3.952204,-3.950836 0,-2.182812 1.769392,-3.950832 3.952204,-3.950832 2.181437,0 3.950829,1.76802 3.950829,3.950832" - style="fill:#42c5bd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan1PSRed.svg b/res/ComponentLibrary/Rogan1PSRed.svg index 787a11c8..3d3ff086 100644 --- a/res/ComponentLibrary/Rogan1PSRed.svg +++ b/res/ComponentLibrary/Rogan1PSRed.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="50.246257" + inkscape:cx="19.3534" inkscape:cy="20.515109" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,7 +428,7 @@ inkscape:connector-curvature="0" id="path7699" d="m 56.109243,92.248924 c 0,2.181437 -1.769392,3.950836 -3.950829,3.950836 -2.182812,0 -3.952204,-1.769399 -3.952204,-3.950836 0,-2.182812 1.769392,-3.950832 3.952204,-3.950832 2.181437,0 3.950829,1.76802 3.950829,3.950832" - style="fill:#e147c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan2PGreen.svg b/res/ComponentLibrary/Rogan2PGreen.svg index cf860118..95ddfe7a 100644 --- a/res/ComponentLibrary/Rogan2PGreen.svg +++ b/res/ComponentLibrary/Rogan2PGreen.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="19.905014" + inkscape:cx="-10.987843" inkscape:cy="37.67402" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,11 +428,11 @@ inkscape:connector-curvature="0" id="path7673" d="m 63.549962,97.739725 c 0,2.382635 -1.931977,4.314635 -4.31462,4.314635 -2.382629,0 -4.316017,-1.932 -4.316017,-4.314635 0,-2.384005 1.933388,-4.314638 4.316017,-4.314638 2.382643,0 4.31462,1.930633 4.31462,4.314638" - style="fill:#42c5bd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan2PRed.svg b/res/ComponentLibrary/Rogan2PRed.svg index 370a8c46..7ee556ca 100644 --- a/res/ComponentLibrary/Rogan2PRed.svg +++ b/res/ComponentLibrary/Rogan2PRed.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="51.516994" + inkscape:cx="20.624137" inkscape:cy="37.321731" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,11 +428,11 @@ inkscape:connector-curvature="0" id="path7679" d="m 55.185959,97.646518 c 0,2.382632 -1.931991,4.314642 -4.314616,4.314642 -2.38263,0 -4.316018,-1.93201 -4.316018,-4.314642 0,-2.384005 1.933388,-4.314638 4.316018,-4.314638 2.382625,0 4.314616,1.930633 4.314616,4.314638" - style="fill:#e147c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan2PSGreen.svg b/res/ComponentLibrary/Rogan2PSGreen.svg index e84b1ff5..7ce58c54 100644 --- a/res/ComponentLibrary/Rogan2PSGreen.svg +++ b/res/ComponentLibrary/Rogan2PSGreen.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="17.70635" + inkscape:cx="-13.186507" inkscape:cy="40.123343" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -433,11 +433,11 @@ inkscape:connector-curvature="0" id="path7651" d="m 65.728163,96.79133 c 0,2.382629 -1.932012,4.31464 -4.316017,4.31464 -2.382626,0 -4.314638,-1.932011 -4.314638,-4.31464 0,-2.384005 1.932012,-4.314638 4.314638,-4.314638 2.384005,0 4.316017,1.930633 4.316017,4.314638" - style="fill:#42c5bd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan2PSRed.svg b/res/ComponentLibrary/Rogan2PSRed.svg index 17be8303..4f05e98d 100644 --- a/res/ComponentLibrary/Rogan2PSRed.svg +++ b/res/ComponentLibrary/Rogan2PSRed.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="28.209324" + inkscape:cx="-2.6835331" inkscape:cy="41.164604" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -433,11 +433,11 @@ inkscape:connector-curvature="0" id="path7659" d="m 62.949251,97.066827 c 0,2.382629 -1.932012,4.314643 -4.316017,4.314643 -2.382626,0 -4.314638,-1.932014 -4.314638,-4.314643 0,-2.384005 1.932012,-4.314638 4.314638,-4.314638 2.384005,0 4.316017,1.930633 4.316017,4.314638" - style="fill:#e147c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan3PGreen.svg b/res/ComponentLibrary/Rogan3PGreen.svg index b97092d5..16143e37 100644 --- a/res/ComponentLibrary/Rogan3PGreen.svg +++ b/res/ComponentLibrary/Rogan3PGreen.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="32.218991" + inkscape:cx="1.3261339" inkscape:cy="50.179458" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,11 +428,11 @@ inkscape:connector-curvature="0" id="path7631" d="m 62.261116,99.730359 c 0,2.743681 -2.222775,4.967831 -4.967827,4.967831 -2.742293,0 -4.966448,-2.22415 -4.966448,-4.967831 0,-2.742292 2.224155,-4.966443 4.966448,-4.966443 2.745052,0 4.967827,2.224151 4.967827,4.966443" - style="fill:#42c5bd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan3PRed.svg b/res/ComponentLibrary/Rogan3PRed.svg index d27f1cc2..c97785eb 100644 --- a/res/ComponentLibrary/Rogan3PRed.svg +++ b/res/ComponentLibrary/Rogan3PRed.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="38.452993" + inkscape:cx="7.5601359" inkscape:cy="47.306337" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,11 +428,11 @@ inkscape:connector-curvature="0" id="path7637" d="m 60.611703,98.97018 c 0,2.74368 -2.222775,4.96783 -4.967827,4.96783 -2.742293,0 -4.966448,-2.22415 -4.966448,-4.96783 0,-2.742297 2.224155,-4.966448 4.966448,-4.966448 2.745052,0 4.967827,2.224151 4.967827,4.966448" - style="fill:#e147c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan3PSGreen.svg b/res/ComponentLibrary/Rogan3PSGreen.svg index eead1ffa..9a1d2a7b 100644 --- a/res/ComponentLibrary/Rogan3PSGreen.svg +++ b/res/ComponentLibrary/Rogan3PSGreen.svg @@ -387,15 +387,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="39.52628" + inkscape:cx="8.6334229" inkscape:cy="35.160107" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="2560" + inkscape:window-height="1422" + inkscape:window-x="0" + inkscape:window-y="18" inkscape:window-maximized="0" units="px" fit-margin-top="0" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,7 +428,7 @@ inkscape:connector-curvature="0" id="path7607" d="m 62.688998,93.978827 c 0,3.064757 -2.484604,5.550739 -5.55074,5.550739 -3.064757,0 -5.549357,-2.485982 -5.549357,-5.550739 0,-3.064757 2.4846,-5.54936 5.549357,-5.54936 3.066136,0 5.55074,2.484603 5.55074,5.54936" - style="fill:#42c5bd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#00a1a7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/res/ComponentLibrary/Rogan3PSRed.svg b/res/ComponentLibrary/Rogan3PSRed.svg index 6ab94ed1..7e5e431d 100644 --- a/res/ComponentLibrary/Rogan3PSRed.svg +++ b/res/ComponentLibrary/Rogan3PSRed.svg @@ -392,9 +392,9 @@ inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1274" - inkscape:window-height="1434" - inkscape:window-x="1280" + inkscape:window-width="2560" + inkscape:window-height="1440" + inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" units="px" @@ -410,7 +410,7 @@ image/svg+xml - + @@ -428,7 +428,7 @@ inkscape:connector-curvature="0" id="path7615" d="m 62.71026,94.193113 c 0,3.064757 -2.484604,5.550739 -5.55074,5.550739 -3.064757,0 -5.549357,-2.485982 -5.549357,-5.550739 0,-3.064757 2.4846,-5.54936 5.549357,-5.54936 3.066136,0 5.55074,2.484603 5.55074,5.54936" - style="fill:#e147c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> + style="fill:#da4061;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" /> diff --git a/src/app/SVGKnob.cpp b/src/app/SVGKnob.cpp index 5a53b943..df3f6cdf 100644 --- a/src/app/SVGKnob.cpp +++ b/src/app/SVGKnob.cpp @@ -20,7 +20,7 @@ void SVGKnob::setSVG(std::shared_ptr svg) { tw->box.size = sw->box.size; box.size = sw->box.size; shadow->box.size = sw->box.size; - shadow->box.pos = Vec(0, 4); + shadow->box.pos = Vec(0, sw->box.size.y * 0.1); // shadow->box = shadow->box.grow(Vec(2, 2)); }