michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uni.FlowMeter requests a measurement after a mose-click, ver. 3.1.1607

Browse Source
This commit is contained in:
Milan Hanajik 2021-03-05 13:20:51 +01:00
parent d27c1b89ad
commit 84c8ec26b6
6 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TBF/BenchControl/Uni/FlowMeter/FlowMeter.cs
View File

@ -81,6 +81,11 @@ namespace TBF.BenchControl.Uni.FlowMeter
}
}
TBF.UiBridge.Bridge.MeasurementRequestHandler += delegate(object sender, TBF.UiBridge.MeasurementRequestArgs args)
{
if (args.Name == Name) { cBoard.MeasureFlow(Idx1); }
};
log.FatalFormat("Successfully initialized device {0}", Name);
}
public void RunDeviceBefore() { }

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.1.1606.0")]
[assembly: AssemblyFileVersion("3.1.1606.0")]
[assembly: AssemblyVersion("3.1.1607.0")]
[assembly: AssemblyFileVersion("3.1.1607.0")]

1
TBF/TBF.csproj
View File

@ -2004,6 +2004,7 @@
<Compile Include="UiBridge\Enums.cs" />
<Compile Include="UiBridge\ImageEventArgs.cs" />
<Compile Include="UiBridge\EventEventArgs.cs" />
<Compile Include="UiBridge\MeasurementRequestArgs.cs" />
<Compile Include="UiBridge\ProcedureCompletedEventArgs.cs" />
<Compile Include="UiBridge\ProcedureSelectedEventArgs.cs" />
<Compile Include="UiBridge\ProcessDataEventArgs.cs" />

14
TBF/UI/MainWnd.cs
View File

@ -1106,10 +1106,18 @@ namespace TBF.UI
int nodeId;
Element element = drawingCtrl.FindElement(e.X, e.Y, Element.Body | Element.Setpoint, out item, out edge, out nodeId);
if (element == Element.Body && item is IRouteBasedDrawingItem)
if (element == Element.Body)
{
TBF.UiBridge.Bridge.OnRouteChange(this, new TBF.UiBridge.RouteChangeArgs((item as IRouteBasedDrawingItem).BitNr));
return;
if (item is IRouteBasedDrawingItem)
{
TBF.UiBridge.Bridge.OnRouteChange(this, new TBF.UiBridge.RouteChangeArgs((item as IRouteBasedDrawingItem).BitNr));
return;
}
else if (item is IDrawingItemWithMeasuredVal)
{
TBF.UiBridge.Bridge.OnMeasurementRequest(this, new TBF.UiBridge.MeasurementRequestArgs(item.Name));
return;
}
}
if (element == Element.Setpoint && item is IDrawingItemWithSetpoint)

8
TBF/UiBridge/Bridge.cs
View File

@ -301,6 +301,14 @@ namespace TBF.UiBridge
}
public static event EventHandler<RouteChangeArgs> RouteChangeHandler;
public static void OnMeasurementRequest(object sender, MeasurementRequestArgs args)
{
if (MeasurementRequestHandler == null) return;
try { MeasurementRequestHandler(sender, args); }
catch (Exception e) { log.Error("MeasurementRequestHandler(...) failed", e); }
}
public static event EventHandler<MeasurementRequestArgs> MeasurementRequestHandler;
public static void OnSetpointChange(object sender, SetpointChangeArgs args)
{
if (SetpointChangeHandler == null) return;

17
TBF/UiBridge/MeasurementRequestArgs.cs Normal file
View File

@ -0,0 +1,17 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
namespace TBF.UiBridge
{
public class MeasurementRequestArgs : EventArgs
{
public string Name; /// Name of a component with a measured value
public MeasurementRequestArgs(string name)
{
Name = name;
}
}
}