Merge pull request #476 from SainsburyWellcomeCentre/social-dev

Use harp timestamp as time axis in RFID visualizer plot
SainsburyWellcomeCentre · Jan 19, 2024 · 6d2f50f · 6d2f50f
2 parents 7d3656e + 7e15b37
commit 6d2f50f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/bonsai/Bonsai.config b/bonsai/Bonsai.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Packages>
-    <Package id="Aeon.Acquisition" version="0.5.0-build231205" />
+    <Package id="Aeon.Acquisition" version="0.5.0-build240101" />
     <Package id="Aeon.Database" version="0.1.0-build231020" />
-    <Package id="Aeon.Environment" version="0.1.0-build231209" />
+    <Package id="Aeon.Environment" version="0.1.0-build240101" />
     <Package id="Aeon.Foraging" version="0.1.0-build231202" />
     <Package id="AsyncIO" version="0.1.69" />
     <Package id="Bonsai" version="2.8.1" />
@@ -109,9 +109,9 @@
     <AssemblyReference assemblyName="Harp.TimestampGeneratorGen3" />
   </AssemblyReferences>
   <AssemblyLocations>
-    <AssemblyLocation assemblyName="Aeon.Acquisition" processorArchitecture="MSIL" location="Packages\Aeon.Acquisition.0.5.0-build231205\lib\net472\Aeon.Acquisition.dll" />
+    <AssemblyLocation assemblyName="Aeon.Acquisition" processorArchitecture="MSIL" location="Packages\Aeon.Acquisition.0.5.0-build240101\lib\net472\Aeon.Acquisition.dll" />
     <AssemblyLocation assemblyName="Aeon.Database" processorArchitecture="MSIL" location="Packages\Aeon.Database.0.1.0-build231020\lib\net472\Aeon.Database.dll" />
-    <AssemblyLocation assemblyName="Aeon.Environment" processorArchitecture="MSIL" location="Packages\Aeon.Environment.0.1.0-build231209\lib\net472\Aeon.Environment.dll" />
+    <AssemblyLocation assemblyName="Aeon.Environment" processorArchitecture="MSIL" location="Packages\Aeon.Environment.0.1.0-build240101\lib\net472\Aeon.Environment.dll" />
     <AssemblyLocation assemblyName="Aeon.Foraging" processorArchitecture="MSIL" location="Packages\Aeon.Foraging.0.1.0-build231202\lib\net472\Aeon.Foraging.dll" />
     <AssemblyLocation assemblyName="AsyncIO" processorArchitecture="MSIL" location="Packages\AsyncIO.0.1.69\lib\net40\AsyncIO.dll" />
     <AssemblyLocation assemblyName="Basler.Pylon" processorArchitecture="X86" location="Packages\Bonsai.Pylon.0.3.0\build\net462\bin\x86\Basler.Pylon.dll" />

diff --git a/workflows/social/Extensions.csproj b/workflows/social/Extensions.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Bonsai.Sleap" Version="0.2.1" />
     <PackageReference Include="Bonsai.Sleap.Design" Version="0.2.0" />
     <PackageReference Include="Bonsai.Design.Visualizers" Version="2.8.0" />
-    <PackageReference Include="Aeon.Environment" Version="0.1.0-build231209" />
+    <PackageReference Include="Aeon.Environment" Version="0.1.0-build240101" />
     <PackageReference Include="ZedGraph" Version="5.1.7" />
   </ItemGroup>
 

diff --git a/workflows/social/Extensions/RfidVisualizerBuilder.cs b/workflows/social/Extensions/RfidVisualizerBuilder.cs
@@ -11,6 +11,7 @@
 using Bonsai.Expressions;
 using System.Reactive.Linq;
 using OpenCV.Net;
+using Aeon.Acquisition;
 
 [Combinator]
 [Description("Display individual RFID tag measurements in a raster plot.")]
@@ -99,7 +100,7 @@ public override void Show(object value)
             seriesMap.Add(tagId, series);
         }
 
-        var dateTime = DateTime.UtcNow;
+        var dateTime = GetDateTime.FromSeconds(measurement.Seconds);
         var location = measurement.Index;
         locationMap[location] = measurement.Name;
         series.Add((XDate)dateTime, location);