From 9e4fff9a75f0a15f83c1cdd96c86404f8748866b Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Fri, 4 Jun 2021 14:52:37 -0400 Subject: [PATCH] Add RoundKnob, Trimpot, and ScrewSilver graphics from Pyer. --- include/componentlibrary.hpp | 17 ++ res/ComponentLibrary/RoundBigBlackKnob-bg.svg | 120 +++++++++ res/ComponentLibrary/RoundBigBlackKnob.svg | 83 +----- res/ComponentLibrary/RoundBlackKnob-bg.svg | 92 +++++++ res/ComponentLibrary/RoundBlackKnob.svg | 83 +----- .../RoundHugeBlackKnob-bg.svg | 149 +++++++++++ res/ComponentLibrary/RoundHugeBlackKnob.svg | 83 +----- .../RoundLargeBlackKnob-bg.svg | 241 ++++++++++++++++++ res/ComponentLibrary/RoundLargeBlackKnob.svg | 211 +++++++++------ .../RoundSmallBlackKnob-bg.svg | 79 ++++++ res/ComponentLibrary/RoundSmallBlackKnob.svg | 83 +----- res/ComponentLibrary/ScrewSilver.svg | 149 +++++------ res/ComponentLibrary/Trimpot-bg.svg | 15 ++ res/ComponentLibrary/Trimpot.svg | 81 +----- 14 files changed, 978 insertions(+), 508 deletions(-) create mode 100644 res/ComponentLibrary/RoundBigBlackKnob-bg.svg create mode 100644 res/ComponentLibrary/RoundBlackKnob-bg.svg create mode 100644 res/ComponentLibrary/RoundHugeBlackKnob-bg.svg create mode 100644 res/ComponentLibrary/RoundLargeBlackKnob-bg.svg create mode 100644 res/ComponentLibrary/RoundSmallBlackKnob-bg.svg create mode 100644 res/ComponentLibrary/Trimpot-bg.svg diff --git a/include/componentlibrary.hpp b/include/componentlibrary.hpp index 14d0b9cd..7e743173 100644 --- a/include/componentlibrary.hpp +++ b/include/componentlibrary.hpp @@ -237,39 +237,49 @@ struct PB61303Light : Base { //////////////////// struct RoundKnob : app::SvgKnob { + widget::SvgWidget* bg; + RoundKnob() { minAngle = -0.83 * M_PI; maxAngle = 0.83 * M_PI; + + bg = new widget::SvgWidget; + fb->addChildBelow(bg, tw); } }; struct RoundBlackKnob : RoundKnob { RoundBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob-bg.svg"))); } }; struct RoundSmallBlackKnob : RoundKnob { RoundSmallBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob-bg.svg"))); } }; struct RoundLargeBlackKnob : RoundKnob { RoundLargeBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob-bg.svg"))); } }; struct RoundBigBlackKnob : RoundKnob { RoundBigBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob-bg.svg"))); } }; struct RoundHugeBlackKnob : RoundKnob { RoundHugeBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob-bg.svg"))); } }; @@ -572,10 +582,17 @@ struct SynthTechAlco : app::SvgKnob { }; struct Trimpot : app::SvgKnob { + widget::SvgWidget* bg; + Trimpot() { minAngle = -0.75 * M_PI; maxAngle = 0.75 * M_PI; + + bg = new widget::SvgWidget; + fb->addChildBelow(bg, tw); + setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot-bg.svg"))); } }; diff --git a/res/ComponentLibrary/RoundBigBlackKnob-bg.svg b/res/ComponentLibrary/RoundBigBlackKnob-bg.svg new file mode 100644 index 00000000..e56da4ab --- /dev/null +++ b/res/ComponentLibrary/RoundBigBlackKnob-bg.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/RoundBigBlackKnob.svg b/res/ComponentLibrary/RoundBigBlackKnob.svg index 881b9749..adbabe58 100644 --- a/res/ComponentLibrary/RoundBigBlackKnob.svg +++ b/res/ComponentLibrary/RoundBigBlackKnob.svg @@ -1,71 +1,12 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + diff --git a/res/ComponentLibrary/RoundBlackKnob-bg.svg b/res/ComponentLibrary/RoundBlackKnob-bg.svg new file mode 100644 index 00000000..e9dea5a6 --- /dev/null +++ b/res/ComponentLibrary/RoundBlackKnob-bg.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/RoundBlackKnob.svg b/res/ComponentLibrary/RoundBlackKnob.svg index 0fa91ad9..57de780d 100644 --- a/res/ComponentLibrary/RoundBlackKnob.svg +++ b/res/ComponentLibrary/RoundBlackKnob.svg @@ -1,71 +1,12 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + diff --git a/res/ComponentLibrary/RoundHugeBlackKnob-bg.svg b/res/ComponentLibrary/RoundHugeBlackKnob-bg.svg new file mode 100644 index 00000000..58af4146 --- /dev/null +++ b/res/ComponentLibrary/RoundHugeBlackKnob-bg.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/RoundHugeBlackKnob.svg b/res/ComponentLibrary/RoundHugeBlackKnob.svg index cc3c2a7f..43aafa3a 100644 --- a/res/ComponentLibrary/RoundHugeBlackKnob.svg +++ b/res/ComponentLibrary/RoundHugeBlackKnob.svg @@ -1,71 +1,12 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + diff --git a/res/ComponentLibrary/RoundLargeBlackKnob-bg.svg b/res/ComponentLibrary/RoundLargeBlackKnob-bg.svg new file mode 100644 index 00000000..8f770658 --- /dev/null +++ b/res/ComponentLibrary/RoundLargeBlackKnob-bg.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/RoundLargeBlackKnob.svg b/res/ComponentLibrary/RoundLargeBlackKnob.svg index 82e4ae7a..912fa1a1 100644 --- a/res/ComponentLibrary/RoundLargeBlackKnob.svg +++ b/res/ComponentLibrary/RoundLargeBlackKnob.svg @@ -1,71 +1,140 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/RoundSmallBlackKnob-bg.svg b/res/ComponentLibrary/RoundSmallBlackKnob-bg.svg new file mode 100644 index 00000000..49c56e2c --- /dev/null +++ b/res/ComponentLibrary/RoundSmallBlackKnob-bg.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/RoundSmallBlackKnob.svg b/res/ComponentLibrary/RoundSmallBlackKnob.svg index 609d3a87..56afdb14 100644 --- a/res/ComponentLibrary/RoundSmallBlackKnob.svg +++ b/res/ComponentLibrary/RoundSmallBlackKnob.svg @@ -1,71 +1,12 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + diff --git a/res/ComponentLibrary/ScrewSilver.svg b/res/ComponentLibrary/ScrewSilver.svg index 4b0b5e91..f17f4ecd 100644 --- a/res/ComponentLibrary/ScrewSilver.svg +++ b/res/ComponentLibrary/ScrewSilver.svg @@ -1,82 +1,67 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Trimpot-bg.svg b/res/ComponentLibrary/Trimpot-bg.svg new file mode 100644 index 00000000..d93f6739 --- /dev/null +++ b/res/ComponentLibrary/Trimpot-bg.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Trimpot.svg b/res/ComponentLibrary/Trimpot.svg index f8ff0922..b7625ebe 100644 --- a/res/ComponentLibrary/Trimpot.svg +++ b/res/ComponentLibrary/Trimpot.svg @@ -1,71 +1,10 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + +