From 193791b1e480aa6ed03e8a68a3f8ef13aae44d20 Mon Sep 17 00:00:00 2001
From: jsiegle <joshs@alleninstitute.org>
Date: Tue, 23 Dec 2014 14:24:46 -0800
Subject: [PATCH] Fix issues with FileReader
---
Source/Processors/FileReader/FileReader.cpp | 18 +++++++++---------
Source/Processors/FileReader/FileReader.h | 4 ++--
.../PSTH/PeriStimulusTimeHistogramNode.h | 3 ---
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Source/Processors/FileReader/FileReader.cpp b/Source/Processors/FileReader/FileReader.cpp
index 33386f1f6..d558bd5ed 100644
--- a/Source/Processors/FileReader/FileReader.cpp
+++ b/Source/Processors/FileReader/FileReader.cpp
@@ -72,7 +72,7 @@ float FileReader::getDefaultSampleRate()
return 44100.0;
}
-int FileReader::getDefaultNumOutputs()
+int FileReader::getNumHeadstageOutputs()
{
if (input)
return currentNumChannels;
@@ -80,10 +80,10 @@ int FileReader::getDefaultNumOutputs()
return 16;
}
-float FileReader::getBitVolts(int chan)
+float FileReader::getBitVolts(Channel* chan)
{
if (input)
- return channelInfo[chan].bitVolts;
+ return chan->bitVolts;
else
return 0.05f;
}
@@ -158,13 +158,13 @@ String FileReader::getFile()
void FileReader::updateSettings()
{
- if (!input) return;
+ // if (!input) return;
- for (int i=0; i < currentNumChannels; i++)
- {
- channels[i]->bitVolts = channelInfo[i].bitVolts;
- channels[i]->name = channelInfo[i].name;
- }
+ // for (int i=0; i < currentNumChannels; i++)
+ // {
+ // channels[i]->bitVolts = channelInfo[i].bitVolts;
+ // channels[i]->name = channelInfo[i].name;
+ // }
}
diff --git a/Source/Processors/FileReader/FileReader.h b/Source/Processors/FileReader/FileReader.h
index 5d77a4e50..0624b511f 100644
--- a/Source/Processors/FileReader/FileReader.h
+++ b/Source/Processors/FileReader/FileReader.h
@@ -71,8 +71,8 @@ public:
void enabledState(bool t);
float getDefaultSampleRate();
- int getDefaultNumOutputs();
- float getBitVolts(int chan);
+ int getNumHeadstageOutputs();
+ float getBitVolts(Channel* chan);
bool setFile(String fullpath);
String getFile();
diff --git a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h
index fd94553d7..fc6ec7ed7 100644
--- a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h
+++ b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h
@@ -39,8 +39,6 @@ class DataViewport;
class SpikePlot;
class TrialCircularBuffer;
-
-
class PeriStimulusTimeHistogramNode : public GenericProcessor
{
public:
@@ -61,7 +59,6 @@ public:
void syncInternalDataStructuresWithSpikeSorter();
-
void allocateTrialCircularBuffer();
void handleEvent(int, MidiMessage&, int);
--
GitLab