On OS X, the default directory for files explicitly saved/loaded by the user is now ~/Documents/open-ephys. Added CoreServices::getDefaultUserSaveDirectory(), which returns ~/Documents/open-ephys on OS X and the current working directory on other platforms.

Author: cstawarz

Source/CoreServices.cpp

@@ -159,5 +159,18 @@ const char* getApplicationResource(const char* name, int& size)
 {
 	return BinaryData::getNamedResource(name, size);
 }
+    
+File getDefaultUserSaveDirectory()
+{
+#if defined(__APPLE__)
+    File dir = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("open-ephys");
+    if (!dir.isDirectory()) {
+        dir.createDirectory();
+    }
+    return std::move(dir);
+#else
+    return File::getCurrentWorkingDirectory();
+#endif
+}
 
 };

Source/CoreServices.h

@@ -104,6 +104,9 @@ PLUGIN_API int addSpikeElectrode(SpikeRecordInfo* elec);
 };
 
 PLUGIN_API const char* getApplicationResource(const char* name, int& size);
+    
+/** Gets the default directory for user-initiated file saving/loading */
+PLUGIN_API File getDefaultUserSaveDirectory();
 
 };
 

Source/MainWindow.cpp

@@ -182,8 +182,6 @@ void MainWindow::loadWindowBounds()
 	std::cout << "Loading window bounds." << std::endl;
 	std::cout << std::endl;
 
-	//File file = File::getCurrentWorkingDirectory().getChildFile("windowState.xml");
-
 	File file = getSavedStateDirectory().getChildFile("windowState.xml");
 
 	XmlDocument doc(file);

Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp

@@ -553,7 +553,7 @@ void ChannelMappingEditor::buttonEvent(Button* button)
         if (!acquisitionIsActive)
         {
             FileChooser fc("Choose the file name...",
-                               File::getCurrentWorkingDirectory(),
+                               CoreServices::getDefaultUserSaveDirectory(),
                                "*",
                                true);
 
@@ -576,7 +576,7 @@ void ChannelMappingEditor::buttonEvent(Button* button)
         if (!acquisitionIsActive)
         {
             FileChooser fc("Choose a file to load...",
-                               File::getCurrentWorkingDirectory(),
+                               CoreServices::getDefaultUserSaveDirectory(),
                                "*",
                                true);
 

Source/Processors/FileReader/FileReaderEditor.cpp

@@ -36,7 +36,7 @@ FileReaderEditor::FileReaderEditor (GenericProcessor* parentNode, bool useDefaul
     , recTotalTime              (0)
     , m_isFileDragAndDropActive (false)
 {
-    lastFilePath = File::getCurrentWorkingDirectory();
+    lastFilePath = CoreServices::getDefaultUserSaveDirectory();
 
     fileButton = new UtilityButton ("F:", Font ("Small Text", 13, Font::plain));
     fileButton->addListener (this);

Source/UI/ControlPanel.cpp

@@ -427,10 +427,7 @@ ControlPanel::ControlPanel(ProcessorGraph* graph_, AudioComponent* audio_)
 
 
 #if defined(__APPLE__)
-    const File dataDirectory = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("open-ephys");
-    if (!dataDirectory.isDirectory()) {
-        dataDirectory.createDirectory();
-    }
+    const File dataDirectory = CoreServices::getDefaultUserSaveDirectory();
 #else
     const File dataDirectory = File::getSpecialLocation(File::currentExecutableFile).getParentDirectory();
 #endif

Source/UI/EditorViewport.cpp

@@ -1231,7 +1231,7 @@ const String EditorViewport::saveState(File fileToUse)
     currentFile = fileToUse;
 
     // FileChooser fc("Choose the file to save...",
-    //                File::getCurrentWorkingDirectory(),
+    //                CoreServices::getDefaultUserSaveDirectory(),
     //                "*",
     //                true);
 
@@ -1411,7 +1411,7 @@ const String EditorViewport::loadState(File fileToLoad)
 {
 
     // FileChooser fc("Choose a file to load...",
-    //                File::getCurrentWorkingDirectory(),
+    //                CoreServices::getDefaultUserSaveDirectory(),
     //                "*.xml",
     //                true);
 

Source/UI/UIComponent.cpp

@@ -531,7 +531,7 @@ bool UIComponent::perform(const InvocationInfo& info)
 		case openConfiguration:
 			{
 				FileChooser fc("Choose a file to load...",
-						File::getCurrentWorkingDirectory(),
+						CoreServices::getDefaultUserSaveDirectory(),
 						"*",
 						true);
 
@@ -557,7 +557,7 @@ bool UIComponent::perform(const InvocationInfo& info)
 				else
 				{
 					FileChooser fc("Choose the file name...",
-							File::getCurrentWorkingDirectory(),
+							CoreServices::getDefaultUserSaveDirectory(),
 							"*",
 							true);
 
@@ -580,7 +580,7 @@ bool UIComponent::perform(const InvocationInfo& info)
 			{
 
 				FileChooser fc("Choose the file name...",
-						File::getCurrentWorkingDirectory(),
+						CoreServices::getDefaultUserSaveDirectory(),
 						"*",
 						true);