Some work on adding back/reimplementing module settings that can be displayed in the UI

Author: PapeCoding

Src/Common/ModuleSettings.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include "Parameters.h"
+#include <string>
+#include <unordered_map>
+
 enum setting_t {
   T_BOOL,
   T_LONG,
@@ -19,3 +23,52 @@ struct _SModuleSettings {
   const char *szDescription;
 };
 
+enum SettingsType
+{
+  Switch,
+  TextField,
+  Slider,
+  Enum,
+  Step
+};
+
+namespace Dasher {
+  namespace Settings {
+    struct ModuleSetting
+    {
+      SettingsType Type;
+      ModuleSetting(SettingsType Type, Dasher::Parameter Param, std::string Description) : Type(Type), Param(Param), Description(Description) {}
+      virtual ~ModuleSetting() {};
+      
+      std::string Description;
+      Dasher::Parameter Param;
+    };
+    
+    struct TextSetting : ModuleSetting {
+      TextSetting(Dasher::Parameter Param, std::string Description) : ModuleSetting(SettingsType::TextField, Param, Description) {}
+    };
+    
+    struct SliderSetting : ModuleSetting {
+      SliderSetting(Dasher::Parameter Param, std::string Description, int min, int max, int step) : ModuleSetting(SettingsType::Slider, Param, Description), min(min), max(max), step(step) {};
+      int min;
+      int max;
+      int step;
+    };
+
+    struct SpinSetting : ModuleSetting {
+      SpinSetting(Dasher::Parameter Param, std::string Description, int min, int max, int step) : ModuleSetting(SettingsType::Slider, Param, Description), min(min), max(max), step(step) {}
+      int min;
+      int max;
+      int step;
+    };
+
+    struct EnumSetting : ModuleSetting {
+      EnumSetting(Dasher::Parameter Param, std::string Description, std::unordered_map<std::string, int> Enums) : ModuleSetting(SettingsType::Enum, Param, Description), Enums(Enums) {};
+      std::unordered_map<std::string, int> Enums;
+    };
+
+    struct SwitchSetting : ModuleSetting {
+      SwitchSetting(Dasher::Parameter Param, std::string Description) : ModuleSetting(SettingsType::Switch, Param, Description) {};
+    };
+  }
+}

Src/DasherCore/DasherModule.h

@@ -37,8 +37,11 @@ class CDasherModule {
         return false;
     }
 
+    virtual const std::vector<Dasher::Settings::ModuleSetting>& getUISettings(){return UIList;};
 private:
     const char *m_szName;
+protected:
+    std::vector<Dasher::Settings::ModuleSetting> UIList;
 };
 /// @}
 

Src/DasherCore/DefaultFilter.cpp

@@ -7,6 +7,8 @@
 #include "DasherInterfaceBase.h"
 
 #include "CircleStartHandler.h"
+#include "DasherTypes.h"
+#include "ModuleSettings.h"
 #include "TwoBoxStartHandler.h"
 
 using namespace Dasher;

Src/DasherCore/DefaultFilter.h

@@ -2,6 +2,7 @@
 
 #include "DynamicFilter.h"
 #include "AutoSpeedControl.h"
+#include "ModuleSettings.h"
 #include "StartHandler.h"
 
 namespace Dasher {
@@ -23,6 +24,7 @@ class CDefaultFilter : public CDynamicFilter {
   void Activate() override;
   void Deactivate() override;
   bool GetSettings(SModuleSettings **, int *) override;
+
   void pause() override;
   //pauses, and calls the interface's Done() method
   void stop();

Src/DasherCore/PressFilter.cpp

@@ -1,7 +1,22 @@
 #include "PressFilter.h"
+#include "I18n.h"
 
 Dasher::CPressFilter::CPressFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase* pInterface, CFrameRate* pFramerate, const char *szName) : CDefaultFilter(pSettingsStore, pInterface, pFramerate, szName)
 {
+	UIList.push_back(Dasher::Settings::SwitchSetting(BP_REMAP_XTREME, _("At top and bottom, scroll more and translate less (makes error-correcting easier)")));
+    UIList.push_back(Dasher::Settings::EnumSetting(LP_GEOMETRY, "Screen geometry", {
+        {"Old Style", Dasher::Options::ScreenGeometry::old_style},
+        {"Square without Crosshair", Dasher::Options::ScreenGeometry::square_no_xhair},
+        {"Squish", Dasher::Options::ScreenGeometry::squish},
+        {"Squaish + Log", Dasher::Options::ScreenGeometry::squish_and_log},
+    }));
+    UIList.push_back(Dasher::Settings::EnumSetting(LP_SHAPE_TYPE, "Rendering Geometry", {
+        {"Rectangle", Dasher::Options::RenderingShapeTypes::OVERLAPPING_RECTANGLE},
+        {"Triangle", Dasher::Options::RenderingShapeTypes::TRIANGLE},
+        {"Truncated Triangle", Dasher::Options::RenderingShapeTypes::TRUNCATED_TRIANGLE},
+        {"Quadric", Dasher::Options::RenderingShapeTypes::QUADRIC},
+        {"Circle", Dasher::Options::RenderingShapeTypes::CIRCLE}
+    }));
 }
 
 void Dasher::CPressFilter::KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView* pDasherView, CDasherInput* pInput, CDasherModel* pModel)
@@ -25,4 +40,4 @@ void Dasher::CPressFilter::KeyUp(unsigned long iTime, Keys::VirtualKey Key, CDas
 		stop();
 	}
 	else if (Key == Keys::Secondary_Input || Key == Keys::Tertiary_Input || Key == Keys::Button_1) m_bTurbo = false;
-}
+}