Added 20*log10(mag) for Pyqtgraph

plottr/plot/base.py

@@ -248,6 +248,12 @@ class PlotDataType(Enum):
     #: grid data with 2 dependents
     grid2d = auto()
 
+    #: logarithmic scatter-type data with 1 dependent (data is not on a grid)
+    log10_scatter1d = auto()
+
+    #: logarithmic line data with 1 dependent (data is on a grid)
+    log10_line1d = auto()
+
 
 class ComplexRepresentation(LabeledOptions):
     """Options for plotting complex-valued data."""
@@ -264,6 +270,11 @@ class ComplexRepresentation(LabeledOptions):
     #: magnitude and phase
     magAndPhase = "Mag/Phase"
 
+    #: Natural Logarithmic magnitude and phase
+    log10_MagAndPhase = "20*log10(Mag)/Phase"
+
+
+
 
 def determinePlotDataType(data: Optional[DataDictBase]) -> PlotDataType:
     """
@@ -422,7 +433,7 @@ def _splitComplexData(self, plotItem: PlotItem) -> List[PlotItem]:
 
         if not np.issubsctype(plotItem.data[-1], np.complexfloating):
             return [plotItem]
-
+        
         elif self.complexRepresentation is ComplexRepresentation.real:
             plotItem.data[-1] = plotItem.data[-1].real
             assert isinstance(plotItem.labels, list)
@@ -431,7 +442,7 @@ def _splitComplexData(self, plotItem: PlotItem) -> List[PlotItem]:
             else:
                 plotItem.labels[-1] = label + ' (Real)'
             return [plotItem]
-
+        
         elif self.complexRepresentation in \
                 [ComplexRepresentation.realAndImag, ComplexRepresentation.realAndImagSeparate]:
 
@@ -463,6 +474,35 @@ def _splitComplexData(self, plotItem: PlotItem) -> List[PlotItem]:
 
             return [re_plotItem, im_plotItem]
 
+        elif self.complexRepresentation == ComplexRepresentation.log10_MagAndPhase:
+            data = plotItem.data[-1]
+
+            # this check avoids a numpy ComplexWarning when we're working with MaskedArray (almost always)
+            mag_data = np.ma.abs(data).real if isinstance(data, np.ma.MaskedArray) else np.abs(data)
+            phase_data = np.angle(data)
+
+            if label == '':
+                mag_label, phase_label = '20*log10(Mag)', 'Phase'
+            else:
+                mag_label, phase_label = label + ' 20*log10(Mag)', label + ' (Phase)'
+
+            mag_plotItem = plotItem
+            phase_plotItem = deepcopy(mag_plotItem)
+
+            mag_plotItem.data[-1] = mag_data
+            phase_plotItem.data[-1] = phase_data
+            phase_plotItem.id = mag_plotItem.id + 1
+            phase_plotItem.subPlot = mag_plotItem.subPlot + 1
+
+            # this is a bit of a silly check (see top of the function -- should certainly be True!).
+            # but it keeps mypy happy.
+            assert isinstance(mag_plotItem.labels, list)
+            mag_plotItem.labels[-1] = mag_label
+            assert isinstance(phase_plotItem.labels, list)
+            phase_plotItem.labels[-1] = phase_label
+
+            return [mag_plotItem, phase_plotItem]
+
         else:  # means that self.complexRepresentation is ComplexRepresentation.magAndPhase:
             data = plotItem.data[-1]
 

plottr/plot/pyqtgraph/autoplot.py

@@ -179,13 +179,21 @@ def formatSubPlot(self, subPlotId: int) -> None:
 
     def plot(self, plotItem: PlotItem) -> None:
         """Plot the given item."""
+
         if plotItem.plotDataType is PlotDataType.unknown:
             if len(plotItem.data) == 2:
                 plotItem.plotDataType = PlotDataType.scatter1d
             elif len(plotItem.data) == 3:
                 plotItem.plotDataType = PlotDataType.scatter2d
-
-        if plotItem.plotDataType in [PlotDataType.scatter1d, PlotDataType.line1d]:
+
+        #If the Complex Representation is for 20*log10(Mag) and it's regarding the Magnitude Plot, not the Phase Plot
+        if self.complexRepresentation == ComplexRepresentation.log10_MagAndPhase and plotItem.subPlot == 0:
+
+            #Switch the 1d plots to the logarithmic variation
+            if plotItem.plotDataType == PlotDataType.scatter1d: plotItem.plotDataType = PlotDataType.log10_scatter1d
+            if plotItem.plotDataType == PlotDataType.line1d: plotItem.plotDataType = PlotDataType.log10_line1d
+
+        if plotItem.plotDataType in [PlotDataType.scatter1d, PlotDataType.line1d,PlotDataType.log10_line1d,PlotDataType.log10_scatter1d]:
             self._1dPlot(plotItem)
         elif plotItem.plotDataType == PlotDataType.grid2d:
             self._colorPlot(plotItem)
@@ -212,11 +220,22 @@ def _1dPlot(self, plotItem: PlotItem) -> None:
             return subPlot.plot.plot(x.flatten(), y.flatten(), name=name,
                                      pen=mkPen(color, width=1), symbol=symbol, symbolBrush=color,
                                      symbolPen=None, symbolSize=symbolSize)
-        else:
+        elif plotItem.plotDataType == PlotDataType.log10_line1d:
+            name = plotItem.labels[-1] if isinstance(plotItem.labels, list) else ''
+            return subPlot.plot.plot(x.flatten(), 20*np.log10(y.flatten()), name=name,
+                                     pen=mkPen(color, width=1), symbol=symbol, symbolBrush=color,
+                                     symbolPen=None, symbolSize=symbolSize)
+        elif plotItem.plotDataType == PlotDataType.scatter1d:
             name = plotItem.labels[-1] if isinstance(plotItem.labels, list) else ''
             return subPlot.plot.plot(x.flatten(), y.flatten(), name=name,
                                      pen=None, symbol=symbol, symbolBrush=color,
                                      symbolPen=None, symbolSize=symbolSize)
+        #instance of PlotDataType.log10_scatter1d
+        else:
+            name = plotItem.labels[-1] if isinstance(plotItem.labels, list) else ''
+            return subPlot.plot.plot(x.flatten(), 20*np.log10(y.flatten()), name=name,
+                                     pen=None, symbol=symbol, symbolBrush=color,
+                                     symbolPen=None, symbolSize=symbolSize)
 
     def _colorPlot(self, plotItem: PlotItem) -> None:
         subPlot = self.subPlotFromId(plotItem.subPlot)