Merge pull request #330 from anjaldoshi/lfp-refactor

Support on-the-fly sub-processor switching in LFP Viewer

Author: medengineer

Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp

@@ -212,7 +212,9 @@ void LfpDisplayCanvas::endAnimation()
 
 void LfpDisplayCanvas::update()
 {
-    nChans = jmax(processor->getNumSubprocessorChannels(), 0);
+    displayBufferSize = displayBuffer->getNumSamples();
+
+	nChans = jmax(processor->getNumSubprocessorChannels(), 0);
 
     std::cout << "Num chans: " << nChans << std::endl;
 
@@ -631,6 +633,7 @@ void LfpDisplayCanvas::setDrawableSubprocessor(uint32 sp)
 {
 	drawableSubprocessor = sp;
 	std::cout << "Setting LFP canvas subprocessor to " << sp << std::endl;
+	displayBuffer = processor->getDisplayBufferAddress();
 	update();
 }
 
@@ -816,7 +819,7 @@ LfpDisplayOptions::LfpDisplayOptions(LfpDisplayCanvas* canvas_, LfpTimescale* ti
 	selectedVoltageRange[DataChannel::HEADSTAGE_CHANNEL] = 4;
 	rangeGain[DataChannel::HEADSTAGE_CHANNEL] = 1; //uV
 	rangeSteps[DataChannel::HEADSTAGE_CHANNEL] = 10;
-    rangeUnits.add("uV");
+    rangeUnits.add(CharPointer_UTF8("\xC2\xB5V"));
     typeNames.add("DATA");
 
     UtilityButton* tbut;

Plugins/LfpDisplayNode/LfpDisplayCanvas.h

@@ -182,7 +182,7 @@ class LfpDisplayCanvas : public Visualizer,
     //float waves[MAX_N_CHAN][MAX_N_SAMP*2]; // we need an x and y point for each sample
 
     LfpDisplayNode* processor;
-    AudioSampleBuffer* displayBuffer; // sample wise data buffer for display
+    std::shared_ptr<AudioSampleBuffer> displayBuffer; // sample wise data buffer for display
     ScopedPointer<AudioSampleBuffer> screenBuffer; // subsampled buffer- one int per pixel
 
     //'define 3 buffers for min mean and max for better plotting of spikes

Plugins/LfpDisplayNode/LfpDisplayEditor.cpp

@@ -58,12 +58,12 @@ LfpDisplayEditor::~LfpDisplayEditor()
 
 void LfpDisplayEditor::startAcquisition()
 {
-	subprocessorSelection->setEnabled(false);
+	//subprocessorSelection->setEnabled(false);
 }
 
 void LfpDisplayEditor::stopAcquisition()
 {
-	subprocessorSelection->setEnabled(true);
+	//subprocessorSelection->setEnabled(true);
 }
 
 Visualizer* LfpDisplayEditor::createNewCanvas()
@@ -170,6 +170,11 @@ void LfpDisplayEditor::updateSubprocessorSelectorOptions()
     }
 }
 
+SortedSet<uint32> LfpDisplayEditor::getInputSubprocessors()
+{
+	return inputSubprocessors;
+}
+
 void LfpDisplayEditor::saveVisualizerParameters(XmlElement* xml)
 {
 

Plugins/LfpDisplayNode/LfpDisplayEditor.h

@@ -77,6 +77,8 @@ class LfpDisplayEditor : public VisualizerEditor,
      */
     void updateSubprocessorSelectorOptions();
 
+	SortedSet<uint32> getInputSubprocessors();
+
 private:
 
     SortedSet<uint32> inputSubprocessors;