Skip to content

Really view just one subprocessor in the LFP viewer, and also view events not corresponding to any data channels #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aacuevas merged 5 commits into from
Aug 30, 2019
Merged

Really view just one subprocessor in the LFP viewer, and also view events not corresponding to any data channels #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c43958
Start to play subprocessors separately and show Network Events TTLs (…
ethanbb Jun 7, 2019
938ed43
Change condition from source subproc id = 0 to sample rate = 0 (simpler)
ethanbb Jun 11, 2019
9ac0106
Revert "Change condition from source subproc id = 0 to sample rate = …
ethanbb Jun 13, 2019
3d0c01b
Simplify handling sample rates and events in LFP viewer
ethanbb Aug 29, 2019
ce9a7ba
Fix node id helper methods
ethanbb Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 33 additions & 101 deletions Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,68 +212,35 @@ void LfpDisplayCanvas::endAnimation()

void LfpDisplayCanvas::update()
{
if (true)
{
nChans = jmax(processor->getNumSubprocessorChannels(), 0);

std::cout << "Num chans: " << nChans << std::endl;
std::cout << "Num chans: " << nChans << std::endl;

resizeSamplesPerPixelBuffer(nChans);

sampleRate.clear();
screenBufferIndex.clear();
lastScreenBufferIndex.clear();
displayBufferIndex.clear();
sampleRate = 30000; // default

for (auto* arr : { &screenBufferIndex, &lastScreenBufferIndex, &displayBufferIndex })
{
arr->clearQuick();
arr->insertMultiple(0, 0, nChans + 1); // extra channel for events
}

options->setEnabled(nChans != 0);
// must manually ensure that overlapSelection propagates up to canvas
channelOverlapFactor = options->selectedOverlapValue.getFloatValue();

std::cout << "Checking channels: " << nChans << std::endl;
for (int i = 0; i < processor->getNumInputs() + 1; i++) // extra channel for events
{
//std::cout << i << std::endl;
if (processor->getNumInputs() > 0)
{
if (i < processor->getNumInputs())
{
if (processor->getDataChannel(i)->getSubProcessorIdx() == drawableSubprocessor)
{
sampleRate.add(processor->getDataChannel(i)->getSampleRate());
//std::cout << "Adding sample rate " << processor->getDataChannel(i)->getSampleRate() << std::endl;
}

}
else
{
//Since for now the canvas only supports one event channel, find the first TTL one and use that as sampleRate.
//This is a bit hackish and should be fixed for proper multi-ttl-channel support

for (int c = 0; c < processor->getTotalEventChannels(); c++)
{
if (processor->getEventChannel(c)->getChannelType() == EventChannel::TTL)
{
sampleRate.add(processor->getEventChannel(c)->getSampleRate());
std::cout << "Sample rate = " << processor->getEventChannel(c)->getSampleRate() << std::endl;

}
}
}
}
else
for (int i = 0, nInputs = processor->getNumInputs(); i < nInputs; i++)
{
if (processor->getDataSubprocId(i) == drawableSubprocessor)
{
sampleRate.add(30000);
sampleRate = processor->getDataChannel(i)->getSampleRate();
break;
}

// std::cout << "Sample rate for ch " << i << " = " << sampleRate[i] << std::endl;
displayBufferIndex.add(0);
screenBufferIndex.add(0);
lastScreenBufferIndex.add(0);
}

lfpDisplay->setDisplayedSampleRate(sampleRate[0]); // only one sample rate possible for now
std::cout << "Setting display sample rate to " << sampleRate[0] << std::endl;

std::cout << "Checking channel alignment: " << nChans << std::endl;
if (nChans != lfpDisplay->getNumChannels())
{
Expand Down Expand Up @@ -319,8 +286,6 @@ void LfpDisplayCanvas::update()
lfpDisplay->rebuildDrawableChannelsList();
}
}

}
}


Expand Down Expand Up @@ -410,7 +375,7 @@ void LfpDisplayCanvas::updateScreenBuffer()
// std::cout << channel << " " << sbi << " " << dbi << " " << nSamples << std::endl;


float ratio = sampleRate[channel] * timebase / float(getWidth() - leftmargin - scrollBarThickness); // samples / pixel
float ratio = sampleRate * timebase / float(getWidth() - leftmargin - scrollBarThickness); // samples / pixel
// this number is crucial: converting from samples to values (in px) for the screen buffer
int valuesNeeded = (int) float(nSamples) / ratio; // N pixels needed for this update

Expand Down Expand Up @@ -658,24 +623,16 @@ bool LfpDisplayCanvas::getDrawMethodState()
return options->getDrawMethodState(); //drawMethodButton->getToggleState();
}

