Major upgrade

This commit is contained in:
Duc
2025-10-24 15:18:11 -07:00
parent fd85735c93
commit ce583d1664
478 changed files with 237518 additions and 47610 deletions

View File

@@ -24,537 +24,504 @@ using Raytheon.Units;
namespace Raytheon.Instruments
{
/// <summary>
/// A simulation implementation of the DMM interface.
/// This class basically just absorbs function calls and returns dummy data.
/// </summary>
public class DMMNiPxi : IDmm, IDisposable
{
#region PrivateMemberVariables
/// <summary>
/// A simulation implementation of the DMM interface.
/// This class basically just absorbs function calls and returns dummy data.
/// </summary>
public class DMMNiPxi : IDmm, IDisposable
{
#region PrivateMemberVariables
private NIDmm _niDmm;
private string _name;
private readonly string _address;
//private readonly string _options;
private double _lastRange;
private double _lastResolution;
private MeasurementFunction _lastType;
private State _state;
private SelfTestResult _selfTestResult;
private NIDmm _niDmm;
private string _name;
private readonly string _address;
//private readonly string _options;
private double _lastRange;
private double _lastResolution;
private MeasurementFunction _lastType;
private State _state;
private SelfTestResult _selfTestResult;
/// <summary>
/// NLog logger
/// </summary>
private readonly ILogger _logger;
/// <summary>
/// Raytheon configuration
/// </summary>
private readonly IConfigurationManager _configurationManager;
private readonly IConfiguration _configuration;
private readonly ILogger _logger;
#endregion
private readonly IConfigurationManager _configurationManager;
private readonly IConfiguration _configuration;
#region PrivateFunctions
#endregion
/// <summary>
/// The Finalizer.
/// </summary>
~DMMNiPxi()
{
Dispose(false);
}
#region PrivateFunctions
/// <summary>
///
/// </summary>
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
try
{
if (disposing)
{
if (_state == State.Ready)
{
_niDmm.DriverUtility.Reset();
/// <summary>
/// The Finalizer.
/// </summary>
~DMMNiPxi()
{
Dispose(false);
}
_niDmm.Close();
/// <summary>
///
/// </summary>
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
if (disposing)
{
if (_state == State.Ready)
{
_niDmm.DriverUtility.Reset();
_niDmm.Dispose();
_niDmm.Close();
_state = State.Uninitialized;
}
}
}
catch (Exception)
{
try
{
//ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
}
}
#endregion
_niDmm.Dispose();
#region PublicFunctions
_state = State.Uninitialized;
}
}
}
#endregion
/// <summary>
/// DMMNiPxi factory constructor
/// </summary>
/// <param name="deviceName"></param>
/// <param name="configurationManager"></param>
public DMMNiPxi(string deviceName, IConfigurationManager configurationManager, ILogger logger)
{
Name = deviceName;
#region PublicFunctions
_logger = logger;
/// <summary>
/// DMMNiPxi factory constructor
/// </summary>
/// <param name="deviceName"></param>
/// <param name="configurationManager"></param>
public DMMNiPxi(string deviceName, IConfigurationManager configurationManager)
{
Name = deviceName;
_configurationManager = configurationManager;
_configuration = _configurationManager.GetConfiguration(Name);
_logger = LogManager.GetLogger($"{this.GetType().Name} - {deviceName}");
_address = _configuration.GetConfigurationValue("DMMNiPxi", "Address", "");
//_options = _configuration.GetConfigurationValue("DMMNiPxi", "Options", "");
_configurationManager = configurationManager;
_configuration = _configurationManager.GetConfiguration(Name);
_lastType = 0;
_lastRange = 0;
_lastResolution = 0;
_address = _configuration.GetConfigurationValue("DMMNiPxi", "Address", "");
//_options = _configuration.GetConfigurationValue("DMMNiPxi", "Options", "");
//created in Initialize()
_niDmm = null;
_lastType = 0;
_lastRange = 0;
_lastResolution = 0;
_state = State.Uninitialized;
_selfTestResult = SelfTestResult.Unknown;
}
//created in Initialize()
_niDmm = null;
/// <summary>
///
/// </summary>
/// <param name="name"></param>
/// <param name="address"></param>
/// <param name="options"></param>
public DMMNiPxi(string name, string address)//, string options)
{
_name = name;
_address = address;
//_options = options;
_lastType = 0;
_lastRange = 0;
_lastResolution = 0;
_state = State.Uninitialized;
_selfTestResult = SelfTestResult.Unknown;
}
// set in Initialize()
_niDmm = null;
_logger = LogManager.GetCurrentClassLogger();
/// <summary>
///
/// </summary>
/// <param name="deviceName"></param>
/// <param name="address"></param>
/// <param name="options"></param>
public DMMNiPxi(string deviceName, string address)//, string options)
{
_name = deviceName;
_address = address;
//_options = options;
_lastType = 0;
_lastRange = 0;
_lastResolution = 0;
_state = State.Uninitialized;
_selfTestResult = SelfTestResult.Unknown;
}
// set in Initialize()
_niDmm = null;
_logger = LogManager.GetLogger($"{this.GetType().Name} - {deviceName}");
/// <summary>
///
/// </summary>
/// <returns></returns>
public bool ClearErrors()
{
throw new NotImplementedException();
}
_state = State.Uninitialized;
_selfTestResult = SelfTestResult.Unknown;
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureCurrentMeasurement(MeasurementFunction type, Current range, Current resolution)
{
throw new NotImplementedException();
/*_lastType = type;
/// <summary>
///
/// </summary>
/// <returns></returns>
public bool ClearErrors()
{
throw new NotImplementedException();
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureCurrentMeasurement(MeasurementFunction type, Current range, Current resolution)
{
throw new NotImplementedException();
/*_lastType = type;
_lastRange = range.Amps;
_lastResolution = resolution.Amps;*/
}
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureFrequencyMeasurement(MeasurementFunction type, Frequency range, Frequency resolution)
{
if (type != MeasurementFunction.Frequency)
{
throw new Exception("only frequency is acceptable for param type: " + _lastType.ToString());
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureFrequencyMeasurement(MeasurementFunction type, Frequency range, Frequency resolution)
{
if (type != MeasurementFunction.Frequency)
{
throw new Exception("only frequency is acceptable for param type: " + _lastType.ToString());
}
_lastType = type;
_lastRange = range.Hertz;
_lastResolution = resolution.Hertz;
}
_lastType = type;
_lastRange = range.Hertz;
_lastResolution = resolution.Hertz;
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureResistanceMeasurement(MeasurementFunction type, Resistance range, Resistance resolution)
{
if (type != MeasurementFunction.FourWireResistance && type != MeasurementFunction.TwoWireResistance)
{
throw new Exception("only FourWireResistance or TwoWireResistance is acceptable for param type: " + _lastType.ToString());
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureResistanceMeasurement(MeasurementFunction type, Resistance range, Resistance resolution)
{
if (type != MeasurementFunction.FourWireResistance && type != MeasurementFunction.TwoWireResistance)
{
throw new Exception("only FourWireResistance or TwoWireResistance is acceptable for param type: " + _lastType.ToString());
}
_lastType = type;
_lastRange = range.Ohms;
_lastResolution = resolution.Ohms;
}
_lastType = type;
_lastRange = range.Ohms;
_lastResolution = resolution.Ohms;
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureVoltageMeasurement(MeasurementFunction type, Voltage range, Voltage resolution)
{
if (type != MeasurementFunction.DCVolts && type != MeasurementFunction.ACVolts)
{
throw new Exception("only ac or dc volt is acceptable for param type: " + type.ToString());
}
/// <summary>
///
/// </summary>
/// <param name="type"></param>
/// <param name="range"></param>
/// <param name="resolution"></param>
public void ConfigureVoltageMeasurement(MeasurementFunction type, Voltage range, Voltage resolution)
{
if (type != MeasurementFunction.DCVolts && type != MeasurementFunction.ACVolts)
{
throw new Exception("only ac or dc volt is acceptable for param type: " + type.ToString());
}
_lastType = type;
_lastRange = range.Volts;
_lastResolution = resolution.Volts;
}
_lastType = type;
_lastRange = range.Volts;
_lastResolution = resolution.Volts;
}
/// <summary>
///
/// </summary>
public string DetailedStatus
{
get
{
return "This is a NI Dmm";
}
}
/// <summary>
///
/// </summary>
public string DetailedStatus
{
get
{
return "This is a NI Dmm";
}
}
/// <summary>
///
/// </summary>
public bool DisplayEnabled
{
get
{
throw new NotImplementedException();
}
/// <summary>
///
/// </summary>
public bool DisplayEnabled
{
get
{
throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
}
}
set
{
throw new NotImplementedException();
}
}
/// <summary>
///
/// </summary>
public void Dispose()
{
try
{
Dispose(true);
/// <summary>
///
/// </summary>
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
catch (Exception)
{
try
{
//ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
}
}
GC.SuppressFinalize(this);
}
/// <summary>
///
/// </summary>
public bool FrontPanelEnabled
{
get
{
throw new NotImplementedException();
}
/// <summary>
///
/// </summary>
public bool FrontPanelEnabled
{
get
{
throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
}
}
set
{
throw new NotImplementedException();
}
}
/// <summary>
///
/// </summary>
public InstrumentMetadata Info
{
get
{
throw new NotImplementedException();
}
}
/// <summary>
///
/// </summary>
public InstrumentMetadata Info
{
get
{
throw new NotImplementedException();
}
}
/// <summary>
///
/// </summary>
public void Initialize()
{
if (_state == State.Uninitialized)
{
_niDmm = new NIDmm(_address, false, true);// _options);
_selfTestResult = PerformSelfTest();
_state = State.Ready;
}
else
{
throw new Exception("expected the state to be Uninitialized, state was: " + _state.ToString());
}
}
/// <summary>
///
/// </summary>
public void Initialize()
{
if (_state == State.Uninitialized)
{
_niDmm = new NIDmm(_address, false, true);// _options);
_selfTestResult = PerformSelfTest();
_state = State.Ready;
}
else
{
throw new Exception("expected the state to be Uninitialized, state was: " + _state.ToString());
}
}
/// <summary>
///
/// </summary>
public MeasurementFunction MeasurementType
{
get
{
throw new NotImplementedException();
}
}
/// <summary>
///
/// </summary>
public MeasurementFunction MeasurementType
{
get
{
throw new NotImplementedException();
}
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Current MeasureCurrent(int timeout)
{
throw new NotImplementedException();
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Current MeasureCurrent(int timeout)
{
throw new NotImplementedException();
/*
/*
if (_lastType != MeasurementFunction.DCVolts && _lastType != MeasurementFunction.ACVolts)
{
throw new Exception("only ac or dc volt is acceptable for param type: " + type.ToString());
}
return Current.FromAmps(ReadCurrent();*/
}
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Frequency MeasureFrequency(int timeout)
{
if (_lastType != MeasurementFunction.Frequency)
{
throw new Exception("only frequency is acceptable for param type: " + _lastType.ToString());
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Frequency MeasureFrequency(int timeout)
{
if (_lastType != MeasurementFunction.Frequency)
{
throw new Exception("only frequency is acceptable for param type: " + _lastType.ToString());
}
DmmAuto auto = DmmAuto.Off;
DmmAuto auto = DmmAuto.Off;
if (_lastRange < 0)
{
auto = DmmAuto.On;
// set the starting range for auto range to 10
_lastRange = 10;
}
if (_lastRange < 0)
{
auto = DmmAuto.On;
// set the starting range for auto range to 10
_lastRange = 10;
}
_niDmm.MeasurementFunction = DmmMeasurementFunction.Frequency;
_niDmm.MeasurementFunction = DmmMeasurementFunction.Frequency;
_niDmm.Range = _lastRange;
_niDmm.Range = _lastRange;
_niDmm.Resolution = _lastResolution;
_niDmm.Resolution = _lastResolution;
_niDmm.AutoRange = auto;
_niDmm.AutoRange = auto;
double frequency = _niDmm.Measurement.Read();
double frequency = _niDmm.Measurement.Read();
return Frequency.FromHertz(frequency);
}
return Frequency.FromHertz(frequency);
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Resistance MeasureResistance(int timeout)
{
if (_lastType != MeasurementFunction.FourWireResistance && _lastType != MeasurementFunction.TwoWireResistance)
{
throw new Exception("only FourWireResistance or TwoWireResistance is acceptable for param type: " + _lastType.ToString());
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Resistance MeasureResistance(int timeout)
{
if (_lastType != MeasurementFunction.FourWireResistance && _lastType != MeasurementFunction.TwoWireResistance)
{
throw new Exception("only FourWireResistance or TwoWireResistance is acceptable for param type: " + _lastType.ToString());
}
if (_lastType == MeasurementFunction.FourWireResistance)
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.FourWireResistance;
}
else
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.TwoWireResistance;
}
if (_lastType == MeasurementFunction.FourWireResistance)
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.FourWireResistance;
}
else
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.TwoWireResistance;
}
DmmAuto auto = DmmAuto.Off;
DmmAuto auto = DmmAuto.Off;
if (_lastRange < 0)
{
auto = DmmAuto.On;
// set the starting range for auto range to 10
_lastRange = 10;
}
if (_lastRange < 0)
{
auto = DmmAuto.On;
// set the starting range for auto range to 10
_lastRange = 10;
}
_niDmm.Range = _lastRange;
_niDmm.Range = _lastRange;
_niDmm.Resolution = _lastResolution;
_niDmm.Resolution = _lastResolution;
_niDmm.AutoRange = auto;
_niDmm.AutoRange = auto;
double resistance = _niDmm.Measurement.Read();
double resistance = _niDmm.Measurement.Read();
if (double.IsNaN(resistance))
{
resistance = double.MaxValue;
}
if (double.IsNaN(resistance))
{
resistance = double.MaxValue;
}
return Resistance.FromOhms(resistance);
}
return Resistance.FromOhms(resistance);
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Voltage MeasureVoltage(int timeout)
{
if (_lastType != MeasurementFunction.DCVolts && _lastType != MeasurementFunction.ACVolts)
{
throw new Exception("only ac or dc volt is acceptable for param type: " + _lastType.ToString());
}
/// <summary>
///
/// </summary>
/// <param name="timeout"></param>
/// <returns></returns>
public Voltage MeasureVoltage(int timeout)
{
if (_lastType != MeasurementFunction.DCVolts && _lastType != MeasurementFunction.ACVolts)
{
throw new Exception("only ac or dc volt is acceptable for param type: " + _lastType.ToString());
}
if (_lastType == MeasurementFunction.ACVolts)
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.ACVolts;
}
else
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.DCVolts;
}
if (_lastType == MeasurementFunction.ACVolts)
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.ACVolts;
}
else
{
_niDmm.MeasurementFunction = DmmMeasurementFunction.DCVolts;
}
DmmAuto auto = DmmAuto.Off;
DmmAuto auto = DmmAuto.Off;
if (_lastRange < 0)
{
auto = DmmAuto.On;
// set the starting range for auto range to 10
_lastRange = 10;
}
if (_lastRange < 0)
{
auto = DmmAuto.On;
// set the starting range for auto range to 10
_lastRange = 10;
}
_niDmm.Range = _lastRange;
_niDmm.Range = _lastRange;
_niDmm.Resolution = _lastResolution;
_niDmm.Resolution = _lastResolution;
_niDmm.AutoRange = auto;
_niDmm.AutoRange = auto;
double volts = _niDmm.Measurement.Read();
double volts = _niDmm.Measurement.Read();
if (double.IsNaN(volts))
{
volts = double.MaxValue;
}
if (double.IsNaN(volts))
{
volts = double.MaxValue;
}
return Voltage.FromVolts(volts);
}
return Voltage.FromVolts(volts);
}
/// <summary>
///
/// </summary>
public string Name
{
get { return _name; }
set { _name = value; }
}
/// <summary>
///
/// </summary>
public string Name
{
get { return _name; }
set { _name = value; }
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public SelfTestResult PerformSelfTest()
{
DmmSelfTestResult res = _niDmm.DriverUtility.SelfTest();
/// <summary>
///
/// </summary>
/// <returns></returns>
public SelfTestResult PerformSelfTest()
{
DmmSelfTestResult res = _niDmm.DriverUtility.SelfTest();
if (res.Code != 0)
{
_selfTestResult = Raytheon.Instruments.SelfTestResult.Fail;
throw new Exception("self test returned: " + res.Code + "," + res.Message + " on card " + _name);
}
if (res.Code != 0)
{
_selfTestResult = Raytheon.Instruments.SelfTestResult.Fail;
throw new Exception("self test returned: " + res.Code + "," + res.Message + " on card " + _name);
}
_selfTestResult = Raytheon.Instruments.SelfTestResult.Pass;
_selfTestResult = Raytheon.Instruments.SelfTestResult.Pass;
return _selfTestResult;
}
return _selfTestResult;
}
/// <summary>
///
/// </summary>
public void Reset()
{
_niDmm.DriverUtility.Reset();
}
/// <summary>
///
/// </summary>
public void Reset()
{
_niDmm.DriverUtility.Reset();
}
/// <summary>
///
/// </summary>
public SelfTestResult SelfTestResult
{
get
{
return _selfTestResult;
}
}
/// <summary>
///
/// </summary>
public SelfTestResult SelfTestResult
{
get
{
return _selfTestResult;
}
}
/// <summary>
///
/// </summary>
public State Status
{
get
{
return _state;
}
}
/// <summary>
///
/// </summary>
public State Status
{
get
{
return _state;
}
}
/// <summary>
///
/// </summary>
public void Shutdown()
{
if (_state == State.Ready)
{
_niDmm.DriverUtility.Reset();
/// <summary>
///
/// </summary>
public void Shutdown()
{
if (_state == State.Ready)
{
_niDmm.DriverUtility.Reset();
_niDmm.Close();
_niDmm.Close();
_niDmm.Dispose();
_niDmm.Dispose();
_state = State.Uninitialized;
}
}
_state = State.Uninitialized;
}
}
#endregion
}
#endregion
}
}

View File

@@ -31,71 +31,64 @@
// POC: Alex Kravchenko (1118268)
// **********************************************************************************************************
using NLog;
using Raytheon.Common;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Reflection;
using NLog;
using Raytheon.Common;
namespace Raytheon.Instruments
{
[ExportInstrumentFactory(ModelNumber = "DMMNiPxiFactory")]
public class DMMNiPxiFactory : IInstrumentFactory
{
/// <summary>
/// The supported interfaces
/// </summary>
private readonly List<Type> _supportedInterfaces = new List<Type>();
private ILogger _logger;
private readonly IConfigurationManager _configurationManager;
private const string DefaultConfigPath = @"C:\ProgramData\Raytheon\InstrumentManagerService";
private static string DefaultPath;
[ExportInstrumentFactory(ModelNumber = "DMMNiPxiFactory")]
public class DMMNiPxiFactory : IInstrumentFactory
{
private readonly List<Type> _supportedInterfaces = new List<Type>();
public DMMNiPxiFactory(string defaultConfigPath = DefaultConfigPath)
: this(null, defaultConfigPath)
{
}
private readonly IConfigurationManager _configurationManager;
private const string DefaultConfigPath = @"C:\ProgramData\Raytheon\InstrumentManagerService";
private static string DefaultPath;
/// <summary>
/// COECommDeviceInstrumentFactory injection constructor
/// </summary>
/// <param name="configManager"></param>
/// <param name="simEngine"></param>
/// <param name="logger"></param>
[ImportingConstructor]
public DMMNiPxiFactory([Import(AllowDefault = false)] IConfigurationManager configManager,
[Import(AllowDefault = true)] string defaultConfigPath = null)
{
DefaultPath = defaultConfigPath;
public DMMNiPxiFactory(string defaultConfigPath = DefaultConfigPath)
: this(null, defaultConfigPath)
{
}
if (LogManager.Configuration == null)
{
var assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(assemblyFolder + "\\nlog.config");
}
/// <summary>
/// DMMNiPxiFactory injection constructor
/// </summary>
[ImportingConstructor]
public DMMNiPxiFactory([Import(AllowDefault = false)] IConfigurationManager configManager,
[Import(AllowDefault = true)] string defaultConfigPath = null)
{
DefaultPath = defaultConfigPath;
_configurationManager = configManager ?? GetConfigurationManager();
_supportedInterfaces.Add(typeof(IDmm));
}
/// <summary>
/// Gets the instrument
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public IInstrument GetInstrument(string name)
{
try
{
_logger = LogManager.GetLogger(name);
return new DMMNiPxi(name, _configurationManager, _logger);
}
catch (Exception)
{
throw;
}
}
if (LogManager.Configuration == null)
{
var assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(assemblyFolder + "\\nlog.config");
}
_configurationManager = configManager ?? GetConfigurationManager();
_supportedInterfaces.Add(typeof(IDmm));
}
/// <summary>
/// Gets the instrument
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public IInstrument GetInstrument(string name)
{
try
{
return new DMMNiPxi(name, _configurationManager);
}
catch (Exception)
{
throw;
}
}
/// <summary>
/// Gets the instrument
@@ -106,12 +99,10 @@ namespace Raytheon.Instruments
{
try
{
_logger = LogManager.GetLogger(name);
if (simulateHw)
return new DMMSim(name, _configurationManager, _logger);
return new DMMSim(name, _configurationManager);
else
return new DMMNiPxi(name, _configurationManager, _logger);
return new DMMNiPxi(name, _configurationManager);
}
catch (Exception)
{
@@ -124,17 +115,17 @@ namespace Raytheon.Instruments
/// </summary>
/// <returns></returns>
public ICollection<Type> GetSupportedInterfaces()
{
return _supportedInterfaces.ToArray();
}
{
return _supportedInterfaces.ToArray();
}
/// <summary>
/// returns configuration based on the predefined path or default path c:/ProgramData/Raytheon/InstrumentManagerService
/// </summary>
/// <returns></returns>
private static IConfigurationManager GetConfigurationManager()
{
return string.IsNullOrEmpty(DefaultPath) ? new RaytheonConfigurationManager() : new RaytheonConfigurationManager(DefaultPath);
}
}
/// <summary>
/// returns configuration based on the predefined path or default path c:/ProgramData/Raytheon/InstrumentManagerService
/// </summary>
/// <returns></returns>
private static IConfigurationManager GetConfigurationManager()
{
return string.IsNullOrEmpty(DefaultPath) ? new RaytheonConfigurationManager() : new RaytheonConfigurationManager(DefaultPath);
}
}
}