ATFX API v12.1 Changes

Added compatibility for the 15888 timestamp recordings and allowed users to view the absolute timestamps.
Added access to the DateTimeNano representation of timestamps, included functionality to generate nanosecond accurate unix timestamps.
Added methods to associate timestamp recordings with signals and obtain the serial numbers of spider devices used to created recordings.
Added method to associate signals with their timestamp recording.
Improvements for viewing RMS data and more signal properties to determine types.
Fix build warnings with unused variables and adding Trace.WriteLine

ATFX API Multi Spider System DRD, EDM DRD File Version Memo.txt
•	Fix DRD convert code with missing SYSTEMTIME1 for AoSubmatrix
•	Fix ATFX API Multi Spider System DRD Converter
•	Additional backward compability for downloading DRD NAS files with file version in memo.txt

SonarQube code improvements
Change label “Sqrt(Eu^2/Hz)” to “EU/Sqrt(Hz)”
Replace Math.Atan2 with SafeAtan2.

Author: kevinchenggoci

C# ATFX API Demo/Demo/CI.ATFX.Reader.Demo.exe

@@ -31,11 +31,11 @@ public partial class ATFXReaderDemo : Form
         #region Fields
         DRDConverter drdConverter = new DRDConverter();
         List<string> drdOutputPath;
-        string drdFilesSelectedPath;
+        private string drdFilesSelectedPath;
         ProgressBarForm pgForm;
-        bool DRDConvertSucceed = false;
-        string savePath;
-        string currentOpenFile;
+        private bool DRDConvertSucceed = false;
+        private string currentOpenFile;
+        private EventHandler<DRDConverter.ProgressEventArgs> drdProgressHandler;
 
         /// <summary>
         /// Determine whether the current datagridview for Signals should be displaying
@@ -95,7 +95,6 @@ public ATFXReaderDemo()
             clmLowAlarm.Visible = false;
             clmLowAbort.Visible = false;
 
-            //drdConverter.ReportProgress += new EventHandler<DRDConverter.ProgressArgs>(DRDConverterCombine_ReportProgress);
             bgWorkerDRDCombine.DoWork += new DoWorkEventHandler(bgWorkerDRDCombine_DoWork);
             bgWorkerDRDCombine.ProgressChanged += new ProgressChangedEventHandler(bgWorkerDRDCombine_ProgressChanged);
             bgWorkerDRDCombine.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bgWorkerDRDCombine_RunWorkerCompleted);
