Refresh screen buffer when changing timebase

Author: jsiegle

Plugins/LfpDisplayNode/LfpDisplay.cpp

@@ -444,7 +444,8 @@ void LfpDisplay::refresh()
         totalPixelsToFill = canvasSplit->screenBufferWidth - fillfrom + fillto;
     }
 
-	std::cout << fillfrom << " : " << fillto << " ::: " << "totalPixelsToFill: " << totalPixelsToFill << std::endl;
+    //if (totalPixelsToFill > 0)
+	//    std::cout << fillfrom << " : " << fillto << " ::: " << "totalPixelsToFill: " << totalPixelsToFill << std::endl;
 
     int topBorder = viewport->getViewPositionY();
     int bottomBorder = viewport->getViewHeight() + topBorder;
@@ -493,11 +494,11 @@ void LfpDisplay::refresh()
         fillfrom_local = lastBitmapIndex;
         fillto_local = (lastBitmapIndex + totalPixelsToFill) % totalXPixels;
 
-        /*if (fillto != 0)
-        {
-            std::cout << fillfrom << " : " << fillto << " ::: " <<
-                fillfrom_local << " : " << fillto_local << " :: " << totalPixelsToFill << " ::: " << totalXPixels << std::endl;
-        }*/
+        //if (fillto != 0)
+        //{
+        //    std::cout << fillfrom << " : " << fillto << " ::: " <<
+        //        fillfrom_local << " : " << fillto_local << " :: " << totalPixelsToFill << " ::: " << totalXPixels << std::endl;
+       // }
 
 
         for (int i = 0; i < numChans; i++)
@@ -591,6 +592,7 @@ void LfpDisplay::refresh()
 
 void LfpDisplay::setRange(float r, ContinuousChannel::Type type)
 {
+
     range[type] = r;
 
     if (channels.size() > 0)
@@ -601,7 +603,6 @@ void LfpDisplay::setRange(float r, ContinuousChannel::Type type)
             if (channels[i]->getType() == type)
                 channels[i]->setRange(range[type]);
         }
-        canvasSplit->fullredraw = true; //issue full redraw
 
         if (displayIsPaused)
         {
@@ -840,8 +841,6 @@ void LfpDisplay::mouseWheelMove(const MouseEvent&  e, const MouseWheelDetails&
         viewport->setViewPosition(oldX,oldY+scrollBy); // set back to previous position plus offset
 
         options->setSpreadSelection(newHeight); // update combobox
-        
-        canvasSplit->fullredraw = true;//issue full redraw - scrolling without modifier doesnt require a full redraw
     }
     else
     {
@@ -864,20 +863,15 @@ void LfpDisplay::mouseWheelMove(const MouseEvent&  e, const MouseWheelDetails&
             }
 
             options->setRangeSelection(h); // update combobox
-            canvasSplit->fullredraw = true; //issue full redraw - scrolling without modifier doesnt require a full redraw
-            
+
         }
         else    // just scroll
         {
             //  passes the event up to the viewport so the screen scrolls
             if (viewport != nullptr && e.eventComponent == this) // passes only if it's not a listening event
             {
                 viewport->mouseWheelMove(e.getEventRelativeTo(canvasSplit), wheel);
-
-                //canvasSplit->syncDisplayBuffer();
             }
-                
-
         }
 
     }
@@ -888,8 +882,6 @@ void LfpDisplay::mouseWheelMove(const MouseEvent&  e, const MouseWheelDetails&
         scrollY = viewport->getViewPositionY();
     }
 
-   // refresh(); // doesn't seem to be needed now that channels draw to bitmap
-
 }
 
 void LfpDisplay::toggleSingleChannel(LfpChannelTrack drawableChannel)

Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp

@@ -744,10 +744,10 @@ void LfpDisplaySplitter::resized()
         viewport->setBounds(0, timescaleHeight, getWidth(), getHeight() - 32);
     }
 
-    if (screenBufferMean != nullptr)
-    {
+    //if (screenBufferMean != nullptr)
+    //{
         refreshScreenBuffer();
-    }
+    //}
 
     if (nChans > 0)
     {
@@ -1249,7 +1249,7 @@ void LfpDisplaySplitter::updateScreenBuffer()
 
            // HELPFUL FOR DEBUGGING: 
 
-            if (channel == 0)
+            /*if (channel == 0)
                 std::cout << "Split "
                 << splitID << " ch: "
                 << channel << " sbi: "
@@ -1262,7 +1262,7 @@ void LfpDisplaySplitter::updateScreenBuffer()
                 << subSampleOffset << " max: "
                 << maxSamples << " playhead: "
                 << lfpDisplay->lastBitmapIndex
-                << std::endl;
+                << std::endl;*/
 
             int sampleNumber = 0;
 
@@ -1483,22 +1483,24 @@ void LfpDisplaySplitter::setTimebase(float t)
 {
     timebase = t;
 
-    if (timebase <= 0.1)
+    /*if (timebase <= 0.1)
     {
         stopTimer();
         startTimer(1000);
     }
     else {
         stopTimer();
         startTimer(50);
-    }
+    }*/
 
     if (trialAveraging)
     {
         numTrials = -1;
     }
 
     syncDisplay();
+    syncDisplayBuffer();
+    refreshScreenBuffer();
 
     reachedEnd = true;
 }
@@ -1673,7 +1675,7 @@ void LfpDisplaySplitter::refresh()
 
     updateScreenBuffer();
 
-    if(shouldRebuildChannelList) 
+    if (shouldRebuildChannelList) 
     {
         shouldRebuildChannelList = false;
         lfpDisplay->rebuildDrawableChannelsList(); // calls resized()/refresh() after rebuilding list

Plugins/LfpDisplayNode/LfpDisplayOptions.cpp

@@ -121,7 +121,7 @@ LfpDisplayOptions::LfpDisplayOptions(LfpDisplayCanvas* canvas_, LfpDisplaySplitt
     voltageRanges[ContinuousChannel::Type::ELECTRODE].add("15000");
     selectedVoltageRange[ContinuousChannel::Type::ELECTRODE] = 4;
     rangeGain[ContinuousChannel::Type::ELECTRODE] = 1; //uV
-    rangeSteps[ContinuousChannel::Type::ELECTRODE] = 10;
+    rangeSteps[ContinuousChannel::Type::ELECTRODE] = 20;
     rangeUnits.add(CharPointer_UTF8("\xC2\xB5V"));
     typeNames.add("DATA");