add generic initialization mechanism in AlienWindow

chrxh · Oct 20, 2024 · a2de5bf · a2de5bf
1 parent 0a88f00
commit a2de5bf
Show file tree

Hide file tree

Showing 35 changed files with 138 additions and 140 deletions.
diff --git a/source/Gui/AlienWindow.cpp b/source/Gui/AlienWindow.cpp
diff --git a/source/Gui/AlienWindow.h b/source/Gui/AlienWindow.h
@@ -1,29 +1,108 @@
 #pragma once
 
+#include <imgui.h>
+
+#include "Base/GlobalSettings.h"
+
 #include "Definitions.h"
+#include "StyleRepository.h"
 #include "ShutdownInterface.h"
+#include "ShutdownController.h"
+#include "WindowController.h"
 
+template<typename ...Dependencies>
 class AlienWindow : public ShutdownInterface
 {
 public:
     AlienWindow(std::string const& title, std::string const& settingsNode, bool defaultOn);
 
+    void init(Dependencies... dependencies);
+
     void process();
 
     bool isOn() const;
     void setOn(bool value);
 
+
 protected:
+    virtual void initIntern(Dependencies... dependencies) {}
     virtual void shutdownIntern() {}
     virtual void processIntern() = 0;
     virtual void processBackground() {}
     virtual void processActivated() {}
 
     bool _sizeInitialized = false;
     bool _on = false;
+    bool _defaultOn = false;
     std::string _title; 
     std::string _settingsNode;
 
 private:
     void shutdown() override;
-};
+};
+
+/************************************************************************/
+/* Implementation                                                       */
+/************************************************************************/
+
+template <typename ... Dependencies>
+AlienWindow<Dependencies...>::AlienWindow(std::string const& title, std::string const& settingsNode, bool defaultOn)
+    : _title(title)
+    , _settingsNode(settingsNode)
+    , _defaultOn(defaultOn)
+{}
+
+template <typename ... Dependencies>
+void AlienWindow<Dependencies...>::init(Dependencies... dependencies)
+{
+    _on = GlobalSettings::get().getBool(_settingsNode + ".active", _defaultOn);
+    ShutdownController::get().registerObject(this);
+    initIntern(dependencies...);
+}
+
+template <typename ... Dependencies>
+void AlienWindow<Dependencies...>::process()
+{
+    processBackground();
+
+    if (!_on) {
+        return;
+    }
+    ImGui::PushID(_title.c_str());
+
+    ImGui::SetNextWindowBgAlpha(Const::WindowAlpha * ImGui::GetStyle().Alpha);
+    if (ImGui::Begin(_title.c_str(), &_on)) {
+        if (!_sizeInitialized) {
+            auto size = ImGui::GetWindowSize();
+            auto factor = WindowController::get().getContentScaleFactor() / WindowController::get().getLastContentScaleFactor();
+            ImGui::SetWindowSize({size.x * factor, size.y * factor});
+            _sizeInitialized = true;
+        }
+        processIntern();
+    }
+    ImGui::End();
+
+    ImGui::PopID();
+}
+
+template <typename ... Dependencies>
+bool AlienWindow<Dependencies...>::isOn() const
+{
+    return _on;
+}
+
+template <typename ... Dependencies>
+void AlienWindow<Dependencies...>::setOn(bool value)
+{
+    _on = value;
+    if (value) {
+        processActivated();
+    }
+}
+
+template <typename ... Dependencies>
+void AlienWindow<Dependencies...>::shutdown()
+{
+    shutdownIntern();
+    GlobalSettings::get().setBool(_settingsNode + ".active", _on);
+}
diff --git a/source/Gui/AutosaveWindow.cpp b/source/Gui/AutosaveWindow.cpp
@@ -16,7 +16,11 @@ namespace
     auto constexpr AutosaveSenderId = "Autosave";
 }
 
