Cache SpikeViewer thresholds as they are set

Author: medengineer

Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.cpp

@@ -117,6 +117,11 @@ void SpikeDisplayCanvas::cacheDisplaySettings(int electrode, int channel, double
     monitors[electrode] = isMonitored;
 }
 
+void SpikeDisplayCanvas::cacheDisplayThreshold(int electrode, int channel, double threshold)
+{
+    thresholds[electrode][channel] = threshold;
+}
+
 bool SpikeDisplayCanvas::hasCachedDisplaySettings(int electrode, int channel)
 {
     return thresholds[electrode].count(channel) > 0;

Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.h

@@ -127,6 +127,8 @@ class SpikeDisplayCanvas : public Visualizer,
 
     void cacheDisplaySettings(int electrodeIndex, int channelIndex, double threshold, double range, bool isMonitored);
 
+    void cacheDisplayThreshold(int electrodeIndex, int channelIndex, double threshold);
+
     bool hasCachedDisplaySettings(int electrodeIndex, int channelIndex);
 
     void invalidateDisplaySettings(int electrodeIndex);

Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikePlots.cpp

@@ -179,7 +179,7 @@ void SpikePlot::initAxes()
 
     for (int i = 0; i < nWaveAx; i++)
     {
-        WaveAxes* wAx = new WaveAxes(WAVE1 + i);
+        WaveAxes* wAx = new WaveAxes(canvas, electrodeNumber, WAVE1 + i);
         waveAxes.add(wAx);
         addAndMakeVisible(wAx);
         ranges.add(250.0f); // default range is 250 microvolts
@@ -188,7 +188,7 @@ void SpikePlot::initAxes()
     for (int i = 0; i < nProjAx; i++)
     {
         Projection proj = Projection(int(PROJ1x2) + i);
-        ProjectionAxes* pAx = new ProjectionAxes(proj);
+        ProjectionAxes* pAx = new ProjectionAxes(canvas, proj);
         projectionAxes.add(pAx);
         addAndMakeVisible(pAx);
     }
@@ -364,6 +364,7 @@ float SpikePlot::getDisplayThresholdForChannel(int i)
 
 void SpikePlot::setDisplayThresholdForChannel(int i, float thresh)
 {
+    LOGD("Setting threshold for channel ", i, " to ", thresh, "");
     waveAxes[i]->setDisplayThreshold(thresh);
 }
 
@@ -446,9 +447,10 @@ void SpikePlot::invertSpikes(bool shouldInvert)
 }
 
 
-GenericAxes::GenericAxes(SpikePlotType type_) : 
-    gotFirstSpike(false), 
-    type(type_)
+GenericAxes::GenericAxes(SpikeDisplayCanvas* canvas, SpikePlotType type_) : 
+    canvas(canvas),
+    type(type_),
+    gotFirstSpike(false)
 {
     ylims[0] = 0;
     ylims[1] = 1;
@@ -540,7 +542,8 @@ double GenericAxes::ad16ToUv(int x, int gain)
 }
 
 
-WaveAxes::WaveAxes(int channel_) : GenericAxes(WAVE_AXES),
+WaveAxes::WaveAxes(SpikeDisplayCanvas* canvas, int electrodeIndex, int channel_) : GenericAxes(canvas, WAVE_AXES),
+    electrodeIndex(electrodeIndex),
     drawGrid(true),
     displayThresholdLevel(0.0f),
     detectorThresholdLevel(0.0f),
@@ -849,6 +852,10 @@ void WaveAxes::mouseDrag(const MouseEvent& event)
             thresholdCoordinator->thresholdChanged(displayThresholdLevel,range);
         }
 
+        LOGA("Updated threshold for electrode: ", electrodeIndex, "channel: ", channel, " to " + String(displayThresholdLevel));
+
+        canvas->cacheDisplayThreshold(electrodeIndex, channel, displayThresholdLevel);
+
         repaint();
     }
 }
@@ -881,14 +888,15 @@ void WaveAxes::registerThresholdCoordinator(SpikeThresholdCoordinator* stc)
 
 void WaveAxes::setDisplayThreshold(float threshold)
 {
+
     displayThresholdLevel = threshold;
 
     repaint();
 }
 
 // --------------------------------------------------
 
-ProjectionAxes::ProjectionAxes(Projection proj_) : GenericAxes(PROJECTION_AXES), imageDim(500),
+ProjectionAxes::ProjectionAxes(SpikeDisplayCanvas* canvas, Projection proj_) : GenericAxes(canvas, PROJECTION_AXES), imageDim(500),
     rangeX(250), rangeY(250), spikesReceivedSinceLastRedraw(0), proj(proj_)
 {
     projectionImage = Image(Image::RGB, imageDim, imageDim, true);

Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikePlots.h

@@ -194,7 +194,7 @@ class GenericAxes : public Component
 public:
 
     /** Constructor */
-    GenericAxes(SpikePlotType type);
+    GenericAxes(SpikeDisplayCanvas* canvas, SpikePlotType type);
 
     /** Destructor */
     virtual ~GenericAxes() { }
@@ -214,6 +214,8 @@ class GenericAxes : public Component
     /** Helper function for creating units labels*/
     void makeLabel(int val, int gain, bool convert, char* s);
 
+    SpikeDisplayCanvas* canvas;
+
 protected:
     double xlims[2];
     double ylims[2];
@@ -242,7 +244,7 @@ class WaveAxes : public GenericAxes
 public:
 
     /** Constructor*/
-    WaveAxes(int channel);
+    WaveAxes(SpikeDisplayCanvas* canvas, int electrodeIndex, int channel);
 
     /** Destructor*/
     ~WaveAxes() {}
@@ -292,6 +294,7 @@ class WaveAxes : public GenericAxes
     Colour thresholdColour;
     Colour gridColour;
 
+    int electrodeIndex;
     int channel;
 
     bool drawGrid;
@@ -336,7 +339,7 @@ class ProjectionAxes : public GenericAxes
 public:
 
     /** Constructor */
-    ProjectionAxes(Projection proj);
+    ProjectionAxes(SpikeDisplayCanvas* canvas, Projection proj);
 
     /** Destructor*/
     ~ProjectionAxes() { }