Added SPL plot and a setting to enter the calibration factor

Author: Nathanael Urmoneit

friture/Levels.qml

@@ -75,6 +75,28 @@ Rectangle {
             Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
             color: systemPalette.windowText
         }
+		
+		Text {
+            id: splValues
+            textFormat: Text.MarkdownText
+            text: level_view_model.two_channels ? "1: " + level_to_text(level_view_model.level_data_slow.level_spl) + "<br />2: " + level_to_text(level_view_model.level_data_slow_2.level_spl) : level_to_text(level_view_model.level_data_slow.level_spl)
+            font.pointSize: 14
+            font.bold: true
+            verticalAlignment: Text.AlignBottom
+            horizontalAlignment: Text.AlignRight
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+            color: systemPalette.windowText
+        }
+
+        Text {
+            id: splLegend
+            textFormat: Text.PlainText
+            text: "dB SPL"
+            verticalAlignment: Text.AlignTop
+            horizontalAlignment: Text.AlignRight
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+            color: systemPalette.windowText
+        }
 
         LevelsMeter {
             Layout.fillHeight: true

friture/SPL.qml

@@ -0,0 +1,57 @@
+import QtQuick 2.15
+import QtQuick.Window 2.2
+import QtQuick.Layouts 1.15
+import QtQuick.Shapes 1.15
+import Friture 1.0
+
+Item {
+    id: container
+    property var stateId
+
+    // delay the load of the Plot until stateId has been set
+    Loader {
+        id: loader
+        anchors.fill: parent
+    }
+
+    onStateIdChanged: {
+        console.log("stateId changed: " + stateId)
+        loader.sourceComponent = plotComponent
+    }
+
+    Component {
+        id: plotComponent
+        Plot {
+            scopedata: Store.dock_states[container.stateId]
+
+            Repeater {
+                model: scopedata.plot_items
+
+                PlotFilledCurve {
+                    anchors.fill: parent
+                    curve: modelData
+                }
+            }
+
+            Column {
+                anchors.fill: parent
+                spacing: 0
+                FrequencyTracker {
+                    visible: scopedata.showFrequencyTracker
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    fmaxValue: scopedata.fmaxValue
+                    fmaxLogicalValue: scopedata.fmaxLogicalValue
+                }
+
+                FrequencyTracker {
+                    visible: scopedata.showPitchTracker
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    fmaxValue: scopedata.fpitchDisplayText
+                    fmaxLogicalValue: scopedata.fpitchValue
+                }
+            }
+        }
+    }
+}

friture/analyzer.py

@@ -58,6 +58,7 @@
 from friture.spectrogram_item import SpectrogramItem
 from friture.spectrogram_item_data import SpectrogramImageData
 from friture.spectrum_data import Spectrum_Data
+from friture.spl_data import SPLData
 from friture.plotFilledCurve import PlotFilledCurve
 from friture.filled_curve import FilledCurve
 from friture.qml_tools import qml_url
@@ -98,6 +99,7 @@ def __init__(self):
         qmlRegisterType(CoordinateTransform, 'Friture', 1, 0, 'CoordinateTransform')
         qmlRegisterType(Scope_Data, 'Friture', 1, 0, 'ScopeData')
         qmlRegisterType(Spectrum_Data, 'Friture', 1, 0, 'SpectrumData')
+        qmlRegisterType(SPLData, 'Friture', 1, 0, 'SPLData')
         qmlRegisterType(LevelData, 'Friture', 1, 0, 'LevelData')
         qmlRegisterType(LevelViewModel, 'Friture', 1, 0, 'LevelViewModel')
         qmlRegisterType(Axis, 'Friture', 1, 0, 'Axis')

friture/level_data.py

@@ -24,12 +24,14 @@
 
 class LevelData(QtCore.QObject):
     level_rms_changed = QtCore.pyqtSignal(float)
+    level_spl_changed = QtCore.pyqtSignal(float)
     level_max_changed = QtCore.pyqtSignal(float)
 
     def __init__(self, parent=None):
         super().__init__(parent)
 
         self._level_rms = -30.
+        self._level_spl = -30.
         self._level_max = -30.
 
     @pyqtProperty(float, notify=level_rms_changed) # type: ignore
@@ -46,6 +48,20 @@ def level_rms(self, level_rms):
             self._level_rms = level_rms
             self.level_rms_changed.emit(level_rms)
 
+    @pyqtProperty(float, notify=level_spl_changed) # type: ignore
+    def level_spl(self):
+        return self._level_spl
+
+    @pyqtProperty(float, notify=level_spl_changed) # type: ignore
+    def level_spl_iec(self):
+        return dB_to_IEC(self._level_spl)
+
+    @level_spl.setter # type: ignore
+    def level_spl(self, level_spl):
+        if self._level_spl != level_spl:
+            self._level_spl = level_spl
+            self.level_spl_changed.emit(level_spl)
+
     @pyqtProperty(float, notify=level_max_changed) # type: ignore
     def level_max(self):
         return self._level_max

friture/levels.py

@@ -33,6 +33,8 @@
 from friture.audiobackend import SAMPLING_RATE
 from friture.qml_tools import qml_url, raise_if_error
 
+from friture.spl_settings import SPL_Settings_Dialog
+
 SMOOTH_DISPLAY_TIMER_PERIOD_MS = 25
 LEVEL_TEXT_LABEL_PERIOD_MS = 250
 
@@ -73,6 +75,8 @@ def __init__(self, parent, engine):
         # initialize the settings dialog
         self.settings_dialog = Levels_Settings_Dialog(self)
 
+        self.calibration = 0
+
         # initialize the class instance that will do the fft
         self.proc = audioproc()
 
@@ -136,6 +140,7 @@ def handle_new_data(self, floatdata):
         self.old_rms = value_rms
 
         self.level_view_model.level_data.level_rms = 10. * np.log10(value_rms + 0. * 1e-80)
+        self.level_view_model.level_data.level_spl = self.level_view_model.level_data.level_rms + 94.0 + self.calibration
         self.level_view_model.level_data.level_max = 20. * np.log10(self.old_max + 0. * 1e-80)
         self.level_view_model.level_data_ballistic.peak_iec = dB_to_IEC(max(self.level_view_model.level_data.level_max, self.level_view_model.level_data.level_rms))
 
@@ -156,7 +161,10 @@ def handle_new_data(self, floatdata):
             value_rms = pyx_exp_smoothed_value(self.kernel, self.alpha, y2 ** 2, self.old_rms_2)
             self.old_rms_2 = value_rms
 
+            value_spl = value_rms + 94.0 + self.calibration
+
             self.level_view_model.level_data_2.level_rms = 10. * np.log10(value_rms + 0. * 1e-80)
+            self.level_view_model.level_data_2.level_spl = self.level_view_model.level_data_2.level_rms + 94.0 + self.calibration
             self.level_view_model.level_data_2.level_max = 20. * np.log10(self.old_max_2 + 0. * 1e-80)
             self.level_view_model.level_data_ballistic_2.peak_iec = dB_to_IEC(max(self.level_view_model.level_data_2.level_max, self.level_view_model.level_data_2.level_rms))
 
@@ -169,10 +177,12 @@ def canvasUpdate(self):
 
         if self.i == LEVEL_TEXT_LABEL_STEPS:
             self.level_view_model.level_data_slow.level_rms = self.level_view_model.level_data.level_rms
+            self.level_view_model.level_data_slow.level_spl = self.level_view_model.level_data.level_spl
             self.level_view_model.level_data_slow.level_max = self.level_view_model.level_data.level_max
 
             if self.two_channels:
                 self.level_view_model.level_data_slow_2.level_rms = self.level_view_model.level_data_2.level_rms
+                self.level_view_model.level_data_slow_2.level_spl = self.level_view_model.level_data_2.level_spl
                 self.level_view_model.level_data_slow_2.level_max = self.level_view_model.level_data_2.level_max
 
         self.i = self.i % LEVEL_TEXT_LABEL_STEPS