Skip to content

Commit 2c574d4

Browse files
committed
added functions getRecordingNumber and getExperimentNumber to CoreServcies. Extended NetworkEvents plugin to send this upon request
1 parent 5028bfe commit 2c574d4

5 files changed

Lines changed: 39 additions & 2 deletions

File tree

Source/CoreServices.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ File getRecordingPath()
119119
return getProcessorGraph()->getRecordNode()->getDataDirectory();
120120
}
121121

122+
int getRecordingNumber()
123+
{
124+
return getProcessorGraph()->getRecordNode()->getRecordingNumber();
125+
}
126+
127+
int getExperimentNumber()
128+
{
129+
return getProcessorGraph()->getRecordNode()->getExperimentNumber();
130+
}
131+
122132
void writeSpike(SpikeObject& spike, int electrodeIndex)
123133
{
124134
getProcessorGraph()->getRecordNode()->writeSpike(spike, electrodeIndex);

Source/CoreServices.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ namespace RecordNode
8383
/** Forces creation of new directory on recording */
8484
PLUGIN_API void createNewrecordingDir();
8585

86-
/** Gets the current recording directory */
86+
/** Gets the current recording directories and status information */
8787
PLUGIN_API File getRecordingPath();
88+
PLUGIN_API int getRecordingNumber();
89+
PLUGIN_API int getExperimentNumber();
8890

8991
/* Spike related methods. See record engine documentation */
9092

Source/Plugins/NetworkEvents/NetworkEvents.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,18 @@ String NetworkEvents::handleSpecialMessages(StringTS msg)
495495
String msg(file.getFullPathName());
496496
return msg;
497497
}
498+
else if (cmd.compareIgnoreCase("getRecordingNumber") == 0)
499+
{
500+
String status;
501+
status += CoreServices::RecordNode::getRecordingNumber();
502+
return status;
503+
}
504+
else if (cmd.compareIgnoreCase("getExperimentNumber") == 0)
505+
{
506+
String status;
507+
status += CoreServices::RecordNode::getExperimentNumber();
508+
return status;
509+
}
498510
else
499511
{
500512
return String("NotHandled");

Source/Processors/RecordNode/RecordNode.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,15 @@ String RecordNode::generateDateString()
278278

279279
}
280280

281+
int RecordNode::getExperimentNumber()
282+
{
283+
return experimentNumber;
284+
}
285+
286+
int RecordNode::getRecordingNumber()
287+
{
288+
return recordingNumber;
289+
}
281290

282291
void RecordNode::setParameter(int parameterIndex, float newValue)
283292
{

Source/Processors/RecordNode/RecordNode.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ class RecordNode : public GenericProcessor,
7474
*/
7575
void setParameter(int parameterIndex, float newValue);
7676

77+
/** returns current experiment number */
78+
int getExperimentNumber();
79+
/** returns current recording number */
80+
int getRecordingNumber();
81+
7782
/** Called by the processor graph for each processor that could record data
7883
*/
7984
void registerProcessor(GenericProcessor* sourceNode);
@@ -212,7 +217,6 @@ class RecordNode : public GenericProcessor,
212217
/** Generates a default directory name, based on the current date and time */
213218
String generateDirectoryName();
214219

215-
216220
/** Cycle through the event buffer, looking for data to save */
217221
void handleEvent(int eventType, MidiMessage& event, int samplePos);
218222

0 commit comments

Comments
 (0)