# HG changeset patch
# User Chris Cannam
# Date 1586427820 -3600
# Node ID 8b78b3c330fb1c09e6cd9147a5eb78d6c70f9e32
# Parent  5aef3f53a4259cbae79aaf7da6cf55a7b8e82eb2
Use our base column type

diff -r 5aef3f53a425 -r 8b78b3c330fb layer/Colour3DPlotRenderer.cpp
--- a/layer/Colour3DPlotRenderer.cpp	Mon Apr 06 13:56:00 2020 +0100
+++ b/layer/Colour3DPlotRenderer.cpp	Thu Apr 09 11:23:40 2020 +0100
@@ -458,8 +458,8 @@
         fullColumn = source->getColumn(sx);
     }
     
-    column = vector<float>(fullColumn.data() + minbin,
-                           fullColumn.data() + minbin + nbins);
+    column = ColumnOp::Column(fullColumn.data() + minbin,
+                              fullColumn.data() + minbin + nbins);
     return column;
 }
 
@@ -511,7 +511,7 @@
 
     int psx = -1;
 
-    vector<float> preparedColumn;
+    ColumnOp::Column preparedColumn;
 
     int modelWidth = model->getWidth();
 
@@ -1085,7 +1085,7 @@
 
     int xPixelCount = 0;
     
-    vector<float> preparedColumn;
+    ColumnOp::Column preparedColumn;
 
     int modelWidth = sourceModel->getWidth();
 
@@ -1116,7 +1116,7 @@
 //        SVDEBUG << "x = " << x << ", binforx[x] = " << binforx[x] << ", sx range " << sx0 << " -> " << sx1 << endl;
 #endif
 
-        vector<float> pixelPeakColumn;
+        ColumnOp::Column pixelPeakColumn;
         MagnitudeRange magRange;
         
         for (int sx = sx0; sx < sx1; ++sx) {
@@ -1251,7 +1251,7 @@
     
     int xPixelCount = 0;
     
-    vector<float> preparedColumn;
+    ColumnOp::Column preparedColumn;
 
     int modelWidth = fft->getWidth();
 #ifdef DEBUG_COLOUR_PLOT_REPAINT
@@ -1288,7 +1288,7 @@
         if (sx0 < 0) continue;
         if (sx1 <= sx0) sx1 = sx0 + 1;
 
-        vector<float> pixelPeakColumn;
+        ColumnOp::Column pixelPeakColumn;
         MagnitudeRange magRange;
         
         for (int sx = sx0; sx < sx1; ++sx) {