Allow LFP Viewer to align to events outside current buffer

Author: jsiegle

Plugins/LfpViewer/LfpDisplayCanvas.cpp

@@ -1155,9 +1155,11 @@ void LfpDisplaySplitter::updateScreenBuffer()
     {
         // std::cout << "Update screen buffer" << std::endl;
 
-        int triggerTime = triggerChannel >= 0
-                              ? int (processor->getLatestTriggerTime (splitID))
-                              : -1;
+        const auto triggerTimeOpt = triggerChannel >= 0
+                                        ? processor->getLatestTriggerTime (splitID)
+                                        : std::optional<int64>();
+        const bool hasTrigger = triggerTimeOpt.has_value();
+        int triggerTime = hasTrigger ? int (*triggerTimeOpt) : -1;
 
         int maxSamples = screenBufferWidth;
         int displayWidth = lfpDisplay->lfpChannelBitmap.getWidth();
@@ -1167,8 +1169,9 @@ void LfpDisplaySplitter::updateScreenBuffer()
             maxSamples = displayWidth;
         }
 
-        if (triggerTime > 0)
+        if (hasTrigger)
         {
+            //std::cout << "Split display " << splitID << " trigger time : " << triggerTime << std::endl;
             processor->acknowledgeTrigger (splitID);
         }
 
@@ -1212,7 +1215,7 @@ void LfpDisplaySplitter::updateScreenBuffer()
             if (triggerChannel >= 0)
             {
                 // we may need to wait for a trigger
-                if (triggerTime >= 0)
+            if (hasTrigger)
                 {
                     if (sbi == 0 || reachedEnd)
                     {
@@ -1247,7 +1250,7 @@ void LfpDisplaySplitter::updateScreenBuffer()
                             //std::cout << "Rewinding playhead" << std::endl;
                             lfpDisplay->lastBitmapIndex = 0;
 
-                            /*std::cout << "Trial number: " << numTrials << std::endl;
+                            /* std::cout << "Trial number: " << numTrials << std::endl;
                             std::cout << "maxSamples: " << maxSamples << std::endl;
                             std::cout << "ratio: " << ratio << std::endl;
                             std::cout << "dispBufLim: " << dispBufLim << std::endl;

Plugins/LfpViewer/LfpDisplayNode.cpp

@@ -35,8 +35,8 @@ LfpDisplayNode::LfpDisplayNode()
     for (int displayIndex = 0; displayIndex <= 3; displayIndex++)
     {
         triggerChannels.add (-1);
-        latestTrigger.add (-1);
-        latestCurrentTrigger.add (-1);
+        latestTrigger.add (std::nullopt);
+        latestCurrentTrigger.add (std::nullopt);
     }
 }
 
@@ -263,7 +263,7 @@ void LfpDisplayNode::handleTTLEvent (TTLEventPtr event)
                 if (splitDisplays[i]->selectedStreamId == eventStreamId)
                 {
                     // if an event came in on the trigger channel
-                    //std::cout << "Setting latest current trigger to " << eventTime << std::endl;
+                    //std::cout << "Setting latest current trigger for stream " << eventStreamId << " to " << eventTime << std::endl;
                     latestCurrentTrigger.set (i, eventTime);
                 }
             }
@@ -288,7 +288,7 @@ void LfpDisplayNode::handleTTLEvent (TTLEventPtr event)
 void LfpDisplayNode::initializeEventChannels()
 {
     for (int i = 0; i < 3; i++)
-        latestCurrentTrigger.set (i, -1); // reset to -1
+        latestCurrentTrigger.set (i, std::nullopt); // reset
 
     for (auto displayBuffer : displayBuffers)
     {
@@ -301,9 +301,9 @@ void LfpDisplayNode::finalizeEventChannels()
 {
     for (int i = 0; i < 3; i++)
     {
-        if (latestTrigger[i] == -1 && latestCurrentTrigger[i] > -1) // received a trigger, but not yet acknowledged
+        if (! latestTrigger[i].has_value() && latestCurrentTrigger[i].has_value()) // received a trigger, but not yet acknowledged
         {
-            int triggerSample = latestCurrentTrigger[i] + splitDisplays[i]->displayBuffer->displayBufferIndices.getLast();
+            int triggerSample = int (*latestCurrentTrigger[i]) + splitDisplays[i]->displayBuffer->displayBufferIndices.getLast();
             //std::cout << "Setting latest trigger to " << triggerSample << std::endl;
             latestTrigger.set (i, triggerSample);
         }
@@ -347,12 +347,12 @@ void LfpDisplayNode::process (AudioBuffer<float>& buffer)
     }
 }
 
-int64 LfpDisplayNode::getLatestTriggerTime (int id) const
+std::optional<int64> LfpDisplayNode::getLatestTriggerTime (int id) const
 {
     return latestTrigger[id];
 }
 
 void LfpDisplayNode::acknowledgeTrigger (int id)
 {
-    latestTrigger.set (id, -1);
+    latestTrigger.set (id, std::nullopt);
 }

Plugins/LfpViewer/LfpDisplayNode.h

@@ -30,6 +30,7 @@
 #include <ProcessorHeaders.h>
 
 #include <map>
+#include <optional>
 
 class DataViewport;
 
@@ -94,7 +95,7 @@ class TESTABLE LfpDisplayNode : public GenericProcessor
     void setSplitDisplays (Array<LfpDisplaySplitter*>);
 
     /** Returns the latest sample number that triggered a given split display*/
-    int64 getLatestTriggerTime (int splitId) const;
+    std::optional<int64> getLatestTriggerTime (int splitId) const;
 
     /** Acknowledges receipt of a trigger for a given split display*/
     void acknowledgeTrigger (int splitId);
@@ -116,8 +117,8 @@ class TESTABLE LfpDisplayNode : public GenericProcessor
     Array<LfpDisplaySplitter*> splitDisplays;
 
     Array<int> triggerChannels;
-    Array<int64> latestTrigger; // overall timestamp
-    Array<int> latestCurrentTrigger; // within current input buffer
+    Array<std::optional<int64>> latestTrigger; // overall timestamp
+    Array<std::optional<int64>> latestCurrentTrigger; // within current input buffer
 
     static uint16 getEventSourceId (const EventChannel* event);
     static uint16 getChannelSourceId (const ChannelInfoObject* chan);