Improved settings and logging file handling.

9 files changed, 25 insertions, 11 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 7fcf108c9..4f53fd5c0 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index b8e0906c2..a8ef49de0 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
index 427d1d003..5bd6ff809 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
@@ -206,7 +206,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels
             MediaSeekCommand = new RelayCommand<double>(MediaSeek, (x) => Player.IsPlaying);
             MediaSeekHoldCommand = new RelayCommand(MediaSeekHold, () => Player.IsPlaying);
 
-            _recordingsFolder = Path.Combine(SettingsManager.Default.Folder, "Recordings");
+            _recordingsFolder = Path.Combine(Path.GetDirectoryName(SettingsManager.Default.Folder), "Recordings");
             Directory.CreateDirectory(_recordingsFolder);
 
             _frameProvider.FrameReceived += _frameProvider_FrameReceived;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
index 09cb9a8b6..d663d6088 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
@@ -22,11 +22,14 @@ namespace Tango.MachineStudio.Logging.Parsing
 
             String logFile = logger != null ? logger.LogFile : null;
 
-            foreach (var file in Directory.GetFiles(SettingsManager.Default.Folder + "\\embedded logs", "*.log").Where(x => Path.GetFileName(x).StartsWith("embedded") && x != logFile))
+            if (Directory.Exists(MachineOperator.EmbeddedLogsFolder))
             {
-                String dateString = Path.GetFileNameWithoutExtension(file).Replace("embedded-", "");
-                DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
-                logFiles.Add(new LogFile() { DateTime = date, File = file });
+                foreach (var file in Directory.GetFiles(MachineOperator.EmbeddedLogsFolder, "*.log").Where(x => x != logFile))
+                {
+                    String dateString = Path.GetFileNameWithoutExtension(file).Replace(MachineOperator.EmbeddedLogsTag + "-", "");
+                    DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
+                    logFiles.Add(new LogFile() { DateTime = date, File = file });
+                }
             }
 
             return logFiles;
diff --git a/Software/Visual_Studio/Tango.Core/CoreSettings.cs b/Software/Visual_Studio/Tango.Core/CoreSettings.cs
index 82261183a..f02e84615 100644
--- a/Software/Visual_Studio/Tango.Core/CoreSettings.cs
+++ b/Software/Visual_Studio/Tango.Core/CoreSettings.cs
@@ -19,7 +19,13 @@ namespace Tango.Core
         /// </summary>
         public CoreSettings()
         {
+
+#if DEBUG
+            SQLServerAddress = "localhost\\SQLEXPRESS";
+#else
             SQLServerAddress = "twine01\\SQLTWINE";
+#endif
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index a01375212..09eb1ab1c 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -34,15 +34,19 @@ namespace Tango.Integration.Operation
         private bool _diagnosticsSent;
         private bool _debugSent;
 
+        public static String EmbeddedLogsFolder { get; private set; }
+        public static String EmbeddedLogsTag { get; private set; }
+
         static MachineOperator()
         {
             if (EmbeddedLogManager == null)
             {
                 EmbeddedLogManager = new LogManager();
 
-                String folder = SettingsManager.Default.Folder + "\\embedded logs";
-                Directory.CreateDirectory(folder);
-                FileLogger fileLogger = new FileLogger(folder, "embedded") { Enabled = true };
+                EmbeddedLogsTag = "Embedded";
+                EmbeddedLogsFolder = Path.Combine(Path.GetDirectoryName(SettingsManager.Default.Folder), "Logs", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName), "Embedded");
+                Directory.CreateDirectory(EmbeddedLogsFolder);
+                FileLogger fileLogger = new FileLogger(EmbeddedLogsFolder, EmbeddedLogsTag) { Enabled = true };
                 EmbeddedLogManager.RegisterLogger(fileLogger);
             }
         }
diff --git a/Software/Visual_Studio/Tango.Logging/FileLogger.cs b/Software/Visual_Studio/Tango.Logging/FileLogger.cs
index 0e0d11402..547db406e 100644
--- a/Software/Visual_Studio/Tango.Logging/FileLogger.cs
+++ b/Software/Visual_Studio/Tango.Logging/FileLogger.cs
@@ -41,7 +41,7 @@ namespace Tango.Logging
         /// </summary>
         static FileLogger()
         {
-            DefaultLogsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "logs");
+            DefaultLogsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "Logs", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName));
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
index fbf7d1548..c201c1d30 100644
--- a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
+++ b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
@@ -77,7 +77,7 @@ namespace Tango.Logging
 
             if (Path.IsPathRooted(CallerFile))
             {
-                return CallerFile.Remove(0, base_path.Length).Replace("\\", " | ");
+                return CallerFile.Remove(0, base_path.Length);
             }
             else
             {
diff --git a/Software/Visual_Studio/Tango.Settings/SettingsManager.cs b/Software/Visual_Studio/Tango.Settings/SettingsManager.cs
index 1f0083bb5..a9c5429de 100644
--- a/Software/Visual_Studio/Tango.Settings/SettingsManager.cs
+++ b/Software/Visual_Studio/Tango.Settings/SettingsManager.cs
@@ -54,8 +54,9 @@ namespace Tango.Settings
         /// </summary>
         private SettingsManager()
         {
-            FilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "Settings.json");
+            FilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "Settings", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName) + ".json");
             Folder = Path.GetDirectoryName(FilePath);
+            Directory.CreateDirectory(Folder);
             _settingsCollection = new List<SettingsBase>();
 
             _jsonSettings = new JsonSerializerSettings