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

(1) 'bool NewQnames' added to IWaterMeter, WaterMeters.Munich and elsewhere, (2) German language : Control water temp., Temp lim lo, Temp lim hi.

Browse Source
This commit is contained in:
Milan Hanajik 2017-11-21 09:31:24 +01:00
parent 14cfb65b6b
commit 3ad842b02a
11 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Results/Entities/WaterMeter.cs
View File

@ -86,6 +86,7 @@ namespace Results.Entities
public virtual string Producer() { return WaterMeterData.Producer; }
public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
public virtual string ApprovalInfo() { return WaterMeterData.ApprovalInfo; }
public virtual bool NewQnames() { return WaterMeterData.NewQnames; }
public virtual double Q4_Qmax() { return WaterMeterData.Q4_Qmax; }
public virtual double Q3_Qn() { return WaterMeterData.Q3_Qn; }
public virtual double Q2_Qt() { return WaterMeterData.Q2_Qt; }

4
Results/Entities/WaterMeterData.cs
View File

@ -17,7 +17,8 @@ namespace Results.Entities
public virtual double DN { get; set; } /// [mm]
public virtual double L { get; set; } /// [mm]
public virtual Config.Entities.Mounting Mounting { get; set; } /// H / V / S / F
public virtual bool NewQnames { get; set; } /// Yes = Q3... No = Qn...
public virtual double Q4_Qmax { get; set; } /// [m3/h]
public virtual double Q3_Qn { get; set; } /// [m3/h]
public virtual double Q2_Qt { get; set; } /// [m3/h]
@ -73,6 +74,7 @@ namespace Results.Entities
if (L != wmd.L) return false;
if (Mounting != wmd.Mounting) return false;
if (NewQnames != wmd.NewQnames) return false;
if (Q4_Qmax != wmd.Q4_Qmax) return false;
if (Q3_Qn != wmd.Q3_Qn) return false;
if (Q2_Qt != wmd.Q2_Qt) return false;

1
TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs
View File

@ -17,6 +17,7 @@ namespace TBF.BenchControl.GenericDevices
float L { get; } /// building length [mm]
Mounting Mounting { get; } /// mounting H / V
bool NewQnames { get; } /// true = Q3... false = Qn...
float Q4_Qmax { get; } /// [m3/h]
float Q3_Qn { get; } /// [m3/h]
float Q2_Qt { get; } /// [m3/h]

1
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
View File

@ -1301,6 +1301,7 @@ namespace TBF.BenchControl.Sequences
DN = WaterMeters[ix].DN,
Mounting = WaterMeters[ix].Mounting,
NewQnames = WaterMeters[ix].NewQnames,
Q4_Qmax = WaterMeters[ix].Q4_Qmax,
Q3_Qn = WaterMeters[ix].Q3_Qn,
Q2_Qt = WaterMeters[ix].Q2_Qt,

47
TestBenchFramework/BenchControl/WaterMeters/Munich/ProcParams.cs
View File

