1ere tentative IHM IA

Appli/TouchGFX/gui/src/echo_screen/EchoPresenter.cpp

@@ -0,0 +1,15 @@
+#include <gui/echo_screen/EchoView.hpp>
+#include <gui/echo_screen/EchoPresenter.hpp>
+
+EchoPresenter::EchoPresenter(EchoView& v)
+    : view(v)
+{
+}
+
+void EchoPresenter::activate()
+{
+}
+
+void EchoPresenter::deactivate()
+{
+}

Appli/TouchGFX/gui/src/echo_screen/EchoView.cpp

@@ -0,0 +1,46 @@
+#include <gui/echo_screen/EchoView.hpp>
+#include <audio_effects.h>
+#include <touchgfx/Color.hpp>
+#include <texts/TextKeysAndLanguages.hpp>
+
+EchoView::EchoView()
+{
+}
+
+void EchoView::setupScreen()
+{
+    EchoViewBase::setupScreen();
+}
+
+void EchoView::tearDownScreen()
+{
+    EchoViewBase::tearDownScreen();
+}
+
+void EchoView::goBack()
+{
+    application().gotoOverviewScreenBlockTransition();
+}
+
+void EchoView::toggleEnabled()
+{
+    bool en = !AudioEffects_GetParams()->echo.enabled;
+    AudioEffects_GetParams()->echo.enabled = en;
+    enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
+    enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.invalidate();
+}
+
+void EchoView::param1Changed(int value)
+{
+    AudioEffects_GetParams()->echo.delay_ms = value * 10.0f;
+}
+void EchoView::param2Changed(int value)
+{
+    AudioEffects_GetParams()->echo.feedback = value / 100.0f * 0.95f;
+}
+void EchoView::param3Changed(int value)
+{
+    AudioEffects_GetParams()->echo.mix = value / 100.0f;
+}

Appli/TouchGFX/gui/src/equalizer_screen/EqualizerPresenter.cpp

@@ -0,0 +1,15 @@
+#include <gui/equalizer_screen/EqualizerView.hpp>
+#include <gui/equalizer_screen/EqualizerPresenter.hpp>
+
+EqualizerPresenter::EqualizerPresenter(EqualizerView& v)
+    : view(v)
+{
+}
+
+void EqualizerPresenter::activate()
+{
+}
+
+void EqualizerPresenter::deactivate()
+{
+}

Appli/TouchGFX/gui/src/equalizer_screen/EqualizerView.cpp

@@ -0,0 +1,74 @@
+#include <gui/equalizer_screen/EqualizerView.hpp>
+#include <audio_effects.h>
+#include <touchgfx/Color.hpp>
+#include <texts/TextKeysAndLanguages.hpp>
+
+EqualizerView::EqualizerView()
+{
+}
+
+void EqualizerView::setupScreen()
+{
+    EqualizerViewBase::setupScreen();
+}
+
+void EqualizerView::tearDownScreen()
+{
+    EqualizerViewBase::tearDownScreen();
+}
+
+void EqualizerView::goBack()
+{
+    application().gotoOverviewScreenBlockTransition();
+}
+
+void EqualizerView::toggleEnabled()
+{
+    bool en = !AudioEffects_GetParams()->equalizer.enabled;
+    AudioEffects_GetParams()->equalizer.enabled = en;
+    enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
+    enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.invalidate();
+}
+
+void EqualizerView::band1Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[0].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band2Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[1].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band3Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[2].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band4Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[3].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band5Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[4].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band6Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[5].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band7Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[6].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band8Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[7].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band9Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[8].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}
+void EqualizerView::band10Changed(int value)
+{
+    AudioEffects_GetParams()->equalizer.bands[9].gain_db = (value / 100.0f) * 48.0f - 24.0f;
+}

Appli/TouchGFX/gui/src/overdrive_screen/OverdrivePresenter.cpp

@@ -0,0 +1,15 @@
+#include <gui/overdrive_screen/OverdriveView.hpp>
+#include <gui/overdrive_screen/OverdrivePresenter.hpp>
+
+OverdrivePresenter::OverdrivePresenter(OverdriveView& v)
+    : view(v)
+{
+}
+
+void OverdrivePresenter::activate()
+{
+}
+
+void OverdrivePresenter::deactivate()
+{
+}

Appli/TouchGFX/gui/src/overdrive_screen/OverdriveView.cpp

@@ -0,0 +1,46 @@
+#include <gui/overdrive_screen/OverdriveView.hpp>
+#include <audio_effects.h>
+#include <touchgfx/Color.hpp>
+#include <texts/TextKeysAndLanguages.hpp>
+
+OverdriveView::OverdriveView()
+{
+}
+
+void OverdriveView::setupScreen()
+{
+    OverdriveViewBase::setupScreen();
+}
+
+void OverdriveView::tearDownScreen()
+{
+    OverdriveViewBase::tearDownScreen();
+}
+
+void OverdriveView::goBack()
+{
+    application().gotoOverviewScreenBlockTransition();
+}
+
+void OverdriveView::toggleEnabled()
+{
+    bool en = !AudioEffects_GetParams()->overdrive.enabled;
+    AudioEffects_GetParams()->overdrive.enabled = en;
+    enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
+    enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.invalidate();
+}
+
+void OverdriveView::param1Changed(int value)
+{
+    AudioEffects_GetParams()->overdrive.drive = value / 100.0f;
+}
+void OverdriveView::param2Changed(int value)
+{
+    AudioEffects_GetParams()->overdrive.tone = value / 100.0f;
+}
+void OverdriveView::param3Changed(int value)
+{
+    AudioEffects_GetParams()->overdrive.level = value / 100.0f;
+}

