Merge pull request #244 from lzaslav/develop

Address missed changes and crash in Visualizer

Author: strhea

ISOv4Plugin/Mappers/DeviceMapper.cs

@@ -33,13 +33,10 @@ public interface IDeviceMapper
     public class DeviceMapper : BaseMapper, IDeviceMapper
     {
         DeviceElementMapper _deviceElementMapper;
-        private readonly IManufacturer _manufacturer;
 
         public DeviceMapper(TaskDataMapper taskDataMapper) : base(taskDataMapper, "DVC")
         {
             _deviceElementMapper = new DeviceElementMapper(taskDataMapper);
-
-            _manufacturer = ManufacturerFactory.GetManufacturer(taskDataMapper);
         }
 
         #region Export

ISOv4Plugin/Mappers/TaskDataMapper.cs

@@ -507,8 +507,8 @@ public ApplicationDataModel.ADM.ApplicationDataModel Import(ISO11783_TaskData ta
                 }
             }
 
-                var manufacturer = ManufacturerFactory.GetManufacturer(this);
-                manufacturer?.PostProcessModel(AdaptDataModel, DeviceElementHierarchies);
+            var manufacturer = ManufacturerFactory.GetManufacturer(this);
+            manufacturer?.PostProcessModel(AdaptDataModel, DeviceElementHierarchies);
 
             return AdaptDataModel;
         }

ISOv4Plugin/ObjectModel/DeviceElementHierarchy.cs

@@ -21,8 +21,6 @@ namespace AgGateway.ADAPT.ISOv4Plugin.ObjectModel
 {
     public class DeviceElementHierarchies
     {
-        private readonly IManufacturer _manufacturer;
-
         public DeviceElementHierarchies(IEnumerable<ISODevice> devices,
                                         RepresentationMapper representationMapper,
                                         bool mergeBins,
@@ -35,6 +33,8 @@ public DeviceElementHierarchies(IEnumerable<ISODevice> devices,
             //Track any device element geometries not logged as a DPT
             Dictionary<string, List<string>> missingGeometryDefinitions = new Dictionary<string, List<string>>();
 
+            var manufacturer = ManufacturerFactory.GetManufacturer(taskDataMapper);
+
             foreach (ISODevice device in devices)
             {
                 ISODeviceElement rootDeviceElement = device.DeviceElements.SingleOrDefault(det => det.DeviceElementType == ISODeviceElementType.Device);
@@ -44,7 +44,7 @@ public DeviceElementHierarchies(IEnumerable<ISODevice> devices,
                     hierarchyElement.HandleBinDeviceElements();
                     Items.Add(device.DeviceId, hierarchyElement);
 
-                    _manufacturer?.ProcessDeviceElementHierarchy(hierarchyElement, missingGeometryDefinitions);
+                    manufacturer?.ProcessDeviceElementHierarchy(hierarchyElement, missingGeometryDefinitions);
                 }
             }
 

ISOv4Plugin/ObjectModel/ISOOperationData.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using AgGateway.ADAPT.ApplicationDataModel.Equipment;
 using AgGateway.ADAPT.ApplicationDataModel.LoggedData;
@@ -6,11 +7,57 @@
 
 namespace AgGateway.ADAPT.ISOv4Plugin.ObjectModel
 {
-    internal class ISOOperationData : OperationData
+    internal class ISOOperationData : OperationData, IConvertible
     {
         /// <summary>
         /// An internal list of DeviceElementUses that are may be updated during import; not exposed on the public interface.
         /// </summary>
         internal List<DeviceElementUse> DeviceElementUses { get; set; } = new List<DeviceElementUse>();
+
+        #region IConvertible impelementation
+        public TypeCode GetTypeCode()
+        {
+            return TypeCode.Object;
+        }
+
+        public bool ToBoolean(IFormatProvider provider) => throw new NotImplementedException();
+
+        public byte ToByte(IFormatProvider provider) => throw new NotImplementedException();
+
+        public char ToChar(IFormatProvider provider) => throw new NotImplementedException();
+
+        public DateTime ToDateTime(IFormatProvider provider) => throw new NotImplementedException();
+
+        public decimal ToDecimal(IFormatProvider provider) => throw new NotImplementedException();
+
+        public double ToDouble(IFormatProvider provider) => throw new NotImplementedException();
+
+        public short ToInt16(IFormatProvider provider) => throw new NotImplementedException();
+
+        public int ToInt32(IFormatProvider provider) => throw new NotImplementedException();
+
+        public long ToInt64(IFormatProvider provider) => throw new NotImplementedException();
+
+        public sbyte ToSByte(IFormatProvider provider) => throw new NotImplementedException();
+
+        public float ToSingle(IFormatProvider provider) => throw new NotImplementedException();
+
+        public string ToString(IFormatProvider provider) => throw new NotImplementedException();
+
+        public object ToType(Type conversionType, IFormatProvider provider)
+        {
+            if (conversionType == typeof(ISOOperationData) || conversionType == typeof(OperationData))
+            {
+                return this;
+            }
+            throw new NotImplementedException();
+        }
+
+        public ushort ToUInt16(IFormatProvider provider) => throw new NotImplementedException();
+
+        public uint ToUInt32(IFormatProvider provider) => throw new NotImplementedException();
+
+        public ulong ToUInt64(IFormatProvider provider) => throw new NotImplementedException();
+        #endregion
     }
-}
+}