IDataEntry supports bool Completed property.

This commit is contained in:
Milan Hanajik
2019-03-08 10:20:58 +01:00
parent 99bb0cec57
commit 684fed8fc0
16 changed files with 24 additions and 2 deletions
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Combined
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -52,6 +52,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -52,6 +52,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Munich
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
bool resultSaved; /// Set in Run() when results are saved
@@ -44,6 +44,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Single
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -40,6 +40,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -90,6 +90,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -47,6 +47,7 @@ namespace TBF.BenchControl.DataEntry.WMStates
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
bool resultSaved;
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using Config.Entities;
@@ -9,6 +9,11 @@ namespace TBF.BenchControl.GenericDevices
{
public interface IDataEntry : IComponent
{
/// <summary>
/// true when DataEntry dialog was completed or when it does not support IHasCompleted (to avoid TBF freeze).
/// </summary>
bool Completed { get; }
/// <summary>
/// Updates test results with the information collected in watermeters.
/// </summary>
@@ -5,8 +5,11 @@ using System;
namespace TBF.BenchControl.GenericDevices
{
interface IHasCompleted
public interface IHasCompleted
{
/// <summary>
/// true when a dialog was completed
/// </summary>
bool Completed { get; }
}
}
@@ -44,6 +44,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
double refVolume;
double errLimLo;