comparison layer/Colour3DPlotRenderer.cpp @ 1595:8b78b3c330fb

Use our base column type

 
     if (fullColumn.empty()) {
         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;
 }
 
 MagnitudeRange
 Colour3DPlotRenderer::renderDirectTranslucent(const LayerGeometryProvider *v,

     int nbins  = m_sources.verticalBinLayer->getIBinForY(v, 0) - minbin + 1;
     if (minbin + nbins > sh) nbins = sh - minbin;
 
     int psx = -1;
 
-    vector<float> preparedColumn;
+    ColumnOp::Column preparedColumn;
 
     int modelWidth = model->getWidth();
 
     for (int sx = sx0; sx <= sx1; ++sx) {
 

         step = -1;
     }
 
     int xPixelCount = 0;
     
-    vector<float> preparedColumn;
+    ColumnOp::Column preparedColumn;
 
     int modelWidth = sourceModel->getWidth();
 
 #ifdef DEBUG_COLOUR_PLOT_REPAINT
     SVDEBUG << "render " << m_sources.source

 
 #ifdef DEBUG_COLOUR_PLOT_REPAINT
 //        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) {
 
             if (sx < 0 || sx >= modelWidth) {

         step = -1;
     }
     
     int xPixelCount = 0;
     
-    vector<float> preparedColumn;
+    ColumnOp::Column preparedColumn;
 
     int modelWidth = fft->getWidth();
 #ifdef DEBUG_COLOUR_PLOT_REPAINT
     SVDEBUG << "render " << m_sources.source
             << ": modelWidth " << modelWidth << endl;

         if (x+1 < w) sx1 = binforx[x+1];
         if (sx0 < 0) sx0 = sx1 - 1;
         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) {
 
             if (sx < 0 || sx >= modelWidth) {