-void AutosaveWindow::init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade)
+AutosaveWindow::AutosaveWindow()
+    : AlienWindow("Autosave (work in progress)", "windows.autosave", false)
+{}
+
+void AutosaveWindow::initIntern(SimulationFacade simulationFacade, PersisterFacade persisterFacade)
 {
     _simulationFacade = simulationFacade;
     _persisterFacade = persisterFacade;
@@ -30,10 +34,6 @@ void AutosaveWindow::init(SimulationFacade const& simulationFacade, PersisterFac
     _numberOfFiles = GlobalSettings::get().getInt("windows.autosave.number of files", _origNumberOfFiles);
 }
 
-AutosaveWindow::AutosaveWindow()
-    : AlienWindow("Autosave (work in progress)", "windows.autosave", false)
-{}
-
 void AutosaveWindow::shutdownIntern()
 {
     GlobalSettings::get().setBool("windows.autosave.settings.open", _settingsOpen);

diff --git a/source/Gui/AutosaveWindow.h b/source/Gui/AutosaveWindow.h
@@ -23,18 +23,15 @@ struct SavepointEntry
     uint64_t timestep;
 };
 
-class AutosaveWindow : public AlienWindow
+class AutosaveWindow : public AlienWindow<SimulationFacade, PersisterFacade>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(AutosaveWindow);
 
-public:
-    void init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade);
-
 private:
     AutosaveWindow();
 
+    void initIntern(SimulationFacade simulationFacade, PersisterFacade persisterFacade) override;
     void shutdownIntern() override;
-
     void processIntern() override;
 
     void processToolbar();

diff --git a/source/Gui/BrowserWindow.cpp b/source/Gui/BrowserWindow.cpp
@@ -73,7 +73,7 @@ namespace
         {WorkspaceType_Private, std::string("private")}};
 }
 
-void BrowserWindow::init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade)
+void BrowserWindow::initIntern(SimulationFacade simulationFacade, PersisterFacade persisterFacade)
 {
     _simulationFacade = simulationFacade;
     _persisterFacade = persisterFacade;

diff --git a/source/Gui/BrowserWindow.h b/source/Gui/BrowserWindow.h
@@ -17,12 +17,11 @@
 #include "Definitions.h"
 #include "LastSessionBrowserData.h"
 
-class BrowserWindow : public AlienWindow
+class BrowserWindow : public AlienWindow<SimulationFacade, PersisterFacade>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(BrowserWindow);
 
 public:
-    void init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade);
 
     void onRefresh();
     WorkspaceType getCurrentWorkspaceType() const;
@@ -32,6 +31,7 @@ class BrowserWindow : public AlienWindow
 private:
     BrowserWindow();
 
+    void initIntern(SimulationFacade simulationFacade, PersisterFacade persisterFacade) override;
     void shutdownIntern() override;
 
     struct WorkspaceId

diff --git a/source/Gui/CMakeLists.txt b/source/Gui/CMakeLists.txt
@@ -9,7 +9,6 @@ PUBLIC
     AlienDialog.h
     AlienImGui.cpp
     AlienImGui.h
-    AlienWindow.cpp
     AlienWindow.h
     AutosaveController.cpp
     AutosaveController.h

diff --git a/source/Gui/CreatorWindow.cpp b/source/Gui/CreatorWindow.cpp
@@ -35,7 +35,7 @@ namespace
     auto const RightColumnWidth = 160.0f;
 }
 
-void CreatorWindow::init(SimulationFacade const& simulationFacade)
+void CreatorWindow::initIntern(SimulationFacade simulationFacade)
 {
     _simulationFacade = simulationFacade;
 }

diff --git a/source/Gui/CreatorWindow.h b/source/Gui/CreatorWindow.h
@@ -18,20 +18,19 @@ enum CreationMode_
     CreationMode_Drawing
 };
 
-class CreatorWindow : public AlienWindow
+class CreatorWindow : public AlienWindow<SimulationFacade>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(CreatorWindow);
 
 public:
-    void init(SimulationFacade const& simulationFacade);
-
     void onDrawing();
     void finishDrawing();
 
 private:
     CreatorWindow();
 