@@ -142,7 +141,7 @@ private void ShowSignals(IRecording rec)
         /// <param name="rec"></param>
         private void ShowRecordings(IRecording rec)
         {
-            if (rec as ODSATFXMLRecording == null)
+            if (!(rec is ODSATFXMLRecording))
             {
                 lbRecordingDataInfo.Items.Clear();
                 lbRecordingDataInfo.Items.Add(rec); // Add the initial IRecording object  
@@ -484,7 +483,7 @@ private void ShowFrameData(DataGridView grid, ISignal signal, _SpectrumScalingTy
                 {
                     //Gets 1 framesize signal frame data I.E 1024 points
                     //Changing the index will display the other frame data
-                    ulong[][] frame_ul = Utility.ReadTimeStampData(signal, frameIndex * (int)signal.FrameSize, (int)(frameIndex + 1) * (int)signal.FrameSize - 1);
+                    ulong[][] frame_ul = Utility.ReadTimeStampData(signal, frameIndex * (int)signal.FrameSize, (frameIndex + 1) * (int)signal.FrameSize - 1);
                     if (frame_ul == null) return;
 
                     var frameSize = frame_ul[0].Length;
@@ -564,7 +563,7 @@ private void ShowFrameData(DataGridView grid, ISignal signal, _SpectrumScalingTy
             }
             catch(Exception e)
             {
-
+                Utility.Log(e);
             }
             finally
             {
@@ -599,7 +598,7 @@ private void ShowTSDATFrameDataUTC(ISignal signal)
                 clmLowAbort.Visible = false;
 
                 //Read the TSDAT file and return list<DateTimeNano> and out ulong[] that is the index
-                var utcTSDATpoints = Utility.ReadTimeStampDataUTCFormat(out ulong[] frame_ul, signal, frameIndex * (int)signal.FrameSize, (int)(frameIndex+1) * (int)signal.FrameSize - 1);
+                var utcTSDATpoints = Utility.ReadTimeStampDataUTCFormat(out ulong[] frame_ul, signal, frameIndex * (int)signal.FrameSize, (frameIndex+1) * (int)signal.FrameSize - 1);
 
                 for(int i = 0; i < utcTSDATpoints.Count; i++)
                 {
@@ -619,7 +618,7 @@ private void ShowTSDATFrameDataUTC(ISignal signal)
         /// <param name="points"></param>
         /// <param name="pointsUTC"></param>
         /// <param name="formatUTC"></param>
-        private void ShowTSDATPoints(DataGridView grid, ulong[][] points = null, List<DateTimeNano> pointsUTC = null, ulong[] frame_ul = null, bool formatUTC = false)
+        private static void ShowTSDATPoints(DataGridView grid, ulong[][] points = null, List<DateTimeNano> pointsUTC = null, ulong[] frame_ul = null, bool formatUTC = false)
         {
             if(!formatUTC && points == null) return;
             if (formatUTC && pointsUTC == null && frame_ul == null) return;
@@ -838,7 +837,7 @@ private void LbSignalParameter_SelectedIndexChanged(object sender, EventArgs e)
         /// <param name="e"></param>
         private void LbRecording_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (lbRecordingDataInfo.SelectedItem is IRecording rec)
+            if (lbRecordingDataInfo.SelectedItem is IRecording)
             {
                 //Keep tracks of the displayed grid for recording if switching from recording to signal and so on
                 switch (recordDataInfo)
@@ -879,7 +878,6 @@ private void BtnOpen_Click(object sender, EventArgs e)
                     }
 
                     currentOpenFile = tbFile.Text = dlg.FileName;
-                    savePath = Path.GetDirectoryName(dlg.FileName);
                     if (RecordingManager.Manager.OpenRecording(currentOpenFile, out IRecording rec))
                     {
                         LoadRecord(rec);
@@ -1138,7 +1136,7 @@ private void btnCalculateTSDAT_Click(object sender, EventArgs e)
             }
             catch(Exception ex)
             {
-
+                Utility.Log(ex);
             }
         }
 
@@ -1184,7 +1182,7 @@ private void btnReadTSDAT_Click(object sender, EventArgs e)
             } 
             catch(Exception ex)
             {
-
+                Utility.Log(ex);
             }
         }
 
@@ -1387,15 +1385,14 @@ private void tpTSDATInfo_Enter(object sender, EventArgs e)
         /// <param name="e"></param>
         private void bgWorkerDRDCombine_DoWork(object sender, DoWorkEventArgs e)
         {
-            var worker = sender as BackgroundWorker;
-
             this.Invoke((MethodInvoker)delegate
             {
                 pgForm = new ProgressBarForm() { Owner = this };
                 pgForm.Show();
             });
 
-            drdConverter.ReportProgress += new EventHandler<DRDConverter.ProgressArgs>(DRDConverterCombine_ReportProgress);
+            drdProgressHandler = new EventHandler<DRDConverter.ProgressEventArgs>(DRDConverterCombine_ReportProgress);
+            drdConverter.ReportProgress += drdProgressHandler;
             string[] files = Directory.GetFiles(drdFilesSelectedPath);
             drdOutputPath = drdConverter.CombineDRDFiles(files, cbOnlyDATX.Checked, cbMergeAllDRD.Checked);
         }
@@ -1405,7 +1402,7 @@ private void bgWorkerDRDCombine_DoWork(object sender, DoWorkEventArgs e)
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void DRDConverterCombine_ReportProgress(object sender, DRDConverter.ProgressArgs e)
+        protected void DRDConverterCombine_ReportProgress(object sender, DRDConverter.ProgressEventArgs e)
         {
             bgWorkerDRDCombine.ReportProgress(e.Percentage, e.Message);
         }
@@ -1435,7 +1432,7 @@ private void bgWorkerDRDCombine_ProgressChanged(object sender, ProgressChangedEv
         /// <param name="e"></param>
         protected void bgWorkerDRDCombine_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            drdConverter.ReportProgress -= new EventHandler<DRDConverter.ProgressArgs>(DRDConverterCombine_ReportProgress);
+            drdConverter.ReportProgress -= drdProgressHandler;
             pgForm.ProgressBarUpdate(100, "All ods, datx, ext files combined.");
             pgForm.Close();
             if (drdOutputPath != null)
@@ -1467,7 +1464,7 @@ public void ReportStatus(ExportStatus eStatus)
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void DRDConverterConvert_ReportProgress(object sender, DRDConverter.ProgressArgs e)
+        protected void DRDConverterConvert_ReportProgress(object sender, DRDConverter.ProgressEventArgs e)
         {
             bgWorkerDRDConvert.ReportProgress(e.Percentage, e.Message);
         }
@@ -1485,7 +1482,9 @@ private void bgWorkerDRDConvert_DoWork(object sender, DoWorkEventArgs e)
                 pgForm = new ProgressBarForm() { Owner = this };
                 pgForm.Show();
             });
-            drdConverter.ReportProgress += new EventHandler<DRDConverter.ProgressArgs>(DRDConverterConvert_ReportProgress);
+
+            drdProgressHandler = new EventHandler<DRDConverter.ProgressEventArgs>(DRDConverterConvert_ReportProgress);
+            drdConverter.ReportProgress += drdProgressHandler;
             status = new ExportStatus();
             delStatus = this.ReportStatus;
             DRDConvertSucceed = drdConverter.ConvertDATATFXFile(drdOutputPath, delStatus, status);
@@ -1499,14 +1498,13 @@ private void bgWorkerDRDConvert_DoWork(object sender, DoWorkEventArgs e)
         /// <param name="e"></param>
         protected void bgWorkerDRDConvert_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            drdConverter.ReportProgress -= new EventHandler<DRDConverter.ProgressArgs>(DRDConverterConvert_ReportProgress);
+            drdConverter.ReportProgress -= drdProgressHandler;
             pgForm.ProgressBarUpdate(100, "All combined files have been converted to ATFX and DAT files.");
             pgForm.Close();
             if (DRDConvertSucceed)
             {
                 string[] splitPath = drdOutputPath[0].Split(new string[] { "\\" }, StringSplitOptions.None);
-                string drdATFXPath = drdOutputPath[0] + "\\" + splitPath[splitPath.Length - 1] + ".atfx";
-                savePath = drdOutputPath[0];
+                string drdATFXPath = $"{drdOutputPath[0]}\\{splitPath[splitPath.Length - 1]}.atfx";
                 currentOpenFile = drdATFXPath;
                 if (drdOutputPath.Count == 1)
                 {

C# ATFX API Demo/Source/ATFXReaderDemo.cs

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -58,6 +61,17 @@
   <PropertyGroup>
     <ApplicationIcon>CI.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoLogo|AnyCPU'">    
+    <OutputPath>..\..\..\bin\AnyCPU\NoLogo\Utility\CIATFXReader\</OutputPath>
+    <DefineConstants>TRACE;NoLogo</DefineConstants>
+    <NoWarn>1591,1587</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>    
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Optimize>true</Optimize>
+	<Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -131,16 +145,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Costura.Fody">
-      <Version>5.7.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Fody">
-      <Version>6.7.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Costura.Fody" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="Fody" Version="6.9.1" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.8">

C# ATFX API Demo/Source/CI.ATFX.Reader.Demo.csproj

@@ -18,8 +18,6 @@ static class Program
         [STAThread]
         static void Main()
         {
-            //MixedDllDispatcher.Start();
-
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new ATFXReaderDemo());

C# ATFX API Demo/Source/Program.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.8.0")]
-[assembly: AssemblyFileVersion("1.0.8.0")]
+[assembly: AssemblyVersion("2.1.0.2")]
+[assembly: AssemblyFileVersion("2.1.0.2")]

C# ATFX API Demo/Source/Properties/AssemblyInfo.cs

@@ -6,20 +6,19 @@
 """
 #---Pythonnet clr import
 from cProfile import label
-import pythonnet
 import clr
 # Change file path here to whereever the DLL files are
-parentPath = "C:\\MyStuff\\DevelopmentalVer\\bin\\AnyCPU\\Debug\\Utility\\CIATFXReader\\"
+parentPath = "C:\\MyStuff\\Github\\CIDataFileReaderAPI\\bin\\"
 
 clr.AddReference(parentPath + "CI.ATFX.Reader.dll")
 clr.AddReference(parentPath + "Common.dll")
+clr.AddReference(parentPath + "PlatformWrapEx.dll")
+clr.AddReference(parentPath + "System.Buffers.dll")
 clr.AddReference('System.Linq')
 clr.AddReference('System.Collections')
 
 import numpy as np
 import matplotlib.pyplot as plt
-import sys 
-import inspect 
 
 #---C# .NET imports & dll imports
 from EDM.Recording import *
@@ -119,22 +118,21 @@ def ShowFrameDataSpectrumEU(signal, spectrum, engiUnit):
 #---Main Code
 # Uncomment any prints and function calls to extract data from file
 print("Running Main Code")
-functions = inspect.getmembers(clr, inspect.isfunction)
-print(functions)
-recordingManager = RecordingManager
+# recordingManager = RecordingManager
 
 # Change file path here to whereever signal or recording files are
-recordingPath = "C:\\Users\\KevinCheng\\Downloads\\gps test example\\"
+recordingPath = "C:\\Users\\Another CI\\Downloads\\signal files\\"
 # Here are multiple strings for different files, change any of them to contain the file name and correctly
 #  reference it in RecordingManager.Manager.OpenRecording
-recordingPathRegular = recordingPath + "SIG0000.atfx"
+recordingPathRegular = recordingPath + "REC0157.atfx"
 recordingPathTS = recordingPath + "{4499520}_REC_{20220419}(1).atfx"
 recordingPathGPS = recordingPath + "REC0041.atfx"
 
 #OpenRecording(string, out IRecording)
 # openRecordSucceed is required for the OpenRecording as it is the returned boolean
 # Make sure to reference the correct file string 
-openRecordSucceed, recording = RecordingManager.Manager.OpenRecording(recordingPathRegular, None) 
+# testrecat = CommonRecording.CreateRecording(recordingPathRegular)
+[openRecordSucceed, recording] = RecordingManager.Manager.OpenRecording(recordingPathRegular, None) 
 
 #---Print Statements
 # Comment or uncomment any print statements below 
@@ -144,8 +142,8 @@ def ShowFrameDataSpectrumEU(signal, spectrum, engiUnit):
     print(prop[0], prop[1])
 
 # Make sure to reference the correct file string 
-print("\nRecording GPS Properties\n")
-ShowGPSInfo(recordingPathTS)
+#print("\nRecording GPS Properties\n")
+#ShowGPSInfo(recordingPathTS)
 
 print("\nSignal 1 Properties\n")
 for prop in Utility.GetListOfProperties(recording.Signals[0].Properties):