diff layer/Colour3DPlotRenderer.h @ 1486:ac0a8addabcf

Merge from branch by-id

--- a/layer/Colour3DPlotRenderer.h	Thu Jun 13 15:35:01 2019 +0100
+++ b/layer/Colour3DPlotRenderer.h	Wed Jul 17 14:25:16 2019 +0100
@@ -23,16 +23,16 @@
 #include "base/ColumnOp.h"
 #include "base/MagnitudeRange.h"
 
+#include "data/model/Model.h"
+
 #include <QRect>
 #include <QPainter>
 #include <QImage>
 
 class LayerGeometryProvider;
 class VerticalBinLayer;
-class DenseThreeDimensionalModel;
+class RenderTimer;
 class Dense3DModelPeakCache;
-class FFTModel;
-class RenderTimer;
 
 enum class BinDisplay {
     AllBins,
@@ -49,13 +49,13 @@
 {
 public:
     struct Sources {
-        Sources() : verticalBinLayer(0), source(0), fft(0) { }
+        Sources() : verticalBinLayer(0) { }
         
         // These must all outlive this class
-        const VerticalBinLayer *verticalBinLayer;  // always
-        const DenseThreeDimensionalModel *source;  // always
-        const FFTModel *fft;                       // optionally
-        std::vector<Dense3DModelPeakCache *> peakCaches; // zero or more
+        const VerticalBinLayer *verticalBinLayer; // always
+        ModelId source; // always; a DenseThreeDimensionalModel
+        ModelId fft; // optionally; an FFTModel; used for phase/peak-freq modes
+        std::vector<ModelId> peakCaches; // zero or more
     };        
 
     struct Parameters {