omni database scripts
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using OmniPipes;
|
||||
//using OmniPipes;
|
||||
|
||||
using OmniPlus.Connections;
|
||||
using OmniPlus.Features;
|
||||
@@ -21,7 +21,7 @@ namespace OmniPlus.UI.Inspection
|
||||
private readonly ConcurrentDictionary<int, OmniPlusConnection> connections;
|
||||
private readonly ConcurrentDictionary<int, OmniPlusMeter> meters;
|
||||
private readonly ConcurrentDictionary<int, Task> tasks;
|
||||
private readonly NamedPipeClient namedPipeClient;
|
||||
//private readonly NamedPipeClient namedPipeClient;
|
||||
private readonly OmniPlusDatabase database;
|
||||
|
||||
private bool available;
|
||||
@@ -31,7 +31,7 @@ namespace OmniPlus.UI.Inspection
|
||||
{
|
||||
this.connections = new ConcurrentDictionary<int, OmniPlusConnection>();
|
||||
this.meters = new ConcurrentDictionary<int, OmniPlusMeter>();
|
||||
this.namedPipeClient = new NamedPipeClient();
|
||||
//this.namedPipeClient = new NamedPipeClient();
|
||||
this.database = new OmniPlusDatabase(dbConnectionString);
|
||||
}
|
||||
|
||||
@@ -53,19 +53,19 @@ namespace OmniPlus.UI.Inspection
|
||||
connection?.Disconnect();
|
||||
}
|
||||
|
||||
this.namedPipeClient.Connected -= this.NamedPipeClient_Connected;
|
||||
this.namedPipeClient.Disconnected -= this.NamedPipeClient_Disconnected;
|
||||
//this.namedPipeClient.Connected -= this.NamedPipeClient_Connected;
|
||||
//this.namedPipeClient.Disconnected -= this.NamedPipeClient_Disconnected;
|
||||
|
||||
this.namedPipeClient.Disconnect();
|
||||
//this.namedPipeClient.Disconnect();
|
||||
this.connections.Clear();
|
||||
this.meters.Clear();
|
||||
}
|
||||
|
||||
public void InitializeInspection(params string[] portNames)
|
||||
{
|
||||
this.namedPipeClient.Connected += this.NamedPipeClient_Connected;
|
||||
this.namedPipeClient.Disconnected += this.NamedPipeClient_Disconnected;
|
||||
this.namedPipeClient.Connect();
|
||||
//this.namedPipeClient.Connected += this.NamedPipeClient_Connected;
|
||||
//this.namedPipeClient.Disconnected += this.NamedPipeClient_Disconnected;
|
||||
//this.namedPipeClient.Connect();
|
||||
|
||||
OmniPlusConnection connection;
|
||||
OmniPlusMeter meter;
|
||||
@@ -174,7 +174,7 @@ namespace OmniPlus.UI.Inspection
|
||||
|
||||
foreach (var point in inspectionPoints)
|
||||
{
|
||||
this.namedPipeClient.RequestFlowRate(point.FlowRate);
|
||||
//this.namedPipeClient.RequestFlowRate(point.FlowRate);
|
||||
|
||||
foreach (var position in this.connections.Keys)
|
||||
{
|
||||
@@ -183,12 +183,12 @@ namespace OmniPlus.UI.Inspection
|
||||
|
||||
factory.ContinueWhenAll(this.tasks.Values.ToArray(), _ => { });
|
||||
|
||||
var volume = this.namedPipeClient.RequestReference();
|
||||
//var volume = this.namedPipeClient.RequestReference();
|
||||
|
||||
foreach (var meter in this.meters.Values)
|
||||
{
|
||||
meter.AddInspectionVolume(point, volume);
|
||||
}
|
||||
//foreach (var meter in this.meters.Values)
|
||||
//{
|
||||
// meter.AddInspectionVolume(point, volume);
|
||||
//}
|
||||
}
|
||||
|
||||
foreach(var position in this.connections.Keys)
|
||||
@@ -319,10 +319,10 @@ namespace OmniPlus.UI.Inspection
|
||||
canContinue = systemTimeReset.Succeeded;
|
||||
}
|
||||
|
||||
if (canContinue)
|
||||
{
|
||||
var registerSettings = connection.ViewRegisterSettings();
|
||||
}
|
||||
//if (canContinue)
|
||||
//{
|
||||
// var registerSettings = connection.ViewRegisterSettings();
|
||||
//}
|
||||
}
|
||||
else // meter or connection not in use
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user