GPU Display Frontend: Use RTTI for configuring GPUDisplayControl

Author: davidrohr

GPU/GPUTracking/display/frontend/GPUDisplayFrontendConfig.cxx

@@ -48,7 +48,7 @@ struct GPUDisplayFrontend::configKey {
 };
 
 struct GPUDisplayFrontend::configRTTIInfo {
-  static constexpr std::tuple configStructs{&GPUDisplay::mCfgL, &GPUDisplay::mCfgH, &GPUDisplay::mCfgR}; // Config structs with RTTI, as members of GPUDisplay
+  static constexpr std::tuple configStructs{&GPUDisplay::mCfgL, &GPUDisplay::mCfgH, &GPUDisplay::mCfgR, &GPUDisplay::mCfgC}; // Config structs with RTTI, as members of GPUDisplay
   std::vector<configRTTIExt> rttiEntries;
   std::vector<configKeyCallback> configInfos;       // SetInfo callback for an option, indexed like rttiEntries, called after the callback of a key bound to it
   std::vector<std::vector<uint32_t>> rttiReverseId; // [configStructIndex][offset] -> index in rttiEntries, INVALID_INDEX if no member at that offset
@@ -108,18 +108,21 @@ struct GPUDisplayFrontend::configRTTIInfo {
       return qConfig::print_type(*(const int32_t*)ptr);
     } else if (e.type == "uint32_t") {
       return qConfig::print_type(*(const uint32_t*)ptr);
+    } else if (e.type == "std::string") {
+      return *(const std::string*)ptr;
     }
     return std::nullopt;
   }
   template <class T, class M>
   uint32_t getRTTIIndex(GPUDisplay& display, M T::* member) // RTTI index of a direct member of a config struct
   {
-    if constexpr (std::is_same_v<T, GPUDisplayControl>) {
-      return INVALID_INDEX;
-    } else {
-      const T& obj = configStruct<T>(display);
-      return rttiReverseId[configStructIndex<T>()][(const char*)&(obj.*member) - (const char*)&obj];
+    if constexpr (std::is_same_v<T, GPUDisplayControl> && std::is_same_v<M, bool>) {
+      if (member == &GPUDisplayControl::dummy) { // Keys / buttons that do not change a setting
+        return INVALID_INDEX;
+      }
     }
+    const T& obj = configStruct<T>(display);
+    return rttiReverseId[configStructIndex<T>()][(const char*)&(obj.*member) - (const char*)&obj];
   }
   void buildHelpText() // Keys left-aligned, the ':' aligned after the longest keys
   {

GPU/GPUTracking/display/frontend/GPUDisplayFrontendConfigInfo.inc

@@ -20,6 +20,13 @@
 void GPUDisplay::buildConfigInfo()
 {
   auto addInfo = [this](std::pair<uint32_t, configKeyCallback>&& info) { mFrontend->mConfigRTTI->configInfos[info.first] = std::move(info.second); };
+  addInfo(INFO_LAMBDA(mCfgC, mDisplayControl, if (val == 2) { SetInfo("Exiting", 1); }));
+  addInfo(INFO_LAMBDA(mCfgC, mResetScene, SetInfo("View reset", 1);));
+  addInfo(INFO_LAMBDA(mCfgC, mRequestScreenshot, SetInfo("Taking screenshot (%s)", mScreenshotFile.c_str());));
+  addInfo(INFO_LAMBDA(mCfgC, mAnimateScreenshot, SetInfo("Writing screenshots from animation set to %d", val);));
+  addInfo(INFO_LAMBDA(mCfgC, mAnimationChangeConfig, SetInfo("Interpolating visualization settings during Animation %s", val ? "enabled" : "disabled");));
+  addInfo(INFO_LAMBDA(mCfgC, mPrintInfoTextAlways, SetInfo(val ? "Showing help text until disabled" : (mInfoHelpTimer.IsRunning() ? "Showing help text" : "Showing help text disabled"), 1);));
+  addInfo(INFO_LAMBDA(mCfgC, mPrintInfoText, SetInfo("Info text display - console: %s, onscreen %s", (val & 2) ? "enabled" : "disabled", (val & 1) ? "enabled" : "disabled");));
   addInfo(INFO_LAMBDA(mCfgL, colorClusters, SetInfo("Color coding for seed / trrack attachmend %s", val ? "enabled" : "disabled");));
   addInfo(INFO_LAMBDA(mCfgL, drawSector, {
     if (val == -1) {

GPU/GPUTracking/display/frontend/GPUDisplayFrontendConfigKeys.inc

@@ -38,9 +38,9 @@ void GPUDisplay::buildConfigKeys()
     "Strafe up / down / Rotate left / right");
 
   mFrontend->add_key_binding(
-    KEY_LAMBDA(mFrontend->KEY_ESCAPE, mCfgC, mDisplayControl, val.store(2); SetInfo("Exiting", 1);),
+    KEY_LAMBDA(mFrontend->KEY_ESCAPE, mCfgC, mDisplayControl, val.store(2);),
     KEY_LAMBDA('n', mCfgC, mDisplayControl, val.store(1);),
-    KEY_LAMBDA('r', mCfgC, mResetScene, val.store(true); SetInfo("View reset", 1);), //
+    KEY_LAMBDA('r', mCfgC, mResetScene, val.store(true);), //
     KEY_LAMBDA('q', mCfgC, dummy, {
       if (mFrontend->isGUIRunning()) {
         SetInfo("Stopping GUI", 1);
@@ -229,7 +229,7 @@ void GPUDisplay::buildConfigKeys()
 
   mFrontend->add_key_binding(
     KEY_LAMBDA('t', mCfgC, mRequestScreenshot, takeScreenshot();),
-    KEY_LAMBDA('T', mCfgC, mAnimateScreenshot, val ^= 1; SetInfo("Writing screenshots from animation set to %d", mCfgC.mAnimateScreenshot);), //
+    KEY_LAMBDA('T', mCfgC, mAnimateScreenshot, val ^= 1;), //
     KEY_LAMBDA('Z', mCfgR, screenshotScaleFactor, {
       val += 1;
       if (val > 4) {
@@ -252,7 +252,7 @@ void GPUDisplay::buildConfigKeys()
     "Start Animation, Add / remove Animation point, Reset Points, Cycle animation camera mode (resets)");
 
   mFrontend->add_key_binding(
-    KEY_LAMBDA('>', mCfgC, mAnimationChangeConfig, val ^= 1; SetInfo("Interpolating visualization settings during Animation %s", mCfgC.mAnimationChangeConfig ? "enabled" : "disabled");),
+    KEY_LAMBDA('>', mCfgC, mAnimationChangeConfig, val ^= 1;),
     KEY_DOWN_MAP('<', CHANGE_ANIMATION_INTERVAL), //
     "Toggle config interpolation during Animation / change Animation interval (via movement)");
 
@@ -296,20 +296,16 @@ void GPUDisplay::buildConfigKeys()
     KEY_LAMBDA('h', mCfgC, mPrintInfoTextAlways, {
       if (val) {
         val = false;
-        SetInfo("Showing help text disabled", 1);
       } else if (mInfoHelpTimer.IsRunning()) {
         val = true;
         mInfoHelpTimer.Reset();
-        SetInfo("Showing help text until disabled", 1);
       } else {
         PrintHelp();
-        SetInfo("Showing help text", 1);
       }
     }),
     KEY_LAMBDA('H', mCfgC, mPrintInfoText, {
       val += 1;
       val &= 3;
-      SetInfo("Info text display - console: %s, onscreen %s", (val & 2) ? "enabled" : "disabled", (val & 1) ? "enabled" : "disabled");
     }), //
     "Print Help / Show info texts");
 }

GPU/GPUTracking/display/helpers/GPUDisplayHelpers.cxx

@@ -61,7 +61,6 @@ void GPUDisplay::takeScreenshot()
   static int32_t nScreenshot = 1;
   mCfgC.mRequestScreenshot = true;
   mScreenshotFile = mCfgC.mScreenShotname + std::to_string(nScreenshot++) + ".bmp";
-  SetInfo("Taking screenshot (%s)", mScreenshotFile.c_str());
 }
 
 void GPUDisplay::SaveGLPos()