Fix reading allshader::WaveformRendererSignalBase::Options as single Option

Author: daschuer

src/preferences/configobject.h

@@ -191,6 +191,12 @@ template <class ValueType> class ConfigObject {
         // we need to take default_value as const ref otherwise the overload is ambiguous
         return static_cast<EnumType>(getValue<int>(key, static_cast<int>(default_value)));
     }
+    template<typename EnumType>
+        requires std::is_enum_v<EnumType>
+    QFlags<EnumType> getValue(const ConfigKey& key, const QFlags<EnumType>& default_value) const {
+        // we need to take default_value as const ref otherwise the overload is ambiguous
+        return QFlags<EnumType>(getValue<int>(key, static_cast<int>(default_value)));
+    }
 
     QMultiHash<ValueType, ConfigKey> transpose() const;
 

src/waveform/waveformwidgetfactory.cpp

@@ -1105,9 +1105,10 @@ void WaveformWidgetFactory::evaluateWidgets() {
 
 WaveformWidgetAbstract* WaveformWidgetFactory::createAllshaderWaveformWidget(
         WaveformWidgetType::Type type, WWaveformViewer* viewer) {
-    allshader::WaveformRendererSignalBase::Options options =
-            m_config->getValue(ConfigKey("[Waveform]", "waveform_options"),
-                    allshader::WaveformRendererSignalBase::Option::None);
+    allshader::WaveformRendererSignalBase::Options options = m_config->getValue(
+            ConfigKey("[Waveform]", "waveform_options"),
+            allshader::WaveformRendererSignalBase::Options(
+                    allshader::WaveformRendererSignalBase::Option::None));
     return new allshader::WaveformWidget(viewer, type, viewer->getGroup(), options);
 }
 
@@ -1392,9 +1393,9 @@ void WaveformWidgetFactory::setDefaultBackend() {
 }
 
 allshader::WaveformRendererSignalBase::Options WaveformWidgetFactory::getWaveformOptions() {
-    auto options = m_config->getValue(
-            kWaveformOptionsKey,
-            allshader::WaveformRendererSignalBase::Option::None);
+    auto options = m_config->getValue(kWaveformOptionsKey,
+            allshader::WaveformRendererSignalBase::Options(
+                    allshader::WaveformRendererSignalBase::Option::None));
     return options;
 }