Changes to allow SpikeDisplayCanvas to handle higher electrode counts

Source/Processors/FileReader.cpp

@@ -82,7 +82,7 @@ float FileReader::getDefaultSampleRate()
 
 int FileReader::getDefaultNumOutputs()
 {
-    return 16;
+    return 64;
 }
 
 float FileReader::getDefaultBitVolts()

Source/Processors/Visualization/SpikeDisplayCanvas.cpp

@@ -848,8 +848,9 @@ void SpikePlot::clear()
 
 
 WaveAxes::WaveAxes(int channel) : GenericAxes(channel), drawGrid(true),
-    bufferSize(10), spikeIndex(0), thresholdLevel(0.0f), range(250.0f),
-    isOverThresholdSlider(false), isDraggingThresholdSlider(false)
+    bufferSize(5), spikeIndex(0), thresholdLevel(0.0f), range(250.0f),
+    isOverThresholdSlider(false), isDraggingThresholdSlider(false),
+    spikesReceivedSinceLastRedraw(0)
 {
 
     addMouseListener(this, true);
@@ -899,22 +900,22 @@ void WaveAxes::paint(Graphics& g)
     }
 
 
-    for (int spikeNum = 0; spikeNum < bufferSize; spikeNum++)
-    {
+     for (int spikeNum = 0; spikeNum < bufferSize; spikeNum++)
+     {
 
-        if (spikeNum != spikeIndex)
-        {
-            g.setColour(Colours::grey);
-            plotSpike(spikeBuffer[spikeNum], g);
-        }
+         if (spikeNum != spikeIndex)
+         {
+             g.setColour(Colours::grey);
+             plotSpike(spikeBuffer[spikeNum], g);
+         }
 
-    }
+     }
 
     g.setColour(Colours::white);
     plotSpike(spikeBuffer[spikeIndex], g);
 
 
-
+    spikesReceivedSinceLastRedraw = 0;
 
 }
 
@@ -993,13 +994,20 @@ bool WaveAxes::updateSpikeData(const SpikeObject& s)
         gotFirstSpike = true;
     }
 
-    SpikeObject newSpike = s;
+    if (spikesReceivedSinceLastRedraw < bufferSize)
+    {
 
-    spikeIndex++;
-    spikeIndex %= bufferSize;
+        SpikeObject newSpike = s;
+
+        spikeIndex++;
+        spikeIndex %= bufferSize;
+
+        spikeBuffer.set(spikeIndex, newSpike);
+
+        spikesReceivedSinceLastRedraw++;
+        
+    }
 
-    spikeBuffer.set(spikeIndex, newSpike);
-    
     return true;
 
 }
@@ -1128,7 +1136,7 @@ void WaveAxes::mouseExit(const MouseEvent& event)
 // --------------------------------------------------
 
 ProjectionAxes::ProjectionAxes(int projectionNum) : GenericAxes(projectionNum), imageDim(500),
-    rangeX(250), rangeY(250)
+    rangeX(250), rangeY(250), spikesReceivedSinceLastRedraw(0)
 {
     projectionImage = Image(Image::RGB, imageDim, imageDim, true);
 

Source/Processors/Visualization/SpikeDisplayCanvas.h

@@ -331,6 +331,8 @@ public:
         return range;
     }
 
+    
+
     //MouseCursor getMouseCursor();
 
 private:
@@ -347,7 +349,7 @@ private:
 
     void drawThresholdSlider(Graphics& g);
 
-
+    int spikesReceivedSinceLastRedraw;
 
     Font font;
 
@@ -409,6 +411,7 @@ private:
     int rangeX;
     int rangeY;
 
+    int spikesReceivedSinceLastRedraw;
 
 };