2021.2

New Features: - Video files labeled - New numeric prompt type - Prompt text is now definable Fixes: - Can run without camera - Can run without microphone
Philip-S-Martin · Apr 2, 2021 · d871ccb · d871ccb
1 parent 1f8094c
commit d871ccb
Show file tree

Hide file tree

Showing 20 changed files with 152 additions and 64 deletions.
diff --git a/InstallForge/2021_1_InstallProject.ifp b/InstallForge/2021_1_InstallProject.ifp
diff --git a/McIntyreAFC/SpreadsheetAFC.cs b/McIntyreAFC/SpreadsheetAFC.cs
@@ -5,18 +5,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace McIntyreAFC
 {
     [InterpreterMeta("SpreadsheetAFC", "1.1")]
 
-    public class SpreadsheetAFC : ExcelDataInterpreter, IInterpreter, IPromptUserSelect
+    public class SpreadsheetAFC : ExcelDataInterpreter, IInterpreter, IPromptUserSelect, IPromptUserNumber
     {
         private delegate bool RowReader(Dictionary<string, int> map);
         Dictionary<string, RowReader> mappedRowReaders;
         Dictionary<string, Protocol> protocols;
         Protocol baseData;
         public UserSelectHandler UserSelectPrompt { get; set; }
+        public UserNumberHandler UserNumberPrompt { get; set; }
         public SpreadsheetAFC()
         {
             mappedRowReaders = new Dictionary<string, RowReader>(){
@@ -29,6 +31,12 @@ public SpreadsheetAFC()
             protocols = new Dictionary<string, Protocol>();
         }
         public bool IsCanceled { get; set; }
+
+        string protocolName = null;
+        string experimentName = null;
+        int subjectNumber = 0;
+        public string ProtocolLabel => $"{(experimentName != null ? experimentName : "NoExperiment")}_{(protocolName != null ? protocolName : "NoProtocol")}_{subjectNumber:D2}";
+
         private Protocol GetOrCreateProtocol(string protocolName)
         {
             Protocol result;
@@ -42,8 +50,9 @@ private Protocol GetOrCreateProtocol(string protocolName)
                 return result;
             }
         }
-        public List<ProtocolEvent> Generate(string protocolName = null)
+        public List<ProtocolEvent> Generate(string argument)
         {
+            experimentName = new Regex("\\(\\d+\\)|_| ").Replace( argument, "");
             if (DataReader == null) return null;
             do
             {
@@ -73,14 +82,19 @@ public List<ProtocolEvent> Generate(string protocolName = null)
             {
                 if (protocolName == null)
                 {
-                    string dropdownResponse = UserSelectPrompt(protocols.Keys.ToArray());
-                    if (dropdownResponse != null)
-                        return protocols[dropdownResponse].Generate();
+                    protocolName = UserSelectPrompt(protocols.Keys.ToArray(), "Select a Protocol:");
+                    if (protocolName != null)
+                    {
+                        subjectNumber = UserNumberPrompt(1, 99, "Select a Subject:");
+                        return protocols[protocolName].Generate();
+                    }
                     else return null;
                 }
                 else
                 {
-                    return protocols[protocolName].Generate();
+                    {
+                        return protocols[protocolName].Generate();
+                    }
                 }
             }
             else return null;

diff --git a/ProtocolMasterCore/Prompt/DefaultPrompts.cs b/ProtocolMasterCore/Prompt/DefaultPrompts.cs
@@ -2,11 +2,16 @@
 {
     public static class DefaultPrompts
     {
-        public static string UserSelect(string[] options)
+        public static string UserSelect(string[] options, string prompt)
         {
             if (options != null && options.Length > 0 && options[0] != null)
                 return options[0];
             return "null";
         }
+
+        public static int UserNumber(int min, int max, string prompt)
+        {
+            return min;
+        }
     }
 }
diff --git a/ProtocolMasterCore/Prompt/IPromptUserNumber.cs b/ProtocolMasterCore/Prompt/IPromptUserNumber.cs
@@ -0,0 +1,8 @@
+namespace ProtocolMasterCore.Prompt
+{
+    public delegate int UserNumberHandler(int min, int max, string prompt = "Please select a number:");
+    public interface IPromptUserNumber
+    {
+        public UserNumberHandler UserNumberPrompt { set; }
+    }
+}
diff --git a/ProtocolMasterCore/Prompt/IPromptUserSelect.cs b/ProtocolMasterCore/Prompt/IPromptUserSelect.cs
@@ -1,6 +1,6 @@
 namespace ProtocolMasterCore.Prompt
 {
-    public delegate string UserSelectHandler(string[] keys);
+    public delegate string UserSelectHandler(string[] keys, string prompt = "Please select an item:");
     public interface IPromptUserSelect
     {
         public UserSelectHandler UserSelectPrompt { set; }

diff --git a/ProtocolMasterCore/Prompt/PromptTargetStore.cs b/ProtocolMasterCore/Prompt/PromptTargetStore.cs
@@ -3,9 +3,12 @@
     public class PromptTargetStore
     {
         public UserSelectHandler UserSelect { get; set; }
+        public UserNumberHandler UserNumber { get; set; }
+
         public PromptTargetStore()
         {
             UserSelect = DefaultPrompts.UserSelect;
+            UserNumber = DefaultPrompts.UserNumber;
         }
     }
 }
diff --git a/ProtocolMasterCore/Protocol/ExtensionManager.cs b/ProtocolMasterCore/Protocol/ExtensionManager.cs
@@ -82,6 +82,10 @@ protected E CreateSelectedExtension()
                 {
                     (extension as IPromptUserSelect).UserSelectPrompt = PromptTargets.UserSelect;
                 }
+                if (typeof(IPromptUserNumber).IsAssignableFrom(extension.GetType()))
+                {
+                    (extension as IPromptUserNumber).UserNumberPrompt = PromptTargets.UserNumber;
+                }
                 return extension;
             }
             else

diff --git a/ProtocolMasterCore/Protocol/Interpreter/IInterpreter.cs b/ProtocolMasterCore/Protocol/Interpreter/IInterpreter.cs
@@ -4,6 +4,7 @@ namespace ProtocolMasterCore.Protocol.Interpreter
 {
     public interface IInterpreter : IExtension
     {
-        List<ProtocolEvent> Generate(string protocolName);
+        string ProtocolLabel { get; }
+        List<ProtocolEvent> Generate(string argument);
     }
 }
diff --git a/ProtocolMasterCore/Protocol/Interpreter/InterpreterManager.cs b/ProtocolMasterCore/Protocol/Interpreter/InterpreterManager.cs
@@ -4,7 +4,7 @@
 
 namespace ProtocolMasterCore.Protocol.Interpreter
 {
-    public delegate void ProtocolEventsLoader(List<ProtocolEvent> events);
+    public delegate void ProtocolEventsLoader(List<ProtocolEvent> events, string label);
     public class InterpreterManager : ExtensionManager<IInterpreter, InterpreterMeta>
     {
         IInterpreter interpreter;
@@ -18,14 +18,16 @@ internal List<ProtocolEvent> GenerateData(Stream stream, string argument = null)
                 System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
                 ExcelDataInterpreter spreadSheetInterpreter = interpreter as ExcelDataInterpreter;
                 if (stream != null)
+                {
                     spreadSheetInterpreter.SetReader(ExcelReaderFactory.CreateReader(stream));
+                }
                 else return null;
             }
             // pre-fill event data
             List<ProtocolEvent> result = interpreter.Generate(argument);
             if (interpreter.IsCanceled) return null;
             DisposeSelectedExtension();
-            OnEventsLoaded?.Invoke(result);
+            OnEventsLoaded?.Invoke(result, interpreter.ProtocolLabel);
             return result;
         }
     }

diff --git a/ProtocolMasterCore/Protocol/NullExtensions/NullInterpreter.cs b/ProtocolMasterCore/Protocol/NullExtensions/NullInterpreter.cs
@@ -7,6 +7,9 @@ namespace ProtocolMasterCore.Protocol.NullExtensions
     public class NullInterpreter : IInterpreter
     {
         public bool IsCanceled { get; set; }
+
+        public string ProtocolLabel => "No Protocol";
+
         public List<ProtocolEvent> Generate(string protocolName)
         {
             return null;

diff --git a/ProtocolMasterWPF/Helpers/ClockAnimator.cs b/ProtocolMasterWPF/Helpers/ClockAnimator.cs
@@ -23,7 +23,7 @@ public ClockAnimator()
         {
             PrepAnimator();
         }
-        public void FindMaxTime(List<ProtocolEvent> events)
+        public void FindMaxTime(List<ProtocolEvent> events, string label)
         {
             if (events == null) return;
             double milliseconds = events.Where(i => i.Arguments.ContainsKey("TimeEndMs")).Max(i => Convert.ToDouble( i.Arguments["TimeEndMs"]));

diff --git a/ProtocolMasterWPF/Model/Camera.cs b/ProtocolMasterWPF/Model/Camera.cs
@@ -32,35 +32,38 @@ private async void InitVideoStore()
         }
         public void InitializeCap(DeviceInformation videoDevice, DeviceInformation audioDevice)
         {
-            if(videoDevice == null)
+            if (videoDevice == null)
                 Log.Error($"Video Device null");
-            if (audioDevice == null)
-            {
-                try
-                {
-                    MediaCap.InitializeAsync(new MediaCaptureInitializationSettings()
-                    {
-                        VideoDeviceId = videoDevice.Id
-                    }).AsTask().Wait();
-                }
-                catch (UnauthorizedAccessException ex)
-                {
-                    Log.Error($"The app was denied access to the camera: {ex}");
-                }
-            }
             else
             {
-                try
+                if (audioDevice == null)
                 {
-                    MediaCap.InitializeAsync(new MediaCaptureInitializationSettings()
+                    try
                     {
-                        VideoDeviceId = videoDevice.Id,
-                        AudioDeviceId = audioDevice.Id
-                    }).AsTask().Wait();
+                        MediaCap.InitializeAsync(new MediaCaptureInitializationSettings()
+                        {
+                            VideoDeviceId = videoDevice.Id
+                        }).AsTask().Wait();
+                    }
+                    catch (UnauthorizedAccessException ex)
+                    {
+                        Log.Error($"The app was denied access to the camera: {ex}");
+                    }
                 }
-                catch (UnauthorizedAccessException ex)
+                else
                 {
-                    Log.Error($"The app was denied access to the camera: {ex}");
+                    try
+                    {
+                        MediaCap.InitializeAsync(new MediaCaptureInitializationSettings()
+                        {
+                            VideoDeviceId = videoDevice.Id,
+                            AudioDeviceId = audioDevice.Id
+                        }).AsTask().Wait();
+                    }
+                    catch (UnauthorizedAccessException ex)
+                    {
+                        Log.Error($"The app was denied access to the camera: {ex}");
+                    }
                 }
             }
         }
@@ -76,11 +79,11 @@ public async void StartPreview()
             }
         }
         public bool IsRecording { get; private set; }
-        public async void StartRecord()
+        public async void StartRecord(string label)
         {
             try
             {
-                StorageFile file = await videoStore.CreateFileAsync("Recording (1).wmv", CreationCollisionOption.GenerateUniqueName);
+                StorageFile file = await videoStore.CreateFileAsync($"{label}.wmv", CreationCollisionOption.GenerateUniqueName);
                 await MediaCap.StartRecordToStorageFileAsync(MediaEncodingProfile.CreateWmv(VideoEncodingQuality.Auto), file);
                 IsRecording = true;
                 Log.Error("Began Recording");

diff --git a/ProtocolMasterWPF/Model/CameraContainer.cs b/ProtocolMasterWPF/Model/CameraContainer.cs
@@ -1,4 +1,5 @@
-using ProtocolMasterCore.Utility;
+using ProtocolMasterCore.Protocol;
+using ProtocolMasterCore.Utility;
 using ProtocolMasterWPF.Properties;
 using System;
 using System.Collections.Generic;
@@ -34,7 +35,7 @@ public DeviceInformation VideoDevice
                 _videoDevice = value;
                 NotifyProperty();
                 ResetCam();
-                if (value.Id != Settings.Default.CameraID)
+                if (value != null && value.Id != Settings.Default.CameraID)
                 {
                     Settings.Default.CameraID = value.Id;
                     Settings.Default.Save();
@@ -50,15 +51,27 @@ public DeviceInformation AudioDevice
                 _audioDevice = value;
                 NotifyProperty();
                 ResetCam();
-                if(value.Id != Settings.Default.MicrophoneID)
+                if (value != null && value.Id != Settings.Default.MicrophoneID)
                 {
                     Settings.Default.MicrophoneID = value.Id;
                     Settings.Default.Save();
                 }
             }
         }
         private DeviceInformation _audioDevice;
-        public void StartRecord() => Cam.StartRecord();
+
+        string label = "Recording";
+        public void SetLabel(List<ProtocolEvent> events, string label)
+        {
+            if (label != null)
+                this.label = label;
+            else this.label = "Recording";
+        }
+        public void StartRecord()
+        {
+            if(VideoDevice != null)
+                Cam.StartRecord(label);
+        }
         public void StopRecord() => Cam.StopRecord();
 
         private void ResetCam()
@@ -75,7 +88,9 @@ public void InitDefaultDevices()
             catch (Exception e)
             {
                 Log.Error($"Default Camera could not be seleted, exception: {e}");
-                VideoDevice = MediaDevices.Instance.VideoDevices.First();
+                if (MediaDevices.Instance.VideoDevices.Count != 0)
+                    VideoDevice = MediaDevices.Instance.VideoDevices.First();
+                else VideoDevice = null;
             }
             try
             {
@@ -84,7 +99,9 @@ public void InitDefaultDevices()
             catch (Exception e)
             {
                 Log.Error($"Default Microphone could not be seleted, exception: {e}");
-                AudioDevice = MediaDevices.Instance.AudioDevices.First();
+                if (MediaDevices.Instance.AudioDevices.Count != 0)
+                    AudioDevice = MediaDevices.Instance.AudioDevices.First();
+                else AudioDevice = null;
             }
         }
     }

diff --git a/ProtocolMasterWPF/Model/LocalFileStreamer.cs b/ProtocolMasterWPF/Model/LocalFileStreamer.cs
@@ -8,7 +8,7 @@ namespace ProtocolMasterWPF.Model
 {
     internal class LocalFileStreamer : IStreamStarter
     {
-        public string Name { get => LocalFile.Name; }
+        public string Name { get => Path.GetFileNameWithoutExtension(LocalFile.FullName); }
         public FileInfo LocalFile { get; private set; }
         public LocalFileStreamer(FileInfo source)
         {
@@ -21,7 +21,7 @@ public Stream StartStream()
             {
                 result = LocalFile.Open(FileMode.Open);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Log.Error($"Could not open Local File {Name}, Exception: {e}");
                 result = null;