From c52e1599eb77a28d0a460d5097fb46c55526dbf3 Mon Sep 17 00:00:00 2001
From: thibaudk <thibaud.keller@aquilenet.fr>
Date: Mon, 2 Dec 2024 01:05:53 +0000
Subject: [PATCH] [Controller] add recuring template argument

---
 Hardware/3rdparty/bugui     |  2 +-
 Hardware/Controller.cpp     |  6 +++---
 Hardware/Controller.hpp     |  2 +-
 Hardware/DocumentPlugin.cpp | 22 ++++++++++++----------
 Hardware/DocumentPlugin.hpp |  2 +-
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Hardware/3rdparty/bugui b/Hardware/3rdparty/bugui
index c71a9c1..2a725a7 160000
--- a/Hardware/3rdparty/bugui
+++ b/Hardware/3rdparty/bugui
@@ -1 +1 @@
-Subproject commit c71a9c1e02e3364a16edf3664ca6ef40898b9635
+Subproject commit 2a725a7eb0ec3262059d7f724d2725e33b03c55f
diff --git a/Hardware/Controller.cpp b/Hardware/Controller.cpp
index 7096d50..97667f4 100644
--- a/Hardware/Controller.cpp
+++ b/Hardware/Controller.cpp
@@ -1,4 +1,4 @@
-#include <score/application/ApplicationContext.hpp>
+#include <score/application/GUIApplicationContext.hpp>
 #include <score/actions/ActionManager.hpp>
 #include <Scenario/Application/ScenarioActions.hpp>
 #include <Process/Style/ScenarioStyle.hpp>
@@ -8,7 +8,7 @@
 namespace Hardware
 {
 Controller::Controller(const score::DocumentContext& doc)
-    : bugui::controller{[&doc, this]
+    : bugui::controller<Controller>{[&doc, this]
                         (bugui::commands com, bool shift)
   {
     switch (com)
@@ -121,7 +121,7 @@ void Controller::paint(bugui::painter& painter)
   // Copied from MiniscenarioView
   auto& skin = Process::Style::instance();
   const auto col = skin.IntervalBase().color();
-  painter.set_color(col.red(), col.green(), col.black(), col.alpha());
+  painter.set_color(col.red(), col.green(), col.blue(), col.alpha());
 
   for(const Scenario::IntervalModel& c : scenar->intervals)
   {
diff --git a/Hardware/Controller.hpp b/Hardware/Controller.hpp
index 8d4519c..578e33d 100644
--- a/Hardware/Controller.hpp
+++ b/Hardware/Controller.hpp
@@ -10,7 +10,7 @@
 namespace Hardware
 {
 class SCORE_ADDON_HARDWARE_EXPORT Controller
-    : public bugui::controller
+    : public bugui::controller<Controller>
     , public QObject
 {
   W_OBJECT(Controller)
diff --git a/Hardware/DocumentPlugin.cpp b/Hardware/DocumentPlugin.cpp
index b06298b..52809f8 100644
--- a/Hardware/DocumentPlugin.cpp
+++ b/Hardware/DocumentPlugin.cpp
@@ -24,7 +24,7 @@ namespace Hardware
 using namespace std::literals;
 DocumentPlugin::DocumentPlugin(const score::DocumentContext& doc, QObject* parent)
     : score::DocumentPlugin{doc, "Hardware::DocumentPlugin", parent}
-    , hardware{doc}
+    , ctrlr{doc}
 {
   auto& set = m_context.app.settings<Settings::Model>();
   if(set.getEnabled())
@@ -34,12 +34,13 @@ DocumentPlugin::DocumentPlugin(const score::DocumentContext& doc, QObject* paren
 
   con(
       set, &Settings::Model::EnabledChanged, this,
-      [this](bool b) {
-    if(b)
+      [this](bool b)
+  {
+    if (b)
       create();
     else
       cleanup();
-      },
+  },
       Qt::QueuedConnection);
 }
 
@@ -52,25 +53,26 @@ void DocumentPlugin::on_documentClosing()
 
 void DocumentPlugin::create()
 {
-  if(cstr)
-    cleanup();
+  if (cstr) cleanup();
 
   auto& doc = m_context.document.model().modelDelegate();
   auto scenar = safe_cast<Scenario::ScenarioDocumentModel*>(&doc);
   cstr = &scenar->baseScenario().interval();
 
-  hardware.setup();
+  ctrlr.setup();
 
   // Get Scenario::processModel
   // adapted from
   // src/plugins/score-plugin-scenario/Scenario/Document/ScenarioDocument/ScenarioDocumentModel.cpp#67
-  hardware.setup_scenario(qobject_cast<Scenario::ProcessModel*>(&*cstr->processes.begin()));
+  ctrlr.setup_scenario(
+      qobject_cast<Scenario::ProcessModel*>(
+          &*cstr->processes.begin())
+      );
 }
 
 void DocumentPlugin::cleanup()
 {
-  if(!cstr)
-    return;
+  if (!cstr) return;
 
   cstr = nullptr;
 }
diff --git a/Hardware/DocumentPlugin.hpp b/Hardware/DocumentPlugin.hpp
index e2c1aad..e7c011b 100644
--- a/Hardware/DocumentPlugin.hpp
+++ b/Hardware/DocumentPlugin.hpp
@@ -21,7 +21,7 @@ public:
 
   void on_documentClosing() override;
 
-  Controller hardware;
+  Controller ctrlr;
 
 private:
   void create();