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

Author: jsiegle

Source/Plugins/SpikeSorter/SpikeSortBoxes.cpp

@@ -1705,7 +1705,7 @@ static int iminarg1,iminarg2;
 static double sqrarg;
 #define SQR(a) ((sqrarg = (a)) == 0.0 ? 0.0 : sqrarg * sqrarg)
 
-PCAjob::PCAjob(SorterSpikeArray _spikes, float* _pc1, float* _pc2,
+PCAjob::PCAjob(SorterSpikeArray& _spikes, float* _pc1, float* _pc2,
                float* pc1Min, float* pc2Min, float* pc1Max, float* pc2Max, bool* _reportDone) : spikes(_spikes), reportDone(_reportDone)
 {
     cov = nullptr;
@@ -2142,7 +2142,11 @@ void PCAjob::computeSVD()
 
 void PCAcomputingThread::addPCAjob(PCAjob job)
 {
-    jobs.push(job);
+	{
+		ScopedLock critical(lock);
+		jobs.push(job);
+	}
+	
     if (!isThreadRunning())
     {
         startThread();
@@ -2153,8 +2157,10 @@ void PCAcomputingThread::run()
 {
     while (jobs.size() > 0)
     {
+		lock.enter();
         PCAjob J = jobs.front();
         jobs.pop();
+		lock.exit();
         // compute PCA
         // 1. Compute Covariance matrix
         // 2. Apply SVD on covariance matrix

Source/Plugins/SpikeSorter/SpikeSortBoxes.h

@@ -179,7 +179,7 @@ PCAjob();
 class PCAjob
 {
 public:
-    PCAjob(SorterSpikeArray _spikes, float* _pc1, float* _pc2,
+    PCAjob(SorterSpikeArray& _spikes, float* _pc1, float* _pc2,
            float*, float*, float*, float*, bool* _reportDone);
     ~PCAjob();
     void computeCov();
@@ -215,7 +215,9 @@ class PCAcomputingThread : juce::Thread
     void run(); // computes PCA on waveforms
     void addPCAjob(PCAjob job);
 
+private:
     std::queue<PCAjob> jobs;
+	CriticalSection lock;
 };
 
 class PCAUnit

Source/Plugins/SpikeSorter/SpikeSorterCanvas.cpp

@@ -1075,7 +1075,7 @@ void WaveformAxes::plotSpike(SorterSpikePtr s, Graphics& g)
 	g.setColour(Colour(s->color[0], s->color[1], s->color[2]));
     //g.setColour(Colours::pink);
     //compute the spatial width for each waveform sample
-    float dx = getWidth()/float(spikeBuffer[0]->getChannel()->getTotalSamples());
+    float dx = getWidth()/float(s->getChannel()->getTotalSamples());
 
     /*
     float align = 8 * getWidth()/float(spikeBuffer[0].nSamples);

Source/Processors/DataThreads/DataThread.cpp

@@ -102,9 +102,7 @@ void DataThread::updateChannels()
 void DataThread::setOutputHigh() {}
 void DataThread::setOutputLow() {}
 
-int DataThread::getNumDataOutputs(DataChannel::DataChannelTypes type, int subproc) const { return 0; }
-
-unsigned int DataThread::getNumSubProcessors() const { return 0; }
+unsigned int DataThread::getNumSubProcessors() const { return 1; }
 
 int DataThread::getNumTTLOutputs(int subproc) const { return 0; }