@ -18,10 +18,13 @@ namespace TBF.BenchControl.WaterMeters.Munich
public string ProductName; /// Znak fabryczny (PL)
public string Producer; /// Producent (PL), Hersteller (D)
public float DN;
public float DN;
public float L; /// stavebná dĺžka [mm]
public Mounting Mounting;
public float Qn; /// [m3/h]
public bool NewQnames; /// true = display Q4,Q3,Q2,Q1, false = display Qmax, Qn, Qt, Qmin
public float Qn; /// [m3/h]
public string MetrologicalClass; /// Metr. Klasse
public string ApprovalInfo; /// Zulassungszeichen, WE (PL)
@ -33,6 +36,7 @@ namespace TBF.BenchControl.WaterMeters.Munich
DN = 0;
L = 0;
Mounting = Mounting.NotSpecified;
NewQnames = false;
Qn = 2.5f;
MetrologicalClass = "A";
ApprovalInfo = string.Empty;
@ -49,11 +53,22 @@ namespace TBF.BenchControl.WaterMeters.Munich
"DN [mm]",
"L [mm]",
Strings.Mounting,
"Qn [m3/h]",
Strings.New_Q_names,
Strings.Qn,
Strings.Metrological_class,
Strings.Approval_info,
};
public override string ParamName(int i) { return paramNames[i]; }
public override string ParamName(int i)
{
string name = paramNames[i];
if (NewQnames && name.Equals(Strings.Qmax)) name = "Q4 [m3/h]";
if (NewQnames && name.Equals(Strings.Qn)) name = "Q3 [m3/h]";
if (NewQnames && name.Equals(Strings.Qt)) name = "Q2 [m3/h]";
if (NewQnames && name.Equals(Strings.Qmin)) name = "Q1 [m3/h]";
return name;
}
public override int ParamsCount() { return paramNames.Length; }
public override string ToString(int i)
@ -65,9 +80,10 @@ namespace TBF.BenchControl.WaterMeters.Munich
case 2: return DN.ToString();
case 3: return L.ToString();
case 4: return Mounting.ToDescription();
case 5: return Qn.ToString();
case 6: return MetrologicalClass;
case 7: return ApprovalInfo;
case 5: return (NewQnames ? Strings.yes : Strings.no);
case 6: return Qn.ToString();
case 7: return MetrologicalClass;
case 8: return ApprovalInfo;
default: return string.Empty;
}
@ -87,9 +103,10 @@ namespace TBF.BenchControl.WaterMeters.Munich
if (m.ToDescription().Equals(strValue)) { Mounting = m; return; }
}
break;
case 5: Qn = Utils.ParseUFloat(strValue); return;
case 6: MetrologicalClass = strValue; return;
case 7: ApprovalInfo = strValue; return;
case 5: NewQnames = strValue.Equals(Strings.yes); return;
case 6: Qn = Utils.ParseUFloat(strValue); return;
case 7: MetrologicalClass = strValue; return;
case 8: ApprovalInfo = strValue; return;
default: return;
}
@ -104,17 +121,20 @@ namespace TBF.BenchControl.WaterMeters.Munich
{
case 0: /// ProductName
case 1: /// Producer
case 6: /// MetrologicalClass
case 7: /// ApprovalInfo
case 7: /// MetrologicalClass
case 8: /// ApprovalInfo
return true;
case 2: /// DN
case 3: /// L
case 5: /// Qn
case 6: /// Qn
if (Utils.TryParseUFloat(strValue, out dummy)) return true;
break;
case 4:
for (Mounting tc = 0; tc < Mounting.Count; tc++) if (tc.ToDescription().Equals(strValue)) return true;
break;
case 5:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
default:
message = "Invalid index";
return false;
@ -131,6 +151,7 @@ namespace TBF.BenchControl.WaterMeters.Munich
prms.DN = this.DN;
prms.L = this.L;
prms.Mounting = this.Mounting;
prms.NewQnames = this.NewQnames;
prms.Qn = this.Qn;
prms.MetrologicalClass = this.MetrologicalClass;
prms.ApprovalInfo = this.ApprovalInfo;

3
TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeter.cs
View File

@ -34,8 +34,9 @@ namespace TBF.BenchControl.WaterMeters.Munich
public Mounting Mounting { get { return Config.Entities.Mounting.NotSpecified; } }
/// <summary>Nominal water flow in [m3/h]</summary>
public bool NewQnames { get { return waterMeterCfg.ProcParams.NewQnames; } }
public float Q4_Qmax { get { return 0; } }
public float Q3_Qn { get { return waterMeterCfg. ProcParams.Qn; } }
public float Q3_Qn { get { return waterMeterCfg.ProcParams.Qn; } }
public float Q2_Qt { get { return 0; } }
public float Q1_Qmin { get { return 0; } }

3
TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs
View File

@ -31,8 +31,9 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
public Mounting Mounting { get { return waterMeterCfg.ProcParams.Mounting; } }
/// <summary>Nominal water flow in [m3/h]</summary>
public bool NewQnames { get { return waterMeterCfg.ProcParams.NewQnames; } }
public float Q4_Qmax { get { return waterMeterCfg.ProcParams.Qmax; } }
public float Q3_Qn { get { return waterMeterCfg. ProcParams.Qn; } }
public float Q3_Qn { get { return waterMeterCfg.ProcParams.Qn; } }
public float Q2_Qt { get { return waterMeterCfg.ProcParams.Qt; } }
public float Q1_Qmin { get { return waterMeterCfg.ProcParams.Qmin; } }

4
TestBenchFramework/ProcedureDlg.cs
View File

@ -699,8 +699,8 @@ namespace TBF
lv.Columns.Add(new ColumnHeader { Text = Strings.Emptying_chdr, Width = 60 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 90 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Control_water_temp_chdr, Width = 110 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Temp_lim_lo_chdr, Width = 100 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Temp_lim_hi_chdr, Width = 100 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_lo_chdr), Width = 100 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_hi_chdr), Width = 100 });
lv.Columns.Add(new ColumnHeader { Text = "Filter", Width = 80 }); /// Strings.Tol_red_pct_chdr
lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });

