Skip to content
Snippets Groups Projects
Commit 2fba7cc7 authored by jsiegle's avatar jsiegle
Browse files

Get it to compile

parent 02501ebe
No related branches found
No related tags found
No related merge requests found
...@@ -35,15 +35,17 @@ Channel::Channel(GenericProcessor* p, int n) : num(n), eventType(0), processor(p ...@@ -35,15 +35,17 @@ Channel::Channel(GenericProcessor* p, int n) : num(n), eventType(0), processor(p
Channel::Channel(const Channel& ch) Channel::Channel(const Channel& ch)
{ {
processor = ch.processor; processor = ch.processor;
isEventChannel = ch.isEventChannel;
isEnabled = ch.isEnabled; isEnabled = ch.isEnabled;
isMonitored = false; isMonitored = false;
type = ch.type; isADCchannel = ch.isADCchannel;
sampleRate = ch.sampleRate; sampleRate = ch.sampleRate;
bitVolts = ch.bitVolts; bitVolts = ch.bitVolts;
name = ch.name; name = ch.name;
eventType = ch.eventType; eventType = ch.eventType;
nodeId = ch.nodeId; nodeId = ch.nodeId;
num = ch.num; num = ch.num;
originalStream = ch.originalStream; originalStream = ch.originalStream;
originalChannel = ch.originalChannel; originalChannel = ch.originalChannel;
......
...@@ -104,13 +104,17 @@ public: ...@@ -104,13 +104,17 @@ public:
/** Pointer to the channel's parent processor. */ /** Pointer to the channel's parent processor. */
GenericProcessor* processor; GenericProcessor* processor;
int originalStream;
int originalChannel;
// crucial information: // crucial information:
float sampleRate; float sampleRate;
channelType type; channelType type;
// boolean values: // boolean values:
bool isEventChannel;
bool isADCchannel;
bool isMonitored; bool isMonitored;
bool isEnabled; bool isEnabled;
......
...@@ -212,31 +212,31 @@ void RecordNode::addInputChannel(GenericProcessor* sourceNode, int chan) ...@@ -212,31 +212,31 @@ void RecordNode::addInputChannel(GenericProcessor* sourceNode, int chan)
void RecordNode::updateFileName(Channel* ch) void RecordNode::updateFileName(Channel* ch)
{ {
String filename = rootFolder.getFullPathName(); // String filename = rootFolder.getFullPathName();
filename += rootFolder.separatorString; // filename += rootFolder.separatorString;
if (!ch->getType() == EVENT_CHANNEL) // if (!ch->getType() == EVENT_CHANNEL)
{ // {
filename += ch->nodeId; // filename += ch->nodeId;
filename += "_"; // filename += "_";
filename += ch->name; // filename += ch->name;
if (appendTrialNum) // if (appendTrialNum)
{ // {
filename += "_"; // filename += "_";
filename += trialNum; // filename += trialNum;
} // }
filename += ".continuous"; // filename += ".continuous";
} // }
else // else
{ // {
filename += "all_channels.events"; // filename += "all_channels.events";
} // }
ch->filename = filename; // ch->filename = filename;
ch->file = 0; // ch->file = 0;
//std::cout << "Updating " << filename << std::endl; //std::cout << "Updating " << filename << std::endl;
......
...@@ -125,6 +125,13 @@ public: ...@@ -125,6 +125,13 @@ public:
return rootFolder; return rootFolder;
} }
void appendTrialNumber(bool);
void updateTrialNumber();
/** Generate filename for a given channel */
void updateFileName(Channel* ch);
/** Adds a Record Engine to use /** Adds a Record Engine to use
*/ */
void registerRecordEngine(RecordEngine* engine); void registerRecordEngine(RecordEngine* engine);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment