spectrum: implementing the bar mode

wwmm · Jan 3, 2025 · 9c01037 · 9c01037
1 parent a4ba780
commit 9c01037
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 5 deletions.
diff --git a/src/contents/kcfg/easyeffects_db_spectrum.kcfg b/src/contents/kcfg/easyeffects_db_spectrum.kcfg
@@ -12,6 +12,10 @@
             <label>Enable Dynamic Scaling for the Vertical Axis</label>
             <default>true</default>
         </entry>
+        <entry name="logarithimicHorizontalAxis" type="Bool">
+            <label>Enable logarithmic scale for the Frequency Axis</label>
+            <default>true</default>
+        </entry>
         <entry name="spectrumShape" type="Enum">
             <label>Spectrum Type</label>
             <choices>
@@ -28,7 +32,7 @@
                     <label>Area</label>
                 </choice>
             </choices>
-            <default>1</default>
+            <default>0</default>
         </entry>
         <entry name="spectrumColorScheme" type="Enum">
             <label>Spectrum Color Scheme</label>

diff --git a/src/contents/ui/EeChart.qml b/src/contents/ui/EeChart.qml
@@ -46,6 +46,12 @@ Item {
         if (areaSeries.visible === true)
             areaLineSeries.replace(newData);
 
+        if (barSeries.visible === true) {
+            barSeriesSet.clear();
+            for (let n = 0; n < newData.length; n++) {
+                barSeriesSet.append(newData[n].y);
+            }
+        }
     }
 
     Kirigami.Theme.inherit: false
@@ -68,15 +74,19 @@ Item {
             marginRight: 0
             Layout.fillWidth: true
             Layout.fillHeight: true
+            axisX: {
+                if (barSeries.visible === false)
+                    return horizontalAxis;
+                else
+                    return barAxis;
+            }
 
             BarSeries {
                 id: barSeries
 
                 visible: seriesType === 0
 
                 BarSet {
-                    // values: widgetRoot.graphData
-
                     id: barSeriesSet
                 }
 
@@ -105,7 +115,7 @@ Item {
 
             }
 
-            axisX: ValueAxis {
+            ValueAxis {
                 id: horizontalAxis
 
                 labelFormat: "%.1f"
@@ -118,6 +128,15 @@ Item {
                 labelDecimals: 0
             }
 
+            BarCategoryAxis {
+                id: barAxis
+
+                categories: [2024, 2025, 2026]
+                gridVisible: false
+                subGridVisible: false
+                visible: false
+            }
+
             axisY: ValueAxis {
                 id: verticalAxis
 

diff --git a/src/contents/ui/PageStreamsEffects.qml b/src/contents/ui/PageStreamsEffects.qml
@@ -405,6 +405,7 @@ Kirigami.Page {
         xMax: DB.Manager.spectrum.maximumFrequency
         yMin: -100
         yMax: 0
+        logarithimicHorizontalAxis: DB.Manager.spectrum.logarithimicHorizontalAxis
         Component.onCompleted: {
             headerFrameAnimation.start();
         }

diff --git a/src/contents/ui/PreferencesSheet.qml b/src/contents/ui/PreferencesSheet.qml
@@ -237,6 +237,18 @@ Kirigami.OverlaySheet {
                     }
                 }
 
+                EeSwitch {
+                    id: logarithimicHorizontalAxis
+
+                    label: i18n("Logarithmic Frequency Axis")
+                    isChecked: DB.Manager.spectrum.logarithimicHorizontalAxis
+                    onCheckedChanged: {
+                        if (isChecked !== DB.Manager.spectrum.logarithimicHorizontalAxis)
+                            DB.Manager.spectrum.logarithimicHorizontalAxis = isChecked;
+
+                    }
+                }
+
                 EeSpinBox {
                     id: nPoints
 

diff --git a/src/effects_base.cpp b/src/effects_base.cpp
@@ -35,6 +35,7 @@
 #include <ranges>
 #include <string>
 #include <utility>
+#include <vector>
 #include "autogain.hpp"
 #include "bass_enhancer.hpp"
 #include "compressor.hpp"
@@ -376,7 +377,14 @@ void EffectsBase::requestSpectrumData() {
           return;
         }
 
-        auto log_x_axis = util::logspace(min_freq, max_freq, db::Spectrum::nPoints());
+        // auto log_x_axis = util::logspace(min_freq, max_freq, db::Spectrum::nPoints());
+        std::vector<float> log_x_axis;
+
+        if (db::Spectrum::logarithimicHorizontalAxis()) {
+          log_x_axis = util::logspace(min_freq, max_freq, db::Spectrum::nPoints());
+        } else {
+          log_x_axis = util::linspace(min_freq, max_freq, db::Spectrum::nPoints());
+        }
 
         auto* acc = gsl_interp_accel_alloc();
         auto* spline = gsl_spline_alloc(gsl_interp_steffen, n_bands);