Merge branch 'development' of https://github.com/open-ephys/plugin-GUI into development

jsiegle · jsiegle · commit d172d6d26bc1 · 2023-01-23T19:12:23.000-08:00
diff --git a/Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp b/Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp
@@ -1034,7 +1034,7 @@ void LfpDisplaySplitter::refreshScreenBuffer()
 
     screenBufferWidth = getWidth() * extraWidth;
 
-    if (screenBufferMean->getNumSamples() < screenBufferWidth) // screenbuffer is too small
+    if (screenBufferMean->getNumSamples() < screenBufferWidth || screenBufferMean->getNumChannels() != nChans) // screenbuffer is too small
     {
         eventDisplayBuffer->setSize(1, screenBufferWidth);
         screenBufferMin->setSize(nChans, screenBufferWidth);

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ void LfpDisplaySplitter::refreshScreenBuffer()`
`1034`	`1034`
`1035`	`1035`	`screenBufferWidth = getWidth() * extraWidth;`
`1036`	`1036`
`1037`		`- if (screenBufferMean->getNumSamples() < screenBufferWidth) // screenbuffer is too small`
	`1037`	`+ if (screenBufferMean->getNumSamples() < screenBufferWidth \|\| screenBufferMean->getNumChannels() != nChans) // screenbuffer is too small`
`1038`	`1038`	`{`
`1039`	`1039`	`eventDisplayBuffer->setSize(1, screenBufferWidth);`
`1040`	`1040`	`screenBufferMin->setSize(nChans, screenBufferWidth);`