commit fa78588fe11ab632e7fa048c7615089197210de9
parent 3ee450cab2f5cbdfe9603d368e80f3a3954b17c2
Author: Keith <[email protected]>
Date: Fri, 2 Apr 2021 15:52:30 -0500
Improved graphics handling and updated background to jpeg
Diffstat:
9 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/plugins/SmartAmp/SmartAmp.jucer b/plugins/SmartAmp/SmartAmp.jucer
@@ -5,9 +5,9 @@
jucerFormatVersion="1" pluginCode="sa1" maxBinaryFileSize="20971520">
<MAINGROUP id="ZrSGof" name="SmartAmp">
<GROUP id="{0250E2E8-A733-0AA7-0A08-97085228CF87}" name="Resources">
- <FILE id="h9gaSb" name="amp_clean.png" compile="0" resource="1" file="../../resources/amp_clean.png"/>
- <FILE id="R8YnqS" name="amp_lead.png" compile="0" resource="1" file="../../resources/amp_lead.png"/>
- <FILE id="u62tqr" name="amp_off.png" compile="0" resource="1" file="../../resources/amp_off.png"/>
+ <FILE id="fzEsS4" name="amp_clean.jpg" compile="0" resource="1" file="../../resources/amp_clean.jpg"/>
+ <FILE id="MUKtMi" name="amp_lead.jpg" compile="0" resource="1" file="../../resources/amp_lead.jpg"/>
+ <FILE id="ZHwe69" name="amp_off.jpg" compile="0" resource="1" file="../../resources/amp_off.jpg"/>
<FILE id="XoWq0R" name="bluej_clean_p0088.json" compile="0" resource="1"
file="../../models/bluej_clean_p0088.json"/>
<FILE id="ov9ufS" name="bluej_fullD_p0153.json" compile="0" resource="1"
@@ -85,7 +85,7 @@
<VS2019 targetFolder="Builds/VisualStudio2019">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="SmartAmp"/>
- <CONFIGURATION isDebug="0" name="Release" targetName="SmartAmp" headerPath="C:\Users\rache\Desktop\dev\eigen-3.3.7"/>
+ <CONFIGURATION isDebug="0" name="Release" targetName="SmartAmp" headerPath="C:\Users\rache\Desktop\dev\eigen-3.3.7 C:\Users\KBloemer\Desktop\Archive\eigen-3.3.9\eigen-3.3.9"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_video"/>
diff --git a/plugins/SmartAmp/Source/PluginEditor.cpp b/plugins/SmartAmp/Source/PluginEditor.cpp
@@ -175,16 +175,25 @@ void WaveNetVaAudioProcessorEditor::paint (Graphics& g)
// (Our component is opaque, so we must completely fill the background with a solid colour)
//g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));
if ( current_background == 1 && processor.amp_state == 1 && processor.amp_lead == 1 ) {
- background = ImageCache::getFromMemory(BinaryData::amp_clean_png, BinaryData::amp_clean_pngSize);
+ // Redraw only the clipped part of the background image
+ juce::Rectangle<int> ClipRect = g.getClipBounds();
+ g.drawImage(background_clean, ClipRect.getX(), ClipRect.getY(), ClipRect.getWidth(), ClipRect.getHeight(), ClipRect.getX(), ClipRect.getY(), ClipRect.getWidth(), ClipRect.getHeight());
+
} else if (current_background == 1 && processor.amp_state == 1 && processor.amp_lead == 0) {
- background = ImageCache::getFromMemory(BinaryData::amp_lead_png, BinaryData::amp_lead_pngSize);
+ // Redraw only the clipped part of the background image
+ juce::Rectangle<int> ClipRect = g.getClipBounds();
+ g.drawImage(background_lead, ClipRect.getX(), ClipRect.getY(), ClipRect.getWidth(), ClipRect.getHeight(), ClipRect.getX(), ClipRect.getY(), ClipRect.getWidth(), ClipRect.getHeight());
+
} else {
- background = ImageCache::getFromMemory(BinaryData::amp_off_png, BinaryData::amp_off_pngSize);
+ // Redraw only the clipped part of the background image
+ juce::Rectangle<int> ClipRect = g.getClipBounds();
+ g.drawImage(background_off, ClipRect.getX(), ClipRect.getY(), ClipRect.getWidth(), ClipRect.getHeight(), ClipRect.getX(), ClipRect.getY(), ClipRect.getWidth(), ClipRect.getHeight());
+
}
- g.drawImageAt(background, 0, 0);
+ //g.drawImageAt(background, 0, 0);
- g.setColour (Colours::white);
- g.setFont (15.0f);
+ //g.setColour (Colours::white);
+ //g.setFont (15.0f);
// Should really override the ToggleButton class, but being lazy here
// Set On/Off amp graphic
@@ -290,6 +299,7 @@ void WaveNetVaAudioProcessorEditor::ampOnButtonClicked() {
else {
processor.amp_state = 0;
}
+ resetImages();
repaint();
}
@@ -307,6 +317,8 @@ void WaveNetVaAudioProcessorEditor::ampCleanLeadButtonClicked() {
modelLabel.setText("", juce::NotificationType::dontSendNotification);
processor.loaded_tone_name = "";
processor.custom_tone = 0;
+
+ resetImages();
repaint();
}
@@ -344,3 +356,46 @@ void WaveNetVaAudioProcessorEditor::sliderValueChanged(Slider* slider)
}
+void WaveNetVaAudioProcessorEditor::resetImages()
+{
+ // Set On/Off amp graphic
+ if (processor.amp_state == 0) {
+ ampOnButton.setImages(true, true, true,
+ ImageCache::getFromMemory(BinaryData::power_switch_down_png, BinaryData::power_switch_down_pngSize), 1.0, Colours::transparentWhite,
+ Image(), 1.0, Colours::transparentWhite,
+ ImageCache::getFromMemory(BinaryData::power_switch_down_png, BinaryData::power_switch_down_pngSize), 1.0, Colours::transparentWhite,
+ 0.0);
+ ampLED.setImages(true, true, true,
+ ImageCache::getFromMemory(BinaryData::led_blue_off_png, BinaryData::led_blue_off_pngSize), 1.0, Colours::transparentWhite,
+ Image(), 1.0, Colours::transparentWhite,
+ ImageCache::getFromMemory(BinaryData::led_blue_off_png, BinaryData::led_blue_off_pngSize), 1.0, Colours::transparentWhite,
+ 0.0);
+ }
+ else {
+ ampOnButton.setImages(true, true, true,
+ ImageCache::getFromMemory(BinaryData::power_switch_up_png, BinaryData::power_switch_up_pngSize), 1.0, Colours::transparentWhite,
+ Image(), 1.0, Colours::transparentWhite,
+ ImageCache::getFromMemory(BinaryData::power_switch_up_png, BinaryData::power_switch_up_pngSize), 1.0, Colours::transparentWhite,
+ 0.0);
+ ampLED.setImages(true, true, true,
+ ImageCache::getFromMemory(BinaryData::led_blue_on_png, BinaryData::led_blue_on_pngSize), 1.0, Colours::transparentWhite,
+ Image(), 1.0, Colours::transparentWhite,
+ ImageCache::getFromMemory(BinaryData::led_blue_on_png, BinaryData::led_blue_on_pngSize), 1.0, Colours::transparentWhite,
+ 0.0);
+ }
+ // Set clean/lead switch graphic
+ if (processor.amp_lead == 0) {
+ ampCleanLeadButton.setImages(true, true, true,
+ ImageCache::getFromMemory(BinaryData::power_switch_down_png, BinaryData::power_switch_down_pngSize), 1.0, Colours::transparentWhite,
+ Image(), 1.0, Colours::transparentWhite,
+ ImageCache::getFromMemory(BinaryData::power_switch_down_png, BinaryData::power_switch_down_pngSize), 1.0, Colours::transparentWhite,
+ 0.0);
+ }
+ else {
+ ampCleanLeadButton.setImages(true, true, true,
+ ImageCache::getFromMemory(BinaryData::power_switch_up_png, BinaryData::power_switch_up_pngSize), 1.0, Colours::transparentWhite,
+ Image(), 1.0, Colours::transparentWhite,
+ ImageCache::getFromMemory(BinaryData::power_switch_up_png, BinaryData::power_switch_up_pngSize), 1.0, Colours::transparentWhite,
+ 0.0);
+ }
+}
diff --git a/plugins/SmartAmp/Source/PluginEditor.h b/plugins/SmartAmp/Source/PluginEditor.h
@@ -56,7 +56,10 @@ private:
// LookandFeels
myLookAndFeel ampSilverKnobLAF;
- Image background;
+ //Image background;
+ Image background_clean = ImageCache::getFromMemory(BinaryData::amp_clean_jpg, BinaryData::amp_clean_jpgSize);
+ Image background_lead = ImageCache::getFromMemory(BinaryData::amp_lead_jpg, BinaryData::amp_lead_jpgSize);
+ Image background_off = ImageCache::getFromMemory(BinaryData::amp_off_jpg, BinaryData::amp_off_jpgSize);
int current_background = 1;
TextButton loadButton;
@@ -67,6 +70,7 @@ private:
virtual void sliderValueChanged(Slider* slider) override;
void ampOnButtonClicked();
void ampCleanLeadButtonClicked();
+ void resetImages();
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WaveNetVaAudioProcessorEditor)
};
diff --git a/resources/amp_clean.jpg b/resources/amp_clean.jpg
Binary files differ.
diff --git a/resources/amp_clean.png b/resources/amp_clean.png
Binary files differ.
diff --git a/resources/amp_lead.jpg b/resources/amp_lead.jpg
Binary files differ.
diff --git a/resources/amp_lead.png b/resources/amp_lead.png
Binary files differ.
diff --git a/resources/amp_off.jpg b/resources/amp_off.jpg
Binary files differ.
diff --git a/resources/amp_off.png b/resources/amp_off.png
Binary files differ.