Appli/TouchGFX/gui/src/overview_screen/OverviewPresenter.cpp

@@ -0,0 +1,15 @@
+#include <gui/overview_screen/OverviewView.hpp>
+#include <gui/overview_screen/OverviewPresenter.hpp>
+
+OverviewPresenter::OverviewPresenter(OverviewView& v)
+    : view(v)
+{
+}
+
+void OverviewPresenter::activate()
+{
+}
+
+void OverviewPresenter::deactivate()
+{
+}

Appli/TouchGFX/gui/src/overview_screen/OverviewView.cpp

@@ -0,0 +1,15 @@
+#include <gui/overview_screen/OverviewView.hpp>
+
+OverviewView::OverviewView()
+{
+}
+
+void OverviewView::setupScreen()
+{
+    OverviewViewBase::setupScreen();
+}
+
+void OverviewView::tearDownScreen()
+{
+    OverviewViewBase::tearDownScreen();
+}

Appli/TouchGFX/gui/src/reverb_screen/ReverbPresenter.cpp

@@ -0,0 +1,15 @@
+#include <gui/reverb_screen/ReverbView.hpp>
+#include <gui/reverb_screen/ReverbPresenter.hpp>
+
+ReverbPresenter::ReverbPresenter(ReverbView& v)
+    : view(v)
+{
+}
+
+void ReverbPresenter::activate()
+{
+}
+
+void ReverbPresenter::deactivate()
+{
+}

Appli/TouchGFX/gui/src/reverb_screen/ReverbView.cpp

@@ -0,0 +1,46 @@
+#include <gui/reverb_screen/ReverbView.hpp>
+#include <audio_effects.h>
+#include <touchgfx/Color.hpp>
+#include <texts/TextKeysAndLanguages.hpp>
+
+ReverbView::ReverbView()
+{
+}
+
+void ReverbView::setupScreen()
+{
+    ReverbViewBase::setupScreen();
+}
+
+void ReverbView::tearDownScreen()
+{
+    ReverbViewBase::tearDownScreen();
+}
+
+void ReverbView::goBack()
+{
+    application().gotoOverviewScreenBlockTransition();
+}
+
+void ReverbView::toggleEnabled()
+{
+    bool en = !AudioEffects_GetParams()->reverb.enabled;
+    AudioEffects_GetParams()->reverb.enabled = en;
+    enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
+    enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.invalidate();
+}
+
+void ReverbView::param1Changed(int value)
+{
+    AudioEffects_GetParams()->reverb.room_size = value / 100.0f;
+}
+void ReverbView::param2Changed(int value)
+{
+    AudioEffects_GetParams()->reverb.damping = value / 100.0f;
+}
+void ReverbView::param3Changed(int value)
+{
+    AudioEffects_GetParams()->reverb.mix = value / 100.0f;
+}

Appli/TouchGFX/gui/src/saturation_screen/SaturationPresenter.cpp

@@ -0,0 +1,15 @@
+#include <gui/saturation_screen/SaturationView.hpp>
+#include <gui/saturation_screen/SaturationPresenter.hpp>
+
+SaturationPresenter::SaturationPresenter(SaturationView& v)
+    : view(v)
+{
+}
+
+void SaturationPresenter::activate()
+{
+}
+
+void SaturationPresenter::deactivate()
+{
+}

Appli/TouchGFX/gui/src/saturation_screen/SaturationView.cpp

@@ -0,0 +1,42 @@
+#include <gui/saturation_screen/SaturationView.hpp>
+#include <audio_effects.h>
+#include <touchgfx/Color.hpp>
+#include <texts/TextKeysAndLanguages.hpp>
+
+SaturationView::SaturationView()
+{
+}
+
+void SaturationView::setupScreen()
+{
+    SaturationViewBase::setupScreen();
+}
+
+void SaturationView::tearDownScreen()
+{
+    SaturationViewBase::tearDownScreen();
+}
+
+void SaturationView::goBack()
+{
+    application().gotoOverviewScreenBlockTransition();
+}
+
+void SaturationView::toggleEnabled()
+{
+    bool en = !AudioEffects_GetParams()->saturation.enabled;
+    AudioEffects_GetParams()->saturation.enabled = en;
+    enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
+    enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
+    enableToggle.invalidate();
+}
+
+void SaturationView::param1Changed(int value)
+{
+    AudioEffects_GetParams()->saturation.drive = value / 100.0f;
+}
+void SaturationView::param2Changed(int value)
+{
+    AudioEffects_GetParams()->saturation.level = value / 100.0f;
+}

Appli/TouchGFX/gui/src/screen1_screen/Screen1Presenter.cpp

@@ -1,18 +0,0 @@
-#include <gui/screen1_screen/Screen1View.hpp>
-#include <gui/screen1_screen/Screen1Presenter.hpp>
-
-Screen1Presenter::Screen1Presenter(Screen1View& v)
-    : view(v)
-{
-
-}
-
-void Screen1Presenter::activate()
-{
-
-}
-
-void Screen1Presenter::deactivate()
-{
-
-}

Appli/TouchGFX/gui/src/screen1_screen/Screen1View.cpp

@@ -1,20 +0,0 @@
-#include <gui/screen1_screen/Screen1View.hpp>
-
-Screen1View::Screen1View()
-{
-
-}
-
-void Screen1View::setupScreen()
-{
-    Screen1ViewBase::setupScreen();
-}
-
-void Screen1View::tearDownScreen()
-{
-    Screen1ViewBase::tearDownScreen();
-}
-void Screen1View::slider1Clicked(int value)
-{
-	gauge1.setValue(value);
-}