Update RecordNode new dir creation logic

open-ephys · Feb 22, 2024 · 5d0036a · 5d0036a
1 parent 910cffe
commit 5d0036a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Source/CoreServices.cpp b/Source/CoreServices.cpp
@@ -313,7 +313,7 @@ namespace CoreServices
 			for (auto* node : getProcessorGraph()->getRecordNodes())
 			{
 				if (node->getNodeId() == nodeId)
-					node->createNewDirectory();
+					node->createNewDirectory(true);
 			}
 		}
 

diff --git a/Source/Processors/RecordNode/RecordNode.cpp b/Source/Processors/RecordNode/RecordNode.cpp
@@ -316,10 +316,12 @@ void RecordNode::setDataDirectory(File directory)
 	dataDirectory = directory;
 	newDirectoryNeeded = true;
 
+	createNewDirectory();
+
 	checkDiskSpace();
 }
 
-void RecordNode::createNewDirectory()
+void RecordNode::createNewDirectory(bool resetCounters)
 {
 
 	LOGD("CREATE NEW DIRECTORY");
@@ -331,7 +333,7 @@ void RecordNode::createNewDirectory()
 	File recordingDirectory = rootFolder;
 	int index = 0;
 
-	while (recordingDirectory.exists())
+	while (resetCounters && recordingDirectory.exists())
 	{
 		index += 1;
 		recordingDirectory = File(rootFolder.getFullPathName() + " (" + String(index) + ")");
@@ -344,9 +346,12 @@ void RecordNode::createNewDirectory()
 
 	newDirectoryNeeded = false;
 
-	recordingNumber = 0;
-	experimentNumber = 1;
-	LOGD("RecordNode::createNewDirectory(): experimentNumber = 1");
+	if (resetCounters)
+	{
+		recordingNumber = 0;
+		experimentNumber = 1;
+		LOGD("RecordNode::createNewDirectory(): experimentNumber = 1");
+	}
 	settingsNeeded = true;
 
 }

diff --git a/Source/Processors/RecordNode/RecordNode.h b/Source/Processors/RecordNode/RecordNode.h
@@ -119,7 +119,7 @@ class RecordNode :
 	String generateDirectoryName();
 
 	/* Creates a new recording directory*/
-	void createNewDirectory();
+	void createNewDirectory(bool resetCounters = false);
 
 	/* Callback for responding to changes in data-directory-related settings*/
 	void filenameComponentChanged(FilenameComponent*);

diff --git a/Source/Processors/RecordNode/RecordNodeEditor.cpp b/Source/Processors/RecordNode/RecordNodeEditor.cpp
@@ -148,7 +148,6 @@ void RecordNodeEditor::stopRecording()
     spikeRecord->setEnabled(true);
 }
 
-
 void RecordNodeEditor::comboBoxChanged(ComboBox* box)
 {
 
@@ -261,7 +260,7 @@ void RecordNodeEditor::updateSettings()
     spikeRecord->setToggleState(recordNode->recordSpikes, dontSendNotification);
 
     dataPathLabel->setText(recordNode->getDataDirectory().getFullPathName(), dontSendNotification);
-
+	dataPathLabel->setTooltip(dataPathLabel->getText());
 }
 
 void RecordNodeEditor::buttonClicked(Button *button)