-    void processIntern();
+    void initIntern(SimulationFacade simulationFacade) override;
+    void processIntern() override;
 
     void createCell();
     void createParticle();

diff --git a/source/Gui/Definitions.h b/source/Gui/Definitions.h
@@ -5,7 +5,7 @@
 class _MainWindow;
 using MainWindow = std::shared_ptr<_MainWindow>;
 
-class AlienWindow;
+//class AlienWindow;
 
 class SimulationView;
 

diff --git a/source/Gui/EditorController.cpp b/source/Gui/EditorController.cpp
@@ -28,6 +28,8 @@ namespace
 void EditorController::init(SimulationFacade const& simulationFacade)
 {
     _simulationFacade = simulationFacade;
+
+    SelectionWindow::get().init();
     EditorModel::get().init(_simulationFacade);
     GenomeEditorWindow::get().init(_simulationFacade);
     PatternEditorWindow::get().init(_simulationFacade);

diff --git a/source/Gui/GenomeEditorWindow.cpp b/source/Gui/GenomeEditorWindow.cpp
@@ -40,7 +40,7 @@ namespace
     auto const SubWindowRightMargin = 0.0f;
 }
 
-void GenomeEditorWindow::init(SimulationFacade const& simulationFacade)
+void GenomeEditorWindow::initIntern(SimulationFacade simulationFacade)
 {
     _simulationFacade = simulationFacade;
 

diff --git a/source/Gui/GenomeEditorWindow.h b/source/Gui/GenomeEditorWindow.h
@@ -8,19 +8,18 @@
 #include "AlienWindow.h"
 #include "Definitions.h"
 
-class GenomeEditorWindow : public AlienWindow
+class GenomeEditorWindow : public AlienWindow<SimulationFacade>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(GenomeEditorWindow);
 
 public:
-    void init(SimulationFacade const& simulationFacade);
-
     void openTab(GenomeDescription const& genome, bool openGenomeEditorIfClosed = true);
     GenomeDescription const& getCurrentGenome() const;
 
 private:
     GenomeEditorWindow();
 
+    void initIntern(SimulationFacade simulationFacade) override;
     void shutdownIntern() override;
 
     void processIntern() override;

diff --git a/source/Gui/GettingStartedWindow.cpp b/source/Gui/GettingStartedWindow.cpp
@@ -10,7 +10,7 @@
 #include <windows.h>
 #endif
 
-void GettingStartedWindow::init()
+void GettingStartedWindow::initIntern()
 {
     _showAfterStartup = _on;
 }

diff --git a/source/Gui/GettingStartedWindow.h b/source/Gui/GettingStartedWindow.h
@@ -6,16 +6,14 @@
 #include "Definitions.h"
 #include "AlienWindow.h"
 
-class GettingStartedWindow : public AlienWindow
+class GettingStartedWindow : public AlienWindow<>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(GettingStartedWindow);
 
-public:
-    void init();
-
 private:
     GettingStartedWindow();
 
+    void initIntern() override;
     void shutdownIntern() override;
     void processIntern() override;
 

diff --git a/source/Gui/LogWindow.cpp b/source/Gui/LogWindow.cpp
@@ -10,7 +10,7 @@
 #include "GuiLogger.h"
 #include "AlienImGui.h"
 
-void LogWindow::init(GuiLogger const& logger)
+void LogWindow::initIntern(GuiLogger logger)
 {
     _logger = logger;
     _verbose = GlobalSettings::get().getBool("windows.log.verbose", false);

diff --git a/source/Gui/LogWindow.h b/source/Gui/LogWindow.h
@@ -5,16 +5,14 @@
 #include "Definitions.h"
 #include "AlienWindow.h"
 
-class LogWindow : public AlienWindow
+class LogWindow : public AlienWindow<GuiLogger>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(LogWindow);
 
-public:
-    void init(GuiLogger const& logger);
-
 private:
     LogWindow();
 
+    void initIntern(GuiLogger logger) override;
     void shutdownIntern() override;
     void processIntern() override;