Bug fix for showing feed counts in the UI

davepruitt · Mar 14, 2018 · efc9404 · efc9404
1 parent ebbcb14
commit efc9404
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 1 deletion.
diff --git a/MMazeBehavior/MMazeBehaviorSession.cs b/MMazeBehavior/MMazeBehaviorSession.cs
@@ -468,6 +468,16 @@ private void _background_thread_DoWork(object sender, DoWorkEventArgs e)
                         var time_since_last_feed = DateTime.Now - _most_recent_feed;
                         _most_recent_feed = DateTime.Now;
 
+                        switch (latest_event.EventType)
+                        {
+                            case MMazeEventNames.LeftFeederTriggered:
+                                LeftFeedCount++;
+                                break;
+                            case MMazeEventNames.RightFeederTriggered:
+                                RightFeedCount++;
+                                break;
+                        }
+
                         FeedList_TimeSincePreviousFeed.Add(Convert.ToInt32(time_since_last_feed.TotalSeconds));
                         FeedList_TimeSinceSessionStart.Add(Convert.ToInt32(timer.Elapsed.TotalSeconds));
                         _background_properties_to_update.Add("FeedList");

diff --git a/MMazeBehavior/MainWindow.xaml.cs b/MMazeBehavior/MainWindow.xaml.cs
@@ -48,6 +48,7 @@ public MainWindow()
                 Accord.Video.DirectShow.FilterCategory.VideoInputDevice);
             List<Accord.Video.DirectShow.FilterInfo> my_list = j.Cast<Accord.Video.DirectShow.FilterInfo>().ToList();
             Accord.Video.DirectShow.FilterInfo my_camera = my_list.Where(x => x.Name.Equals("HD USB Camera")).FirstOrDefault();
+            //Accord.Video.DirectShow.FilterInfo my_camera = my_list.Where(x => x.Name.Contains("Logitech")).FirstOrDefault();
             if (my_camera != null)
             {
                 //Set up the camera as the capture devices

diff --git a/MMazeBehavior/bin/Debug/MMazeBehavior.pdb b/MMazeBehavior/bin/Debug/MMazeBehavior.pdb
diff --git a/MMazeBehavior/bin/Release/MMazeBehavior.pdb b/MMazeBehavior/bin/Release/MMazeBehavior.pdb
diff --git a/MMazeBehavior/obj/Debug/MMazeBehavior.csproj.FileListAbsolute.txt b/MMazeBehavior/obj/Debug/MMazeBehavior.csproj.FileListAbsolute.txt
@@ -104,3 +104,4 @@ Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\bin\Debug\pt\ZedGraph.resources
 Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\bin\Debug\sv\ZedGraph.resources.dll
 Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\bin\Debug\ru\ZedGraph.resources.dll
 Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Debug\MMazeBehavior_Content.g.cs
+Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Debug\MMazeBehavior.csprojResolveAssemblyReference.cache
diff --git a/MMazeBehavior/obj/Debug/MMazeBehavior.pdb b/MMazeBehavior/obj/Debug/MMazeBehavior.pdb
diff --git a/MMazeBehavior/obj/Release/MMazeBehavior.csproj.FileListAbsolute.txt b/MMazeBehavior/obj/Release/MMazeBehavior.csproj.FileListAbsolute.txt
@@ -69,4 +69,3 @@ Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Release\MMazeBehavior.Prope
 Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Release\MMazeBehavior.csproj.GenerateResource.Cache
 Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Release\MMazeBehavior.exe
 Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Release\MMazeBehavior.pdb
-Z:\TBI\Behavior Code\MMazeBehavior\MMazeBehavior\obj\Release\MMazeBehavior.csprojResolveAssemblyReference.cache
diff --git a/MMazeBehavior/obj/Release/MMazeBehavior.pdb b/MMazeBehavior/obj/Release/MMazeBehavior.pdb