12
TestBenchFramework/Resources/Strings.Designer.cs generated
View File

@ -3265,7 +3265,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Qmax.
/// Looks up a localized string similar to Qmax [m3/h].
/// </summary>
internal static string Qmax {
get {
@ -3274,7 +3274,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Qmin.
/// Looks up a localized string similar to Qmin [m3/h].
/// </summary>
internal static string Qmin {
get {
@ -3283,7 +3283,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Qn.
/// Looks up a localized string similar to Qn [m3/h].
/// </summary>
internal static string Qn {
get {
@ -3301,7 +3301,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Qt.
/// Looks up a localized string similar to Qt [m3/h].
/// </summary>
internal static string Qt {
get {
@ -4408,7 +4408,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Temp. lim. hi [°C].
/// Looks up a localized string similar to Temp. lim. hi.
/// </summary>
internal static string Temp_lim_hi_chdr {
get {
@ -4417,7 +4417,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Temp. lim. lo [°C].
/// Looks up a localized string similar to Temp. lim. lo.
/// </summary>
internal static string Temp_lim_lo_chdr {
get {

11
TestBenchFramework/Resources/Strings.de.resx
View File

@ -1378,7 +1378,7 @@
<value>Prüfpunktvolumen uberschritt Behalter</value>
</data>
<data name="New_Q_names" xml:space="preserve">
<value>Neue Q</value>
<value>Q3 (ja)/Qn (nein)</value>
</data>
<data name="Wait_until_0_tank_is_empty" xml:space="preserve">
<value>Warten bis {0} Behälter ist leer</value>
@ -1428,4 +1428,13 @@
<data name="Correction" xml:space="preserve">
<value>Korrektur</value>
</data>
<data name="Control_water_temp_chdr" xml:space="preserve">
<value>Wassertemperaturregelung</value>
</data>
<data name="Temp_lim_hi_chdr" xml:space="preserve">
<value>Obere Temperaturgrenze</value>
</data>
<data name="Temp_lim_lo_chdr" xml:space="preserve">
<value>Untere Temperaturgrenze</value>
</data>
</root>

12
TestBenchFramework/Resources/Strings.resx
View File

@ -668,7 +668,7 @@
<value>Producer</value>
</data>
<data name="Qn" xml:space="preserve">
<value>Qn</value>
<value>Qn [m3/h]</value>
</data>
<data name="Water_meters" xml:space="preserve">
<value>Water meters</value>
@ -1022,10 +1022,10 @@
<value>Main:</value>
</data>
<data name="Qmin" xml:space="preserve">
<value>Qmin</value>
<value>Qmin [m3/h]</value>
</data>
<data name="Qt" xml:space="preserve">
<value>Qt</value>
<value>Qt [m3/h]</value>
</data>
<data name="cold" xml:space="preserve">
<value>cold</value>
@ -1184,7 +1184,7 @@
<value>Invalid calibration information. Correct it please.</value>
</data>
<data name="Qmax" xml:space="preserve">
<value>Qmax</value>
<value>Qmax [m3/h]</value>
</data>
<data name="Certificate" xml:space="preserve">
<value>Certificate</value>
@ -1778,10 +1778,10 @@
<value>Control water temp.</value>
</data>
<data name="Temp_lim_hi_chdr" xml:space="preserve">
<value>Temp. lim. hi [°C]</value>
<value>Temp. lim. hi</value>
</data>
<data name="Temp_lim_lo_chdr" xml:space="preserve">
<value>Temp. lim. lo [°C]</value>
<value>Temp. lim. lo</value>
</data>
<data name="Resetting_scales" xml:space="preserve">
<value>Resetting scales</value>