Skip to content

Commit 5d0036a

Browse files
committed
Update RecordNode new dir creation logic
1 parent 910cffe commit 5d0036a

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

Source/CoreServices.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ namespace CoreServices
313313
for (auto* node : getProcessorGraph()->getRecordNodes())
314314
{
315315
if (node->getNodeId() == nodeId)
316-
node->createNewDirectory();
316+
node->createNewDirectory(true);
317317
}
318318
}
319319

Source/Processors/RecordNode/RecordNode.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,12 @@ void RecordNode::setDataDirectory(File directory)
316316
dataDirectory = directory;
317317
newDirectoryNeeded = true;
318318

319+
createNewDirectory();
320+
319321
checkDiskSpace();
320322
}
321323

322-
void RecordNode::createNewDirectory()
324+
void RecordNode::createNewDirectory(bool resetCounters)
323325
{
324326

325327
LOGD("CREATE NEW DIRECTORY");
@@ -331,7 +333,7 @@ void RecordNode::createNewDirectory()
331333
File recordingDirectory = rootFolder;
332334
int index = 0;
333335

334-
while (recordingDirectory.exists())
336+
while (resetCounters && recordingDirectory.exists())
335337
{
336338
index += 1;
337339
recordingDirectory = File(rootFolder.getFullPathName() + " (" + String(index) + ")");
@@ -344,9 +346,12 @@ void RecordNode::createNewDirectory()
344346

345347
newDirectoryNeeded = false;
346348

347-
recordingNumber = 0;
348-
experimentNumber = 1;
349-
LOGD("RecordNode::createNewDirectory(): experimentNumber = 1");
349+
if (resetCounters)
350+
{
351+
recordingNumber = 0;
352+
experimentNumber = 1;
353+
LOGD("RecordNode::createNewDirectory(): experimentNumber = 1");
354+
}
350355
settingsNeeded = true;
351356

352357
}

Source/Processors/RecordNode/RecordNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class RecordNode :
119119
String generateDirectoryName();
120120

121121
/* Creates a new recording directory*/
122-
void createNewDirectory();
122+
void createNewDirectory(bool resetCounters = false);
123123

124124
/* Callback for responding to changes in data-directory-related settings*/
125125
void filenameComponentChanged(FilenameComponent*);

Source/Processors/RecordNode/RecordNodeEditor.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ void RecordNodeEditor::stopRecording()
148148
spikeRecord->setEnabled(true);
149149
}
150150

151-
152151
void RecordNodeEditor::comboBoxChanged(ComboBox* box)
153152
{
154153

@@ -261,7 +260,7 @@ void RecordNodeEditor::updateSettings()
261260
spikeRecord->setToggleState(recordNode->recordSpikes, dontSendNotification);
262261

263262
dataPathLabel->setText(recordNode->getDataDirectory().getFullPathName(), dontSendNotification);
264-
263+
dataPathLabel->setTooltip(dataPathLabel->getText());
265264
}
266265

267266
void RecordNodeEditor::buttonClicked(Button *button)

0 commit comments

Comments
 (0)