int LfpDisplayCanvas::getChannelSampleRate(int channel)
{
return sampleRate[channel];
}

void LfpDisplayCanvas::setDrawableSampleRate(float samplerate)
{
// std::cout << "setting the drawable sample rate in the canvas" << std::endl;
displayedSampleRate = samplerate;
lfpDisplay->setDisplayedSampleRate(samplerate);
}

void LfpDisplayCanvas::setDrawableSubprocessor(int idx)
void LfpDisplayCanvas::setDrawableSubprocessor(uint32 sp)
{
drawableSubprocessor = idx;
lfpDisplay->setDisplayedSubprocessor(idx);
std::cout << "Setting LFP canvas subprocessor to " << idx << std::endl;
processor->setSubprocessor(idx);
drawableSubprocessor = sp;
std::cout << "Setting LFP canvas subprocessor to " << sp << std::endl;
update();
}

Expand Down Expand Up @@ -887,7 +844,7 @@ LfpDisplayOptions::LfpDisplayOptions(LfpDisplayCanvas* canvas_, LfpTimescale* ti
voltageRanges[DataChannel::AUX_CHANNEL].add("2000");
//voltageRanges[DataChannel::AUX_CHANNEL].add("5000");
selectedVoltageRange[DataChannel::AUX_CHANNEL] = 9;
rangeGain[DataChannel::AUX_CHANNEL] = 0.001; //mV
rangeGain[DataChannel::AUX_CHANNEL] = 0.001f; //mV
rangeSteps[DataChannel::AUX_CHANNEL] = 10;
rangeUnits.add("mV");
typeNames.add("AUX");
Expand Down Expand Up @@ -1493,7 +1450,7 @@ void LfpDisplayOptions::buttonClicked(Button* b)

if ((idx >= 0) && (b->getToggleState()))
{
for (int i = 0; i < processor->getNumInputs(); i++)
for (int i = 0; i < lfpDisplay->getNumChannels(); i++)
{
if (lfpDisplay->channels[i]->getSelected())
{
Expand Down Expand Up @@ -2172,7 +2129,7 @@ void LfpTimescale::setTimebase(float t)
if (labelIncrement < 0.2)
labelIncrement *= 2;
else
labelIncrement += 0.2;
labelIncrement += 0.2f;
}

for (float i = labelIncrement; i < timebase; i += labelIncrement)
Expand Down Expand Up @@ -2634,31 +2591,6 @@ void LfpDisplay::cacheNewChannelHeight(int r)
cachedDisplayChannelHeight = r;
}

float LfpDisplay::getDisplayedSampleRate()
{
return drawableSampleRate;
}

// Must manually call rebuildDrawableChannelsList after this is set, typically will happen
// already as a result of some other procedure
void LfpDisplay::setDisplayedSampleRate(float samplerate)
{
std::cout << "Setting the displayed samplerate for LfpDisplayCanvas to " << samplerate << std::endl;
drawableSampleRate = samplerate;
}

int LfpDisplay::getDisplayedSubprocessor()
{
return drawableSubprocessorIdx;
}

void LfpDisplay::setDisplayedSubprocessor(int subProcessorIdx)
{
drawableSubprocessorIdx = subProcessorIdx;
refresh();

}

bool LfpDisplay::getChannelsReversed()
{
return channelsReversed;
Expand All @@ -2673,7 +2605,7 @@ void LfpDisplay::setChannelsReversed(bool state)
if (getSingleChannelState()) return; // don't reverse if single channel

// reverse channels that are currently in drawableChannels
for (size_t i = 0, j = drawableChannels.size() - 1, len = drawableChannels.size()/2;
for (int i = 0, j = drawableChannels.size() - 1, len = drawableChannels.size()/2;
i < len;
i++, j--)
{
Expand Down Expand Up @@ -2708,7 +2640,7 @@ void LfpDisplay::setChannelsReversed(bool state)
}

// add the channels and channel info again
for (size_t i = 0, len = drawableChannels.size(); i < len; i++)
for (int i = 0, len = drawableChannels.size(); i < len; i++)
{

if (!drawableChannels[i].channel->getHidden())
Expand Down Expand Up @@ -2890,8 +2822,8 @@ void LfpDisplay::toggleSingleChannel(int chan)
}

// update drawableChannels, give only the single channel to focus on
Array<LfpChannelTrack> channelsToDraw{lfpChannelTrack};
drawableChannels = channelsToDraw;
drawableChannels.clearQuick();
drawableChannels.add(lfpChannelTrack);

addAndMakeVisible(lfpChannelTrack.channel);
addAndMakeVisible(lfpChannelTrack.channelInfo);
Expand Down Expand Up @@ -2940,7 +2872,7 @@ void LfpDisplay::rebuildDrawableChannelsList()
drawableChannels = Array<LfpDisplay::LfpChannelTrack>();

// iterate over all channels and select drawable ones
for (size_t i = 0, drawableChannelNum = 0; i < channels.size(); i++)
for (int i = 0, drawableChannelNum = 0; i < channels.size(); i++)
{
// std::cout << "\tchannel " << i << " has subprocessor index of " << channelInfo[i]->getSubprocessorIdx() << std::endl;
// if channel[i] is not sourced from the correct subprocessor, then hide it and continue
Expand Down Expand Up @@ -3279,7 +3211,7 @@ void LfpChannelDisplay::pxPaint()
//draw zero line
int m = getY()+center;

if(m > 0 & m < display->lfpChannelBitmap.getHeight())
if(m > 0 && m < display->lfpChannelBitmap.getHeight())
{
if ( bdLfpChannelBitmap.getPixelColour(i,m) == display->backgroundColour ) { // make sure we're not drawing over an existing plot from another channel
bdLfpChannelBitmap.setPixelColour(i,m,Colour(50,50,50));
Expand All @@ -3294,7 +3226,7 @@ void LfpChannelDisplay::pxPaint()

for (m = start; m <= start + jump*4; m += jump)
{
if (m > 0 & m < display->lfpChannelBitmap.getHeight())
if (m > 0 && m < display->lfpChannelBitmap.getHeight())
{
if ( bdLfpChannelBitmap.getPixelColour(i,m) == display->backgroundColour ) // make sure we're not drawing over an existing plot from another channel
bdLfpChannelBitmap.setPixelColour(i, m, Colour(80,80,80));
Expand Down Expand Up @@ -3431,7 +3363,7 @@ void LfpChannelDisplay::pxPaint()
{
int clipmarker = jto_wholechannel_clip;

if(clipmarker>0 & clipmarker<display->lfpChannelBitmap.getHeight()){
if(clipmarker>0 && clipmarker<display->lfpChannelBitmap.getHeight()){
bdLfpChannelBitmap.setPixelColour(i,clipmarker-j,Colour(255,255,255));
}
}
Expand All @@ -3442,7 +3374,7 @@ void LfpChannelDisplay::pxPaint()
{
int clipmarker = jfrom_wholechannel_clip;

if(clipmarker>0 & clipmarker<display->lfpChannelBitmap.getHeight()){
if(clipmarker>0 && clipmarker<display->lfpChannelBitmap.getHeight()){
bdLfpChannelBitmap.setPixelColour(i,clipmarker+j,Colour(255,255,255));
}
}
Expand All @@ -3455,7 +3387,7 @@ void LfpChannelDisplay::pxPaint()
if (spikeFlag) // draw spikes
{
for (int k=jfrom_wholechannel; k<=jto_wholechannel; k++){ // draw line
if(k>0 & k<display->lfpChannelBitmap.getHeight()){
if(k>0 && k<display->lfpChannelBitmap.getHeight()){
bdLfpChannelBitmap.setPixelColour(i,k,lineColour);
}
};
Expand All @@ -3473,7 +3405,7 @@ void LfpChannelDisplay::pxPaint()
if (fmod((i+k),50)>25){
thiscolour=Colour(255,255,255);
}
if(k>0 & k<display->lfpChannelBitmap.getHeight()){
if(k>0 && k<display->lfpChannelBitmap.getHeight()){
bdLfpChannelBitmap.setPixelColour(i,k,thiscolour);
}
};
Expand Down Expand Up @@ -4059,7 +3991,7 @@ void SupersampledBitmapPlotter::plot(Image::BitmapData &bdLfpChannelBitmap, LfpB
// int sampleCountThisPixel = lfpDisplay->canvas->getSampleCountPerPixel(pInfo.samp);
int sampleCountThisPixel = pInfo.sampleCountPerPixel;

if (pInfo.samplerange>0 & sampleCountThisPixel>0)
if (pInfo.samplerange>0 && sampleCountThisPixel>0)
{

//float localHist[samplerange]; // simple histogram
Expand Down Expand Up @@ -4113,7 +4045,7 @@ void SupersampledBitmapPlotter::plot(Image::BitmapData &bdLfpChannelBitmap, LfpB
//Colour gradedColor = Colour(0,255,0);

int ploty = pInfo.from + s + pInfo.y;
if(ploty>0 & ploty < display->lfpChannelBitmap.getHeight()) {
if(ploty>0 && ploty < display->lfpChannelBitmap.getHeight()) {
bdLfpChannelBitmap.setPixelColour(pInfo.samp, pInfo.from + s + pInfo.y, gradedColor);
}
}
Expand Down
29 changes: 6 additions & 23 deletions Plugins/LfpDisplayNode/LfpDisplayCanvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ class LfpDisplayCanvas : public Visualizer,
/** Returns the subprocessor index of the given channel */
int getChannelSubprocessorIdx(int channel);

/** Delegates a subprocessor index for drawing to the LfpDisplay referenced by this
/** Delegates a subprocessor for drawing to the LfpDisplay referenced by this
this canvas */
void setDrawableSubprocessor(int idx);
void setDrawableSubprocessor(uint32 sp);

const float getXCoord(int chan, int samp);
const float getYCoord(int chan, int samp);
Expand Down Expand Up @@ -168,15 +168,15 @@ class LfpDisplayCanvas : public Visualizer,

private:

Array<float> sampleRate;
float sampleRate;

bool optionsDrawerIsOpen;

float displayGain;
float timeOffset;
//int spread ; // vertical spacing between channels

int drawableSubprocessor;
uint32 drawableSubprocessor;
float displayedSampleRate;

//float waves[MAX_N_CHAN][MAX_N_SAMP*2]; // we need an x and y point for each sample
Expand Down Expand Up @@ -502,24 +502,7 @@ class LfpDisplay : public Component
int getChannelHeight();

LfpChannelColourScheme * getColourSchemePtr();

/** Returns the sample rate that is currently filtering the drawable channels */
float getDisplayedSampleRate();

/** Sets the samplerate that displayed channels must be set to. No channels with
differing samplerates will be drawn to screen.

This function does not automatically repopulate the drawableChannels list, so
rebuildDrawableChannelsList must be called before the screen is updated.

@see LfpDisplayCanvas::setDrawableSampleRate, LfpDisplayNode::updateSettings
*/
void setDisplayedSampleRate(float samplerate);

int getDisplayedSubprocessor();

void setDisplayedSubprocessor(int subProcessorIdx);


/** Caches a new channel height without updating the channels */
void cacheNewChannelHeight(int r);

Expand Down Expand Up @@ -647,7 +630,7 @@ class LfpDisplay : public Component
int displaySkipAmt;
int cachedDisplayChannelHeight; // holds a channel height if reset during single channel focus
float drawableSampleRate;
int drawableSubprocessorIdx;
uint32 drawableSubprocessor;

int totalHeight;

Expand Down
Loading