diff --git a/.gitignore b/.gitignore index be4bb9f5d..64b011c2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ TestBenchFramework/bin/ TestBenchFramework/obj/ +Config/bin/ +Config/obj/ +Results/bin/ +Results/obj/ ResultsBrowser/bin/ ResultsBrowser/obj/ TBFSetup/Debug/ diff --git a/Config/Config.csproj b/Config/Config.csproj new file mode 100644 index 000000000..b80913d41 --- /dev/null +++ b/Config/Config.csproj @@ -0,0 +1,130 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {743DF7DB-C7B6-42EB-986D-0F485E5588E4} + Library + Properties + Config + Config + v4.0 + 512 + + + true + full + false + bin\Debug\ + TRACE;DEBUG;MUNICH + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE;MUNICH + prompt + 4 + + + + ..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll + + + ..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll + + + ..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll + + + ..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll + + + + + + + + + + + + + + + Form + + + DatabaseSettingsDlg.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DatabaseSettingsDlg.cs + + + Designer + + + + + \ No newline at end of file diff --git a/TestBenchFramework/DBSettings.cs b/Config/DBSettings.cs similarity index 97% rename from TestBenchFramework/DBSettings.cs rename to Config/DBSettings.cs index d28490cbb..903f55643 100644 --- a/TestBenchFramework/DBSettings.cs +++ b/Config/DBSettings.cs @@ -3,7 +3,7 @@ /// using System; -namespace TBF +namespace Config { /// /// Database settings required to make a connection diff --git a/Config/Data.cs b/Config/Data.cs new file mode 100644 index 000000000..0616a0375 --- /dev/null +++ b/Config/Data.cs @@ -0,0 +1,42 @@ +using System; + +namespace Config +{ + public class Data + { + public const string AdminUsername = "admin"; + public const string AdminPassword = "staratura"; + public const string SQLiteDbFName = "SQLite.db"; + +#if MUNICH + public const int WMsCount = 3; + public const int LineSize = 1; + public const int CompoundWMsCount = 1; +#elif DN100 || BADGER_VELKA_TRAT + public const int WMsCount = 3; + public const int LineSize = 3; + public const int CompoundWMsCount = 1; +#elif FUZHOU300 || FUZHOU150 || PT200IL + public const int WMsCount = 6; + public const int LineSize = 6; + public const int CompoundWMsCount = 3; +#elif TORINO50 || BADGER_MALA_TRAT + public const int WMsCount = 6; + public const int LineSize = 6; + public const int CompoundWMsCount = 1; +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 + public const int WMsCount = 20; + public const int LineSize = 10; + public const int CompoundWMsCount = 1; +#elif IPERLST + public const int WMsCount = 40; + public const int LineSize = 20; + public const int CompoundWMsCount = 1; +#endif + + /// + /// Database related: This object reference is set after a successful user login + /// + public static DatabaseSettings CurrentBench; + } +} diff --git a/TestBenchFramework/DatabaseSettings.cs b/Config/DatabaseSettings.cs similarity index 99% rename from TestBenchFramework/DatabaseSettings.cs rename to Config/DatabaseSettings.cs index 8ae274825..17f3c6aac 100644 --- a/TestBenchFramework/DatabaseSettings.cs +++ b/Config/DatabaseSettings.cs @@ -5,7 +5,7 @@ using System; using System.Text; using System.Xml.Serialization; -namespace TBF +namespace Config { /// /// Test bench database settings, contains bench name and settings od several databases diff --git a/TestBenchFramework/DatabaseSettingsDlg.Designer.cs b/Config/DatabaseSettingsDlg.Designer.cs similarity index 91% rename from TestBenchFramework/DatabaseSettingsDlg.Designer.cs rename to Config/DatabaseSettingsDlg.Designer.cs index 7fb1c266e..55c044981 100644 --- a/TestBenchFramework/DatabaseSettingsDlg.Designer.cs +++ b/Config/DatabaseSettingsDlg.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF +namespace Config { partial class DatabaseSettingsDlg { @@ -69,7 +69,6 @@ namespace TBF // okButton // this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.okButton.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; this.okButton.UseVisualStyleBackColor = true; @@ -78,7 +77,6 @@ namespace TBF // cancelButton // this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.Name = "cancelButton"; this.cancelButton.UseVisualStyleBackColor = true; @@ -87,7 +85,6 @@ namespace TBF // label1 // resources.ApplyResources(this.label1, "label1"); - this.label1.ImageKey = global::TBF.Resources.Strings.String1; this.label1.Name = "label1"; // // benchNameTextBox @@ -103,7 +100,6 @@ namespace TBF // connectionStringLabel // resources.ApplyResources(this.connectionStringLabel, "connectionStringLabel"); - this.connectionStringLabel.ImageKey = global::TBF.Resources.Strings.String1; this.connectionStringLabel.Name = "connectionStringLabel"; // // benchConnectionStringTextBox @@ -129,37 +125,31 @@ namespace TBF // label2 // resources.ApplyResources(this.label2, "label2"); - this.label2.ImageKey = global::TBF.Resources.Strings.String1; this.label2.Name = "label2"; // // label3 // resources.ApplyResources(this.label3, "label3"); - this.label3.ImageKey = global::TBF.Resources.Strings.String1; this.label3.Name = "label3"; // // label4 // resources.ApplyResources(this.label4, "label4"); - this.label4.ImageKey = global::TBF.Resources.Strings.String1; this.label4.Name = "label4"; // // label5 // resources.ApplyResources(this.label5, "label5"); - this.label5.ImageKey = global::TBF.Resources.Strings.String1; this.label5.Name = "label5"; // // label6 // resources.ApplyResources(this.label6, "label6"); - this.label6.ImageKey = global::TBF.Resources.Strings.String1; this.label6.Name = "label6"; // // testConnUsersBtn // this.testConnUsersBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.testConnUsersBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.testConnUsersBtn, "testConnUsersBtn"); this.testConnUsersBtn.Name = "testConnUsersBtn"; this.testConnUsersBtn.UseVisualStyleBackColor = true; @@ -168,7 +158,6 @@ namespace TBF // createUsersDbBtn // this.createUsersDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.createUsersDbBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.createUsersDbBtn, "createUsersDbBtn"); this.createUsersDbBtn.Name = "createUsersDbBtn"; this.createUsersDbBtn.UseVisualStyleBackColor = true; @@ -177,14 +166,12 @@ namespace TBF // realBenchCheckBox // resources.ApplyResources(this.realBenchCheckBox, "realBenchCheckBox"); - this.realBenchCheckBox.ImageKey = global::TBF.Resources.Strings.String1; this.realBenchCheckBox.Name = "realBenchCheckBox"; this.realBenchCheckBox.UseVisualStyleBackColor = true; // // dbTypeLabel // resources.ApplyResources(this.dbTypeLabel, "dbTypeLabel"); - this.dbTypeLabel.ImageKey = global::TBF.Resources.Strings.String1; this.dbTypeLabel.Name = "dbTypeLabel"; // // usersDbTypeComboBox @@ -220,7 +207,6 @@ namespace TBF // testConnBenchBtn // this.testConnBenchBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.testConnBenchBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.testConnBenchBtn, "testConnBenchBtn"); this.testConnBenchBtn.Name = "testConnBenchBtn"; this.testConnBenchBtn.UseVisualStyleBackColor = true; @@ -229,7 +215,6 @@ namespace TBF // testConnProceduresBtn // this.testConnProceduresBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.testConnProceduresBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.testConnProceduresBtn, "testConnProceduresBtn"); this.testConnProceduresBtn.Name = "testConnProceduresBtn"; this.testConnProceduresBtn.UseVisualStyleBackColor = true; @@ -238,7 +223,6 @@ namespace TBF // testConnWMTypesBtn // this.testConnWMTypesBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.testConnWMTypesBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.testConnWMTypesBtn, "testConnWMTypesBtn"); this.testConnWMTypesBtn.Name = "testConnWMTypesBtn"; this.testConnWMTypesBtn.UseVisualStyleBackColor = true; @@ -247,7 +231,6 @@ namespace TBF // testConnWaterMetersBtn // this.testConnWaterMetersBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.testConnWaterMetersBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.testConnWaterMetersBtn, "testConnWaterMetersBtn"); this.testConnWaterMetersBtn.Name = "testConnWaterMetersBtn"; this.testConnWaterMetersBtn.UseVisualStyleBackColor = true; @@ -256,7 +239,6 @@ namespace TBF // createBenchDbBtn // this.createBenchDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.createBenchDbBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.createBenchDbBtn, "createBenchDbBtn"); this.createBenchDbBtn.Name = "createBenchDbBtn"; this.createBenchDbBtn.UseVisualStyleBackColor = true; @@ -265,7 +247,6 @@ namespace TBF // createProceduresDbBtn // this.createProceduresDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.createProceduresDbBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.createProceduresDbBtn, "createProceduresDbBtn"); this.createProceduresDbBtn.Name = "createProceduresDbBtn"; this.createProceduresDbBtn.UseVisualStyleBackColor = true; @@ -274,7 +255,6 @@ namespace TBF // createWMTypesDbBtn // this.createWMTypesDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.createWMTypesDbBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.createWMTypesDbBtn, "createWMTypesDbBtn"); this.createWMTypesDbBtn.Name = "createWMTypesDbBtn"; this.createWMTypesDbBtn.UseVisualStyleBackColor = true; @@ -283,7 +263,6 @@ namespace TBF // createWaterMetersDbBtn // this.createWaterMetersDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.createWaterMetersDbBtn.ImageKey = global::TBF.Resources.Strings.String1; resources.ApplyResources(this.createWaterMetersDbBtn, "createWaterMetersDbBtn"); this.createWaterMetersDbBtn.Name = "createWaterMetersDbBtn"; this.createWaterMetersDbBtn.UseVisualStyleBackColor = true; diff --git a/TestBenchFramework/DatabaseSettingsDlg.cs b/Config/DatabaseSettingsDlg.cs similarity index 98% rename from TestBenchFramework/DatabaseSettingsDlg.cs rename to Config/DatabaseSettingsDlg.cs index 63b6a4d8b..746eb6640 100644 --- a/TestBenchFramework/DatabaseSettingsDlg.cs +++ b/Config/DatabaseSettingsDlg.cs @@ -2,15 +2,10 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Text; using System.Windows.Forms; -using TBF.Resources; +using Config.Resources; -namespace TBF +namespace Config { /// /// Dialog to process test bench name and database settings (BenchSettings) diff --git a/TestBenchFramework/DatabaseSettingsDlg.resx b/Config/DatabaseSettingsDlg.resx similarity index 100% rename from TestBenchFramework/DatabaseSettingsDlg.resx rename to Config/DatabaseSettingsDlg.resx diff --git a/TestBenchFramework/Entities/BenchPath.cs b/Config/Entities/BenchPath.cs similarity index 64% rename from TestBenchFramework/Entities/BenchPath.cs rename to Config/Entities/BenchPath.cs index f2fdab280..c1a73a702 100644 --- a/TestBenchFramework/Entities/BenchPath.cs +++ b/Config/Entities/BenchPath.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class BenchPath : IHasItemNr, IHasValves { @@ -26,7 +26,9 @@ namespace TBF.Entities public BenchPath() { - } + ValvesOpen = string.Empty; + ValvesClose = string.Empty; + } public BenchPath(string name, int itemNr) : this() @@ -35,33 +37,6 @@ namespace TBF.Entities ItemNr = itemNr; } - public BenchPath(BenchControl.BenchPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - TempIn = (path.TempIn != null) ? path.TempIn.Cfg.Name : null; - TempOut = (path.TempOut != null) ? path.TempOut.Cfg.Name : null; - PressIn = (path.PressIn != null) ? path.PressIn.Cfg.Name : null; - PressOut = (path.PressOut != null) ? path.PressOut.Cfg.Name : null; - - string vOpen = string.Empty; - foreach (var valve in path.ValvesOpen) - { - if (vOpen != string.Empty) vOpen += ";"; - vOpen += valve.Cfg.Name; - } - ValvesOpen = vOpen; - - string vClose = string.Empty; - foreach (var valve in path.ValvesClose) - { - if (vClose != string.Empty) vClose += ";"; - vClose += valve.Cfg.Name; - } - ValvesClose = vClose; - } - public virtual BenchPath Clone(string name, int itemNr) { BenchPath result = new BenchPath(name, itemNr); diff --git a/TestBenchFramework/Entities/Component.cs b/Config/Entities/Component.cs similarity index 98% rename from TestBenchFramework/Entities/Component.cs rename to Config/Entities/Component.cs index 3346ab05d..b70510bad 100644 --- a/TestBenchFramework/Entities/Component.cs +++ b/Config/Entities/Component.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class Component : IHasItemNr { diff --git a/TestBenchFramework/Entities/ComponentProcedure.cs b/Config/Entities/ComponentProcedure.cs similarity index 95% rename from TestBenchFramework/Entities/ComponentProcedure.cs rename to Config/Entities/ComponentProcedure.cs index 819b0685e..a5af304d3 100644 --- a/TestBenchFramework/Entities/ComponentProcedure.cs +++ b/Config/Entities/ComponentProcedure.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF.Entities +namespace Config.Entities { public class ComponentProcedure { diff --git a/TestBenchFramework/Entities/ComponentTest.cs b/Config/Entities/ComponentTest.cs similarity index 95% rename from TestBenchFramework/Entities/ComponentTest.cs rename to Config/Entities/ComponentTest.cs index 709420a2a..725b7248b 100644 --- a/TestBenchFramework/Entities/ComponentTest.cs +++ b/Config/Entities/ComponentTest.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF.Entities +namespace Config.Entities { public class ComponentTest { diff --git a/TestBenchFramework/Entities/Enums.cs b/Config/Entities/Enums.cs similarity index 88% rename from TestBenchFramework/Entities/Enums.cs rename to Config/Entities/Enums.cs index b699d37ee..34f60e57c 100644 --- a/TestBenchFramework/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public enum ProcedureState { @@ -105,5 +105,20 @@ namespace TBF.Entities All, Count, } + + + /// Arrangement of tests + public enum TestsArrangement + { + Rows, + Columns, + } + + /// Arrangement of meters + public enum MetersArrangement + { + Vertically, + Horizontally, + } } diff --git a/TestBenchFramework/Entities/FeedingPath.cs b/Config/Entities/FeedingPath.cs similarity index 66% rename from TestBenchFramework/Entities/FeedingPath.cs rename to Config/Entities/FeedingPath.cs index 11c7e1a40..cff478af2 100644 --- a/TestBenchFramework/Entities/FeedingPath.cs +++ b/Config/Entities/FeedingPath.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class FeedingPath : IHasItemNr, IHasValves { @@ -23,7 +23,9 @@ namespace TBF.Entities public FeedingPath() { - } + ValvesOpen = string.Empty; + ValvesClose = string.Empty; + } public FeedingPath(string name, int itemNr) : this() @@ -32,30 +34,6 @@ namespace TBF.Entities ItemNr = itemNr; } - public FeedingPath(BenchControl.FeedingPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - Pump = (path.Pump != null) ? path.Pump.Cfg.Name : null; - - string vOpen = string.Empty; - foreach (var valve in path.ValvesOpen) - { - if (vOpen != string.Empty) vOpen += ";"; - vOpen += valve.Cfg.Name; - } - ValvesOpen = vOpen; - - string vClose = string.Empty; - foreach (var valve in path.ValvesClose) - { - if (vClose != string.Empty) vClose += ";"; - vClose += valve.Cfg.Name; - } - ValvesClose = vClose; - } - public virtual FeedingPath Clone(string name, int itemNr) { FeedingPath result = new FeedingPath(name, itemNr); diff --git a/TestBenchFramework/Entities/Group.cs b/Config/Entities/Group.cs similarity index 92% rename from TestBenchFramework/Entities/Group.cs rename to Config/Entities/Group.cs index 9c4bb5da2..6c35818d8 100644 --- a/TestBenchFramework/Entities/Group.cs +++ b/Config/Entities/Group.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class Group { diff --git a/TestBenchFramework/Entities/IHasItemNr.cs b/Config/Entities/IHasItemNr.cs similarity index 68% rename from TestBenchFramework/Entities/IHasItemNr.cs rename to Config/Entities/IHasItemNr.cs index 1cef26adc..504f3f630 100644 --- a/TestBenchFramework/Entities/IHasItemNr.cs +++ b/Config/Entities/IHasItemNr.cs @@ -1,9 +1,9 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF.Entities +namespace Config.Entities { - interface IHasItemNr + public interface IHasItemNr { int Id { get; } int ItemNr { get; set; } diff --git a/TestBenchFramework/Entities/IHasValves.cs b/Config/Entities/IHasValves.cs similarity index 90% rename from TestBenchFramework/Entities/IHasValves.cs rename to Config/Entities/IHasValves.cs index f8823d65f..d2e7232cf 100644 --- a/TestBenchFramework/Entities/IHasValves.cs +++ b/Config/Entities/IHasValves.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF.Entities +namespace Config.Entities { public interface IHasValves { diff --git a/TestBenchFramework/Entities/MeasurementCorrection.cs b/Config/Entities/MeasurementCorrection.cs similarity index 91% rename from TestBenchFramework/Entities/MeasurementCorrection.cs rename to Config/Entities/MeasurementCorrection.cs index 384440ebf..80e538384 100644 --- a/TestBenchFramework/Entities/MeasurementCorrection.cs +++ b/Config/Entities/MeasurementCorrection.cs @@ -3,7 +3,7 @@ /// using System; -namespace TBF.Entities +namespace Config.Entities { public class MeasurementCorrection { diff --git a/TestBenchFramework/Entities/MeterTestResult.cs b/Config/Entities/MeterTestResult.cs similarity index 99% rename from TestBenchFramework/Entities/MeterTestResult.cs rename to Config/Entities/MeterTestResult.cs index 253be4fb8..44d626461 100644 --- a/TestBenchFramework/Entities/MeterTestResult.cs +++ b/Config/Entities/MeterTestResult.cs @@ -3,7 +3,7 @@ /// using System; -namespace TBF.Entities +namespace Config.Entities { public class MeterTestResult { diff --git a/TestBenchFramework/Entities/MetersPath.cs b/Config/Entities/MetersPath.cs similarity index 62% rename from TestBenchFramework/Entities/MetersPath.cs rename to Config/Entities/MetersPath.cs index 20fc5c025..bd7b6e416 100644 --- a/TestBenchFramework/Entities/MetersPath.cs +++ b/Config/Entities/MetersPath.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class MetersPath : IHasItemNr { @@ -71,57 +71,6 @@ namespace TBF.Entities ItemNr = itemNr; } - public MetersPath(BenchControl.MetersPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - Sensor1 = (path.RegisterReaders[0] != null) ? path.RegisterReaders[0].Cfg.Name : null; -#pragma warning disable - if (Program.WMsCount >= 2) Sensor2 = (path.RegisterReaders[1] != null) ? path.RegisterReaders[1].Cfg.Name : null; - if (Program.WMsCount >= 3) Sensor3 = (path.RegisterReaders[2] != null) ? path.RegisterReaders[2].Cfg.Name : null; - if (Program.WMsCount >= 4) Sensor4 = (path.RegisterReaders[3] != null) ? path.RegisterReaders[3].Cfg.Name : null; - if (Program.WMsCount >= 5) Sensor5 = (path.RegisterReaders[4] != null) ? path.RegisterReaders[4].Cfg.Name : null; - if (Program.WMsCount >= 6) Sensor6 = (path.RegisterReaders[5] != null) ? path.RegisterReaders[5].Cfg.Name : null; - if (Program.WMsCount >= 7) Sensor7 = (path.RegisterReaders[6] != null) ? path.RegisterReaders[6].Cfg.Name : null; - if (Program.WMsCount >= 8) Sensor8 = (path.RegisterReaders[7] != null) ? path.RegisterReaders[7].Cfg.Name : null; - if (Program.WMsCount >= 9) Sensor9 = (path.RegisterReaders[8] != null) ? path.RegisterReaders[8].Cfg.Name : null; - if (Program.WMsCount >= 10) Sensor10 = (path.RegisterReaders[9] != null) ? path.RegisterReaders[9].Cfg.Name : null; - if (Program.WMsCount >= 11) Sensor11 = (path.RegisterReaders[10] != null) ? path.RegisterReaders[10].Cfg.Name : null; - if (Program.WMsCount >= 12) Sensor12 = (path.RegisterReaders[11] != null) ? path.RegisterReaders[11].Cfg.Name : null; - if (Program.WMsCount >= 13) Sensor13 = (path.RegisterReaders[12] != null) ? path.RegisterReaders[12].Cfg.Name : null; - if (Program.WMsCount >= 14) Sensor14 = (path.RegisterReaders[13] != null) ? path.RegisterReaders[13].Cfg.Name : null; - if (Program.WMsCount >= 15) Sensor15 = (path.RegisterReaders[14] != null) ? path.RegisterReaders[14].Cfg.Name : null; - if (Program.WMsCount >= 16) Sensor16 = (path.RegisterReaders[15] != null) ? path.RegisterReaders[15].Cfg.Name : null; - if (Program.WMsCount >= 17) Sensor17 = (path.RegisterReaders[16] != null) ? path.RegisterReaders[16].Cfg.Name : null; - if (Program.WMsCount >= 18) Sensor18 = (path.RegisterReaders[17] != null) ? path.RegisterReaders[17].Cfg.Name : null; - if (Program.WMsCount >= 19) Sensor19 = (path.RegisterReaders[18] != null) ? path.RegisterReaders[18].Cfg.Name : null; - if (Program.WMsCount >= 20) Sensor20 = (path.RegisterReaders[19] != null) ? path.RegisterReaders[19].Cfg.Name : null; -#if IPERLST - if (Program.WMsCount >= 21) Sensor21 = (path.RegisterReaders[20] != null) ? path.RegisterReaders[20].Cfg.Name : null; - if (Program.WMsCount >= 22) Sensor22 = (path.RegisterReaders[21] != null) ? path.RegisterReaders[21].Cfg.Name : null; - if (Program.WMsCount >= 23) Sensor23 = (path.RegisterReaders[22] != null) ? path.RegisterReaders[22].Cfg.Name : null; - if (Program.WMsCount >= 24) Sensor24 = (path.RegisterReaders[23] != null) ? path.RegisterReaders[23].Cfg.Name : null; - if (Program.WMsCount >= 25) Sensor25 = (path.RegisterReaders[24] != null) ? path.RegisterReaders[24].Cfg.Name : null; - if (Program.WMsCount >= 26) Sensor26 = (path.RegisterReaders[25] != null) ? path.RegisterReaders[25].Cfg.Name : null; - if (Program.WMsCount >= 27) Sensor27 = (path.RegisterReaders[26] != null) ? path.RegisterReaders[26].Cfg.Name : null; - if (Program.WMsCount >= 28) Sensor28 = (path.RegisterReaders[27] != null) ? path.RegisterReaders[27].Cfg.Name : null; - if (Program.WMsCount >= 29) Sensor29 = (path.RegisterReaders[28] != null) ? path.RegisterReaders[28].Cfg.Name : null; - if (Program.WMsCount >= 30) Sensor30 = (path.RegisterReaders[29] != null) ? path.RegisterReaders[29].Cfg.Name : null; - if (Program.WMsCount >= 31) Sensor31 = (path.RegisterReaders[30] != null) ? path.RegisterReaders[30].Cfg.Name : null; - if (Program.WMsCount >= 32) Sensor32 = (path.RegisterReaders[31] != null) ? path.RegisterReaders[31].Cfg.Name : null; - if (Program.WMsCount >= 33) Sensor33 = (path.RegisterReaders[32] != null) ? path.RegisterReaders[32].Cfg.Name : null; - if (Program.WMsCount >= 34) Sensor34 = (path.RegisterReaders[33] != null) ? path.RegisterReaders[33].Cfg.Name : null; - if (Program.WMsCount >= 35) Sensor35 = (path.RegisterReaders[34] != null) ? path.RegisterReaders[34].Cfg.Name : null; - if (Program.WMsCount >= 36) Sensor36 = (path.RegisterReaders[35] != null) ? path.RegisterReaders[35].Cfg.Name : null; - if (Program.WMsCount >= 37) Sensor37 = (path.RegisterReaders[36] != null) ? path.RegisterReaders[36].Cfg.Name : null; - if (Program.WMsCount >= 38) Sensor38 = (path.RegisterReaders[37] != null) ? path.RegisterReaders[37].Cfg.Name : null; - if (Program.WMsCount >= 39) Sensor39 = (path.RegisterReaders[38] != null) ? path.RegisterReaders[38].Cfg.Name : null; - if (Program.WMsCount >= 40) Sensor40 = (path.RegisterReaders[39] != null) ? path.RegisterReaders[39].Cfg.Name : null; -#endif -#pragma warning restore - } - public virtual MetersPath Clone(string name, int itemNr) { MetersPath result = new MetersPath(name, itemNr); diff --git a/TestBenchFramework/Entities/OutputPath.cs b/Config/Entities/OutputPath.cs similarity index 62% rename from TestBenchFramework/Entities/OutputPath.cs rename to Config/Entities/OutputPath.cs index dfb10ed3d..e2e635463 100644 --- a/TestBenchFramework/Entities/OutputPath.cs +++ b/Config/Entities/OutputPath.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class OutputPath : IHasItemNr, IHasValves { @@ -30,6 +30,8 @@ namespace TBF.Entities public OutputPath() { + ValvesOpen = string.Empty; + ValvesClose = string.Empty; } public OutputPath(string name, int itemNr) @@ -39,37 +41,6 @@ namespace TBF.Entities ItemNr = itemNr; } - public OutputPath(BenchControl.OutputPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - RegulValve = (path.RegulValve != null) ? path.RegulValve.Cfg.Name : null; - FlowMeter = (path.FlowMeter != null) ? path.FlowMeter.Cfg.Name : null; - PidCoef = path.PidCoef; - StartValve = (path.StartValve != null) ? path.StartValve.Cfg.Name : null; - Diverter = (path.Diverter != null) ? path.Diverter.Cfg.Name : null; - TempDiv = (path.TempDiv != null) ? path.TempDiv.Cfg.Name : null; - Balance = (path.Balance != null) ? path.Balance.Cfg.Name : null; - EmptyTankValve = (path.EmptyTankValve != null) ? path.EmptyTankValve.Cfg.Name : null; - - string vOpen = string.Empty; - foreach (var valve in path.ValvesOpen) - { - if (vOpen != string.Empty) vOpen += ";"; - vOpen += valve.Cfg.Name; - } - ValvesOpen = vOpen; - - string vClose = string.Empty; - foreach (var valve in path.ValvesClose) - { - if (vClose != string.Empty) vClose += ";"; - vClose += valve.Cfg.Name; - } - ValvesClose = vClose; - } - public virtual OutputPath Clone(string name, int itemNr) { OutputPath result = new OutputPath(name, itemNr); diff --git a/TestBenchFramework/Entities/Procedure.cs b/Config/Entities/Procedure.cs similarity index 98% rename from TestBenchFramework/Entities/Procedure.cs rename to Config/Entities/Procedure.cs index e476405e9..e72f6876b 100644 --- a/TestBenchFramework/Entities/Procedure.cs +++ b/Config/Entities/Procedure.cs @@ -3,9 +3,8 @@ /// using System; using System.Collections.Generic; -using TBF.Resources; -namespace TBF.Entities +namespace Config.Entities { /// /// Stores one test procedure, supports revisions and history log diff --git a/TestBenchFramework/Entities/ProcedureHistory.cs b/Config/Entities/ProcedureHistory.cs similarity index 97% rename from TestBenchFramework/Entities/ProcedureHistory.cs rename to Config/Entities/ProcedureHistory.cs index 46d43a656..8c9a98caf 100644 --- a/TestBenchFramework/Entities/ProcedureHistory.cs +++ b/Config/Entities/ProcedureHistory.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class ProcedureHistory { diff --git a/TestBenchFramework/Entities/Test.cs b/Config/Entities/Test.cs similarity index 99% rename from TestBenchFramework/Entities/Test.cs rename to Config/Entities/Test.cs index bf249e111..5a1c705cb 100644 --- a/TestBenchFramework/Entities/Test.cs +++ b/Config/Entities/Test.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { /// /// Test, consisting of one or more repetitions of the test 'SingleTest'. diff --git a/TestBenchFramework/Entities/TestResult.cs b/Config/Entities/TestResult.cs similarity index 96% rename from TestBenchFramework/Entities/TestResult.cs rename to Config/Entities/TestResult.cs index 60f0143d9..af8a6f957 100644 --- a/TestBenchFramework/Entities/TestResult.cs +++ b/Config/Entities/TestResult.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class TestResult { @@ -113,12 +113,12 @@ namespace TBF.Entities if (kind == MetersKind.Single) { - for (int i = 0; i < Program.WMsCount; i++) Meters.Add(new MeterTestResult(this)); + for (int i = 0; i < Config.Data.WMsCount; i++) Meters.Add(new MeterTestResult(this)); } else if (kind == MetersKind.Combined) { - for (int i = 0; i < 2 * Program.CompoundWMsCount; i++) Meters.Add(new MeterTestResult(this)); - for (int i = 0; i < Program.CompoundWMsCount; i++) CombinedMeters.Add(new MeterTestResult(this)); + for (int i = 0; i < 2 * Config.Data.CompoundWMsCount; i++) Meters.Add(new MeterTestResult(this)); + for (int i = 0; i < Config.Data.CompoundWMsCount; i++) CombinedMeters.Add(new MeterTestResult(this)); } } diff --git a/TestBenchFramework/Entities/TransitionSequence.cs b/Config/Entities/TransitionSequence.cs similarity index 97% rename from TestBenchFramework/Entities/TransitionSequence.cs rename to Config/Entities/TransitionSequence.cs index 1369bb662..8bb47d18d 100644 --- a/TestBenchFramework/Entities/TransitionSequence.cs +++ b/Config/Entities/TransitionSequence.cs @@ -3,7 +3,7 @@ /// using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { /// /// Stores one transition sequence containing a list of transition steps diff --git a/TestBenchFramework/Entities/TransitionStep.cs b/Config/Entities/TransitionStep.cs similarity index 98% rename from TestBenchFramework/Entities/TransitionStep.cs rename to Config/Entities/TransitionStep.cs index 9400ac967..68c90d615 100644 --- a/TestBenchFramework/Entities/TransitionStep.cs +++ b/Config/Entities/TransitionStep.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class TransitionStep : IHasItemNr, IHasValves { diff --git a/TestBenchFramework/Entities/User.cs b/Config/Entities/User.cs similarity index 99% rename from TestBenchFramework/Entities/User.cs rename to Config/Entities/User.cs index f5dc50619..71ea49a19 100644 --- a/TestBenchFramework/Entities/User.cs +++ b/Config/Entities/User.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Security.Cryptography; using System.Text; using System.Diagnostics; -using TBF.Resources; +using Config.Resources; -namespace TBF.Entities +namespace Config.Entities { public class User { @@ -123,7 +123,7 @@ namespace TBF.Entities /// /// /// true = authorized - public virtual bool Authorize(string userName, string password, TBF.Grp.GID requiredGroupMembership) + public virtual bool Authorize(string userName, string password, Grp.GID requiredGroupMembership) { if (Entities.User.IsPowerUser(userName, password)) { diff --git a/TestBenchFramework/Entities/VirtualBenchSequence.cs b/Config/Entities/VirtualBenchSequence.cs similarity index 97% rename from TestBenchFramework/Entities/VirtualBenchSequence.cs rename to Config/Entities/VirtualBenchSequence.cs index ef47304e0..ef8278555 100644 --- a/TestBenchFramework/Entities/VirtualBenchSequence.cs +++ b/Config/Entities/VirtualBenchSequence.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class VirtualBenchSequence : IHasItemNr { diff --git a/TestBenchFramework/Entities/VirtualBenchStep.cs b/Config/Entities/VirtualBenchStep.cs similarity index 97% rename from TestBenchFramework/Entities/VirtualBenchStep.cs rename to Config/Entities/VirtualBenchStep.cs index f7722c530..8e850edaa 100644 --- a/TestBenchFramework/Entities/VirtualBenchStep.cs +++ b/Config/Entities/VirtualBenchStep.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace TBF.Entities +namespace Config.Entities { public class VirtualBenchStep : IHasItemNr { diff --git a/TestBenchFramework/Entities/WMType.cs b/Config/Entities/WMType.cs similarity index 99% rename from TestBenchFramework/Entities/WMType.cs rename to Config/Entities/WMType.cs index e40e7c401..f5f644b3f 100644 --- a/TestBenchFramework/Entities/WMType.cs +++ b/Config/Entities/WMType.cs @@ -9,7 +9,7 @@ using System.Text; /// This class holds the watermeter type specific data /// that have all watermaters of the same type in common -namespace TBF.Entities +namespace Config.Entities { public class WMType { diff --git a/TestBenchFramework/Entities/Watermeter.cs b/Config/Entities/Watermeter.cs similarity index 97% rename from TestBenchFramework/Entities/Watermeter.cs rename to Config/Entities/Watermeter.cs index 1b6a9666c..22b377f0c 100644 --- a/TestBenchFramework/Entities/Watermeter.cs +++ b/Config/Entities/Watermeter.cs @@ -6,11 +6,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using TBF; using NHibernate; using FluentNHibernate; -namespace TBF.Entities +namespace Config.Entities { public class Watermeter { diff --git a/TestBenchFramework/FluentCommon.cs b/Config/FluentCommon.cs similarity index 82% rename from TestBenchFramework/FluentCommon.cs rename to Config/FluentCommon.cs index 358a3446d..68c756d9c 100644 --- a/TestBenchFramework/FluentCommon.cs +++ b/Config/FluentCommon.cs @@ -7,9 +7,9 @@ using FluentNHibernate.Cfg.Db; using NHibernate; using NHibernate.Cfg; using NHibernate.Tool.hbm2ddl; -using TBF.Resources; +using Config.Resources; -namespace TBF +namespace Config { /// /// Identifies the content of a database @@ -54,20 +54,20 @@ namespace TBF { default: case Database.Users: - dbType = Program.CurrentBench.UsersDBSettings.DbType; - connectionString = Program.CurrentBench.UsersDBSettings.ConnectionString; + dbType = Data.CurrentBench.UsersDBSettings.DbType; + connectionString = Data.CurrentBench.UsersDBSettings.ConnectionString; break; case Database.Bench: - dbType = Program.CurrentBench.BenchDBSettings.DbType; - connectionString = Program.CurrentBench.BenchDBSettings.ConnectionString; + dbType = Data.CurrentBench.BenchDBSettings.DbType; + connectionString = Data.CurrentBench.BenchDBSettings.ConnectionString; break; case Database.Procedures: - dbType = Program.CurrentBench.ProceduresDBSettings.DbType; - connectionString = Program.CurrentBench.ProceduresDBSettings.ConnectionString; + dbType = Data.CurrentBench.ProceduresDBSettings.DbType; + connectionString = Data.CurrentBench.ProceduresDBSettings.ConnectionString; break; case Database.WaterMeters: - dbType = Program.CurrentBench.WaterMetersDBSettings.DbType; - connectionString = Program.CurrentBench.WaterMetersDBSettings.ConnectionString; + dbType = Data.CurrentBench.WaterMetersDBSettings.DbType; + connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString; break; } @@ -99,16 +99,16 @@ namespace TBF { default: case Database.Users: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); + cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); break; case Database.Bench: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); + cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); break; case Database.Procedures: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); + cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); break; case Database.WaterMeters: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); + cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); break; } @@ -205,22 +205,22 @@ namespace TBF /// /// Prepare all groups /// - var testers = new Entities.Group { Gid = (int)TBF.Grp.GID.Testers, Name = Strings.Tester }; - var testingSpecialists = new Entities.Group { Gid = (int)TBF.Grp.GID.TestingSpecialists, Name = Strings.Testing_Specialist }; - var headOfLab = new Entities.Group { Gid = (int)TBF.Grp.GID.HeadOfLab, Name = Strings.Head_of_Lab }; - var maintenanceSpecialists = new Entities.Group { Gid = (int)TBF.Grp.GID.MaintenanceSpecialists, Name = Strings.Maintenance_Specialist }; - var metrologists = new Entities.Group { Gid = (int)TBF.Grp.GID.Metrologists, Name = Strings.Metrologist }; - var calibrationSpecialists = new Entities.Group { Gid = (int)TBF.Grp.GID.CalibrationSpecialists, Name = Strings.Calibration_Specialist }; - var administrators = new Entities.Group { Gid = (int)TBF.Grp.GID.Administrators, Name = Strings.Administrator }; + var testers = new Entities.Group { Gid = (int)Grp.GID.Testers, Name = Strings.Tester }; + var testingSpecialists = new Entities.Group { Gid = (int)Grp.GID.TestingSpecialists, Name = Strings.Testing_Specialist }; + var headOfLab = new Entities.Group { Gid = (int)Grp.GID.HeadOfLab, Name = Strings.Head_of_Lab }; + var maintenanceSpecialists = new Entities.Group { Gid = (int)Grp.GID.MaintenanceSpecialists, Name = Strings.Maintenance_Specialist }; + var metrologists = new Entities.Group { Gid = (int)Grp.GID.Metrologists, Name = Strings.Metrologist }; + var calibrationSpecialists = new Entities.Group { Gid = (int)Grp.GID.CalibrationSpecialists, Name = Strings.Calibration_Specialist }; + var administrators = new Entities.Group { Gid = (int)Grp.GID.Administrators, Name = Strings.Administrator }; /// Create the user 'admin' add his groups var admin = new Entities.User { - Name = Program.AdminUsername, + Name = Data.AdminUsername, Description = "Administrator", LastPwChange = DateTime.Now }; - admin.SetPassword(Program.AdminPassword); + admin.SetPassword(Data.AdminPassword); admin.AddGroup(testers); admin.AddGroup(testingSpecialists); admin.AddGroup(headOfLab); @@ -231,9 +231,9 @@ namespace TBF session.SaveOrUpdate(admin); - /// Create the control board component - var cmpnt = (new BenchControl.Elde.ControlBoardCfg(new BenchControl.Elde.ControlBoardFactory())).CreateDbEntity(); - session.SaveOrUpdate(cmpnt); + ///// Create the control board component + //var cmpnt = (new BenchControl.Elde.ControlBoardCfg(new BenchControl.Elde.ControlBoardFactory())).CreateDbEntity(); + //session.SaveOrUpdate(cmpnt); transaction.Commit(); } diff --git a/TestBenchFramework/Grp.cs b/Config/Grp.cs similarity index 98% rename from TestBenchFramework/Grp.cs rename to Config/Grp.cs index 73ba8c422..d64e07876 100644 --- a/TestBenchFramework/Grp.cs +++ b/Config/Grp.cs @@ -5,11 +5,11 @@ using System; using System.Collections.Generic; using System.Text; -using TBF.Entities; +using Config.Entities; using NHibernate; using FluentNHibernate; -namespace TBF +namespace Config { /// /// Enum Grp.GID specifies GID-s of user groups. diff --git a/TestBenchFramework/Mappings/BenchPathMap.cs b/Config/Mappings/BenchPathMap.cs similarity index 92% rename from TestBenchFramework/Mappings/BenchPathMap.cs rename to Config/Mappings/BenchPathMap.cs index c25d57f27..7e2906c18 100644 --- a/TestBenchFramework/Mappings/BenchPathMap.cs +++ b/Config/Mappings/BenchPathMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class BenchPathMap : ClassMap { diff --git a/TestBenchFramework/Mappings/ComponentMap.cs b/Config/Mappings/ComponentMap.cs similarity index 92% rename from TestBenchFramework/Mappings/ComponentMap.cs rename to Config/Mappings/ComponentMap.cs index cc58a88a8..5a7170dc9 100644 --- a/TestBenchFramework/Mappings/ComponentMap.cs +++ b/Config/Mappings/ComponentMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class ComponentMap : ClassMap { diff --git a/TestBenchFramework/Mappings/ComponentProcedureMap.cs b/Config/Mappings/ComponentProcedureMap.cs similarity index 88% rename from TestBenchFramework/Mappings/ComponentProcedureMap.cs rename to Config/Mappings/ComponentProcedureMap.cs index 8c34240f9..107d8a287 100644 --- a/TestBenchFramework/Mappings/ComponentProcedureMap.cs +++ b/Config/Mappings/ComponentProcedureMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class ComponentProcedureMap : ClassMap { diff --git a/TestBenchFramework/Mappings/ComponentTestMap.cs b/Config/Mappings/ComponentTestMap.cs similarity index 87% rename from TestBenchFramework/Mappings/ComponentTestMap.cs rename to Config/Mappings/ComponentTestMap.cs index 598b6af4b..00c4ab36b 100644 --- a/TestBenchFramework/Mappings/ComponentTestMap.cs +++ b/Config/Mappings/ComponentTestMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class ComponentTestMap : ClassMap { diff --git a/TestBenchFramework/Mappings/FeedingPathMap.cs b/Config/Mappings/FeedingPathMap.cs similarity index 91% rename from TestBenchFramework/Mappings/FeedingPathMap.cs rename to Config/Mappings/FeedingPathMap.cs index 7edeec4db..78d1b61d7 100644 --- a/TestBenchFramework/Mappings/FeedingPathMap.cs +++ b/Config/Mappings/FeedingPathMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class FeedingPathMap : ClassMap { diff --git a/TestBenchFramework/Mappings/GroupMap.cs b/Config/Mappings/GroupMap.cs similarity index 91% rename from TestBenchFramework/Mappings/GroupMap.cs rename to Config/Mappings/GroupMap.cs index cf79959be..2e0ada877 100644 --- a/TestBenchFramework/Mappings/GroupMap.cs +++ b/Config/Mappings/GroupMap.cs @@ -3,7 +3,7 @@ /// using FluentNHibernate.Mapping; -namespace TBF.Mappings +namespace Config.Mappings { class GroupMap : ClassMap { diff --git a/TestBenchFramework/Mappings/MeasurementCorrectionMap.cs b/Config/Mappings/MeasurementCorrectionMap.cs similarity index 85% rename from TestBenchFramework/Mappings/MeasurementCorrectionMap.cs rename to Config/Mappings/MeasurementCorrectionMap.cs index 4f3f0af93..bcf27da2f 100644 --- a/TestBenchFramework/Mappings/MeasurementCorrectionMap.cs +++ b/Config/Mappings/MeasurementCorrectionMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class MeasurementCorrectionMap : ClassMap { diff --git a/TestBenchFramework/Mappings/MeterTestResultMap.cs b/Config/Mappings/MeterTestResultMap.cs similarity index 93% rename from TestBenchFramework/Mappings/MeterTestResultMap.cs rename to Config/Mappings/MeterTestResultMap.cs index 5459d69a5..645976eb7 100644 --- a/TestBenchFramework/Mappings/MeterTestResultMap.cs +++ b/Config/Mappings/MeterTestResultMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class MeterTestResultMap : ClassMap { diff --git a/Config/Mappings/MetersPathMap.cs b/Config/Mappings/MetersPathMap.cs new file mode 100644 index 000000000..555998fb2 --- /dev/null +++ b/Config/Mappings/MetersPathMap.cs @@ -0,0 +1,64 @@ +/// +/// Copyright (c) 2013-2015 Sensus Metering Systems +/// +using FluentNHibernate.Mapping; +using Config.Entities; + +namespace Config.Mappings +{ + class MetersPathMap : ClassMap + { + public MetersPathMap() + { + Id(x => x.Id); + Map(x => x.ItemNr); + Map(x => x.Name); + Map(x => x.Qfrom); + Map(x => x.Qto); + Map(x => x.Sensor1); +#pragma warning disable + if (Config.Data.WMsCount >= 2) Map(x => x.Sensor2); + if (Config.Data.WMsCount >= 3) Map(x => x.Sensor3); + if (Config.Data.WMsCount >= 4) Map(x => x.Sensor4); + if (Config.Data.WMsCount >= 5) Map(x => x.Sensor5); + if (Config.Data.WMsCount >= 6) Map(x => x.Sensor6); + if (Config.Data.WMsCount >= 7) Map(x => x.Sensor7); + if (Config.Data.WMsCount >= 8) Map(x => x.Sensor8); + if (Config.Data.WMsCount >= 9) Map(x => x.Sensor9); + if (Config.Data.WMsCount >= 10) Map(x => x.Sensor10); + if (Config.Data.WMsCount >= 11) Map(x => x.Sensor11); + if (Config.Data.WMsCount >= 12) Map(x => x.Sensor12); + if (Config.Data.WMsCount >= 13) Map(x => x.Sensor13); + if (Config.Data.WMsCount >= 14) Map(x => x.Sensor14); + if (Config.Data.WMsCount >= 15) Map(x => x.Sensor15); + if (Config.Data.WMsCount >= 16) Map(x => x.Sensor16); + if (Config.Data.WMsCount >= 17) Map(x => x.Sensor17); + if (Config.Data.WMsCount >= 18) Map(x => x.Sensor18); + if (Config.Data.WMsCount >= 19) Map(x => x.Sensor19); + if (Config.Data.WMsCount >= 20) Map(x => x.Sensor20); +#if IPERLST + if (Config.Data.WMsCount >= 21) Map(x => x.Sensor21); + if (Config.Data.WMsCount >= 22) Map(x => x.Sensor22); + if (Config.Data.WMsCount >= 23) Map(x => x.Sensor23); + if (Config.Data.WMsCount >= 24) Map(x => x.Sensor24); + if (Config.Data.WMsCount >= 25) Map(x => x.Sensor25); + if (Config.Data.WMsCount >= 26) Map(x => x.Sensor26); + if (Config.Data.WMsCount >= 27) Map(x => x.Sensor27); + if (Config.Data.WMsCount >= 28) Map(x => x.Sensor28); + if (Config.Data.WMsCount >= 29) Map(x => x.Sensor29); + if (Config.Data.WMsCount >= 30) Map(x => x.Sensor30); + if (Config.Data.WMsCount >= 31) Map(x => x.Sensor31); + if (Config.Data.WMsCount >= 32) Map(x => x.Sensor32); + if (Config.Data.WMsCount >= 33) Map(x => x.Sensor33); + if (Config.Data.WMsCount >= 34) Map(x => x.Sensor34); + if (Config.Data.WMsCount >= 35) Map(x => x.Sensor35); + if (Config.Data.WMsCount >= 36) Map(x => x.Sensor36); + if (Config.Data.WMsCount >= 37) Map(x => x.Sensor37); + if (Config.Data.WMsCount >= 38) Map(x => x.Sensor38); + if (Config.Data.WMsCount >= 39) Map(x => x.Sensor39); + if (Config.Data.WMsCount >= 40) Map(x => x.Sensor40); +#endif +#pragma warning restore + } + } +} diff --git a/TestBenchFramework/Mappings/OutputPathMap.cs b/Config/Mappings/OutputPathMap.cs similarity index 93% rename from TestBenchFramework/Mappings/OutputPathMap.cs rename to Config/Mappings/OutputPathMap.cs index a8b0e1436..4f7bdf250 100644 --- a/TestBenchFramework/Mappings/OutputPathMap.cs +++ b/Config/Mappings/OutputPathMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class OutputPathMap : ClassMap { diff --git a/TestBenchFramework/Mappings/ProcedureMap.cs b/Config/Mappings/ProcedureMap.cs similarity index 95% rename from TestBenchFramework/Mappings/ProcedureMap.cs rename to Config/Mappings/ProcedureMap.cs index e3720d738..539f6fa74 100644 --- a/TestBenchFramework/Mappings/ProcedureMap.cs +++ b/Config/Mappings/ProcedureMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class ProcedureMap : ClassMap { diff --git a/TestBenchFramework/Mappings/TestMap.cs b/Config/Mappings/TestMap.cs similarity index 95% rename from TestBenchFramework/Mappings/TestMap.cs rename to Config/Mappings/TestMap.cs index 37e7ef079..87cedb80f 100644 --- a/TestBenchFramework/Mappings/TestMap.cs +++ b/Config/Mappings/TestMap.cs @@ -3,9 +3,9 @@ /// Author: Milan Hanajik /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class TestMap : ClassMap { diff --git a/TestBenchFramework/Mappings/TestResultMap.cs b/Config/Mappings/TestResultMap.cs similarity index 98% rename from TestBenchFramework/Mappings/TestResultMap.cs rename to Config/Mappings/TestResultMap.cs index 24647f45e..f249c651b 100644 --- a/TestBenchFramework/Mappings/TestResultMap.cs +++ b/Config/Mappings/TestResultMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class TestResultMap : ClassMap { diff --git a/TestBenchFramework/Mappings/TransitionSequenceMap.cs b/Config/Mappings/TransitionSequenceMap.cs similarity index 89% rename from TestBenchFramework/Mappings/TransitionSequenceMap.cs rename to Config/Mappings/TransitionSequenceMap.cs index 02f6889e0..f270209d9 100644 --- a/TestBenchFramework/Mappings/TransitionSequenceMap.cs +++ b/Config/Mappings/TransitionSequenceMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class TransitionSequenceMap : ClassMap { diff --git a/TestBenchFramework/Mappings/TransitionStepMap.cs b/Config/Mappings/TransitionStepMap.cs similarity index 92% rename from TestBenchFramework/Mappings/TransitionStepMap.cs rename to Config/Mappings/TransitionStepMap.cs index 2d573ebb7..08196e713 100644 --- a/TestBenchFramework/Mappings/TransitionStepMap.cs +++ b/Config/Mappings/TransitionStepMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class TransitionStepMap : ClassMap { diff --git a/TestBenchFramework/Mappings/UserMap.cs b/Config/Mappings/UserMap.cs similarity index 94% rename from TestBenchFramework/Mappings/UserMap.cs rename to Config/Mappings/UserMap.cs index 47d349c9c..ff8bf29ab 100644 --- a/TestBenchFramework/Mappings/UserMap.cs +++ b/Config/Mappings/UserMap.cs @@ -3,7 +3,7 @@ /// using FluentNHibernate.Mapping; -namespace TBF.Mappings +namespace Config.Mappings { class UserMap : ClassMap { diff --git a/TestBenchFramework/Mappings/VirtualBenchSequenceMap.cs b/Config/Mappings/VirtualBenchSequenceMap.cs similarity index 89% rename from TestBenchFramework/Mappings/VirtualBenchSequenceMap.cs rename to Config/Mappings/VirtualBenchSequenceMap.cs index fd0bb7b5c..2a0022504 100644 --- a/TestBenchFramework/Mappings/VirtualBenchSequenceMap.cs +++ b/Config/Mappings/VirtualBenchSequenceMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class VirtualBenchSequenceMap : ClassMap { diff --git a/TestBenchFramework/Mappings/VirtualBenchStepMap.cs b/Config/Mappings/VirtualBenchStepMap.cs similarity index 87% rename from TestBenchFramework/Mappings/VirtualBenchStepMap.cs rename to Config/Mappings/VirtualBenchStepMap.cs index f88b98660..bf4e7d657 100644 --- a/TestBenchFramework/Mappings/VirtualBenchStepMap.cs +++ b/Config/Mappings/VirtualBenchStepMap.cs @@ -2,9 +2,9 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using FluentNHibernate.Mapping; -using TBF.Entities; +using Config.Entities; -namespace TBF.Mappings +namespace Config.Mappings { class VirtualBenchStepMap : ClassMap { diff --git a/TestBenchFramework/Mappings/WMTypeMap.cs b/Config/Mappings/WMTypeMap.cs similarity index 94% rename from TestBenchFramework/Mappings/WMTypeMap.cs rename to Config/Mappings/WMTypeMap.cs index 2f057641b..58173a51c 100644 --- a/TestBenchFramework/Mappings/WMTypeMap.cs +++ b/Config/Mappings/WMTypeMap.cs @@ -3,7 +3,7 @@ /// using FluentNHibernate.Mapping; -namespace TBF.Mappings +namespace Config.Mappings { class WMTypeMap : ClassMap { diff --git a/TestBenchFramework/Mappings/WatermeterMap.cs b/Config/Mappings/WatermeterMap.cs similarity index 93% rename from TestBenchFramework/Mappings/WatermeterMap.cs rename to Config/Mappings/WatermeterMap.cs index b77134c3a..035533735 100644 --- a/TestBenchFramework/Mappings/WatermeterMap.cs +++ b/Config/Mappings/WatermeterMap.cs @@ -3,7 +3,7 @@ /// using FluentNHibernate.Mapping; -namespace TBF.Mappings +namespace Config.Mappings { class WatermeterMap : ClassMap { diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..b64071481 --- /dev/null +++ b/Config/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Config")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Config")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("3fc3ff67-7386-4aff-9855-bef33d5fa0d3")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Config/Resources/Strings.Designer.cs b/Config/Resources/Strings.Designer.cs new file mode 100644 index 000000000..7f8895db7 --- /dev/null +++ b/Config/Resources/Strings.Designer.cs @@ -0,0 +1,3168 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.34209 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Config.Resources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Strings { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Strings() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TBF.Resources.Strings", typeof(Strings).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to <none>. + /// + internal static string _none_ { + get { + return ResourceManager.GetString("_none_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (offline). + /// + internal static string _offline { + get { + return ResourceManager.GetString("_offline", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to About Test Bench Framework. + /// + internal static string About_Test_Bench_Framework { + get { + return ResourceManager.GetString("About_Test_Bench_Framework", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Activity. + /// + internal static string Activity { + get { + return ResourceManager.GetString("Activity", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to &Add >. + /// + internal static string Add { + get { + return ResourceManager.GetString("Add", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add. + /// + internal static string AddBtnText { + get { + return ResourceManager.GetString("AddBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Address. + /// + internal static string Address { + get { + return ResourceManager.GetString("Address", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Adjustment in progress. + /// + internal static string Adjustment_in_progress { + get { + return ResourceManager.GetString("Adjustment_in_progress", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Administrator. + /// + internal static string Administrator { + get { + return ResourceManager.GetString("Administrator", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ambient humidity: . + /// + internal static string Ambient_humidity_ { + get { + return ResourceManager.GetString("Ambient_humidity_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ambient pressure: . + /// + internal static string Ambient_pressure_ { + get { + return ResourceManager.GetString("Ambient_pressure_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ambient temperature: . + /// + internal static string Ambient_temperature_ { + get { + return ResourceManager.GetString("Ambient_temperature_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to An unhandled error occured. + /// + internal static string An_unhandled_error_occured { + get { + return ResourceManager.GetString("An_unhandled_error_occured", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Approval: . + /// + internal static string Approval_ { + get { + return ResourceManager.GetString("Approval_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Approval date. + /// + internal static string Approval_date { + get { + return ResourceManager.GetString("Approval_date", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Approval ID. + /// + internal static string Approval_ID { + get { + return ResourceManager.GetString("Approval_ID", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Approval info.. + /// + internal static string Approval_info { + get { + return ResourceManager.GetString("Approval_info", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Approved by. + /// + internal static string Approved_by { + get { + return ResourceManager.GetString("Approved_by", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Arrangements of tested meters. + /// + internal static string Arrangement_of_meters { + get { + return ResourceManager.GetString("Arrangement_of_meters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Arrangement of tests. + /// + internal static string Arrangement_of_tests { + get { + return ResourceManager.GetString("Arrangement_of_tests", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to @temperature [degC]. + /// + internal static string AtTemperature_C { + get { + return ResourceManager.GetString("AtTemperature_C", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Aux:. + /// + internal static string Aux_ { + get { + return ResourceManager.GetString("Aux_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Aux Water Meter. + /// + internal static string Aux_Water_Meter { + get { + return ResourceManager.GetString("Aux_Water_Meter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Aux. WM State. + /// + internal static string Aux_Water_Meter_State { + get { + return ResourceManager.GetString("Aux_Water_Meter_State", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Aux. WM Serial Nr.. + /// + internal static string Aux_WM_SerialNr { + get { + return ResourceManager.GetString("Aux_WM_SerialNr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Available Components:. + /// + internal static string Available_Components_ { + get { + return ResourceManager.GetString("Available_Components_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Available results:. + /// + internal static string Available_results { + get { + return ResourceManager.GetString("Available_results", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to < Back. + /// + internal static string BackBtnText { + get { + return ResourceManager.GetString("BackBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Balance. + /// + internal static string Balance { + get { + return ResourceManager.GetString("Balance", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bench. + /// + internal static string Bench_chdr { + get { + return ResourceManager.GetString("Bench_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench is not running, however you can change the settings to resolve the problem.. + /// + internal static string Bench_is_not_running { + get { + return ResourceManager.GetString("Bench_is_not_running", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench name conflict, use another name please. + /// + internal static string Bench_name_conflict_Use_another_name_pls { + get { + return ResourceManager.GetString("Bench_name_conflict_Use_another_name_pls", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bench parameters. + /// + internal static string Bench_parameters { + get { + return ResourceManager.GetString("Bench_parameters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Build date _BUILD_DATE_. + /// + internal static string BuildDateStr { + get { + return ResourceManager.GetString("BuildDateStr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Calibration Specialist. + /// + internal static string Calibration_Specialist { + get { + return ResourceManager.GetString("Calibration_Specialist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Camera error. + /// + internal static string Camera_error { + get { + return ResourceManager.GetString("Camera_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cancel. + /// + internal static string CancelBtnText { + get { + return ResourceManager.GetString("CancelBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Changes will be lost. Do you want to proceed?. + /// + internal static string Changes_will_be_lost_Do_you_want_to_proceed { + get { + return ResourceManager.GetString("Changes_will_be_lost_Do_you_want_to_proceed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Clear results. + /// + internal static string Clear_results { + get { + return ResourceManager.GetString("Clear_results", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Clear. + /// + internal static string ClearBtnText { + get { + return ResourceManager.GetString("ClearBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to close. + /// + internal static string close { + get { + return ResourceManager.GetString("close", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Close emptying valve. + /// + internal static string Close_emptying_valve { + get { + return ResourceManager.GetString("Close_emptying_valve", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Close. + /// + internal static string CloseBtnText { + get { + return ResourceManager.GetString("CloseBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Closing input valve, switching the pump off. + /// + internal static string Closing_valve_Pump_off { + get { + return ResourceManager.GetString("Closing_valve_Pump_off", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to cold. + /// + internal static string cold { + get { + return ResourceManager.GetString("cold", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Combined meters. + /// + internal static string Combined_meters { + get { + return ResourceManager.GetString("Combined_meters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Combined. + /// + internal static string CombinedBtnText { + get { + return ResourceManager.GetString("CombinedBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Communication. + /// + internal static string Communication { + get { + return ResourceManager.GetString("Communication", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Component. + /// + internal static string Component { + get { + return ResourceManager.GetString("Component", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Configuration. + /// + internal static string Configuration { + get { + return ResourceManager.GetString("Configuration", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Configure. + /// + internal static string Configure { + get { + return ResourceManager.GetString("Configure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Configure test benches (password required). + /// + internal static string ConfigureDatabaseText { + get { + return ResourceManager.GetString("ConfigureDatabaseText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirmation. + /// + internal static string Confirmation { + get { + return ResourceManager.GetString("Confirmation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Connection string. + /// + internal static string Connection_string { + get { + return ResourceManager.GetString("Connection_string", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Copy. + /// + internal static string CopyBtnText { + get { + return ResourceManager.GetString("CopyBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Copyright © 2013 - {0}. + /// + internal static string CopyrightStr { + get { + return ResourceManager.GetString("CopyrightStr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Corrected. + /// + internal static string Corrected { + get { + return ResourceManager.GetString("Corrected", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Correction [g]. + /// + internal static string Correction_g { + get { + return ResourceManager.GetString("Correction_g", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Correction [l/h]. + /// + internal static string Correction_lph { + get { + return ResourceManager.GetString("Correction_lph", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Correction [mbar]. + /// + internal static string Correction_mbar { + get { + return ResourceManager.GetString("Correction_mbar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Create DB. + /// + internal static string Create_DB { + get { + return ResourceManager.GetString("Create_DB", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Data. + /// + internal static string Data { + get { + return ResourceManager.GetString("Data", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Database Settings. + /// + internal static string Database_Settings { + get { + return ResourceManager.GetString("Database_Settings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Database type. + /// + internal static string Database_type { + get { + return ResourceManager.GetString("Database_type", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Date and time: . + /// + internal static string Date_and_time_ { + get { + return ResourceManager.GetString("Date_and_time_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The database was successfully created!. + /// + internal static string DB_was_successfully_created { + get { + return ResourceManager.GetString("DB_was_successfully_created", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The database will be overwritten. + /// + internal static string DB_will_be_overwritten { + get { + return ResourceManager.GetString("DB_will_be_overwritten", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Density. + /// + internal static string Density { + get { + return ResourceManager.GetString("Density", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Density [kg/m3]. + /// + internal static string Density_kg_m3 { + get { + return ResourceManager.GetString("Density_kg_m3", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Description. + /// + internal static string DescriptionColHdr { + get { + return ResourceManager.GetString("DescriptionColHdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Detection completed. + /// + internal static string Detection_completed { + get { + return ResourceManager.GetString("Detection_completed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Detection failed. + /// + internal static string Detection_failed { + get { + return ResourceManager.GetString("Detection_failed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Detection threshold [%]. + /// + internal static string DetectionThresholdPct { + get { + return ResourceManager.GetString("DetectionThresholdPct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Device. + /// + internal static string Device { + get { + return ResourceManager.GetString("Device", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to dflt. + /// + internal static string dflt { + get { + return ResourceManager.GetString("dflt", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Diverter. + /// + internal static string Diverter { + get { + return ResourceManager.GetString("Diverter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Do you want to proceed?. + /// + internal static string Do_you_want_to_proceed { + get { + return ResourceManager.GetString("Do_you_want_to_proceed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Do you want to save the procedure?. + /// + internal static string Do_you_want_to_save_the_procedure { + get { + return ResourceManager.GetString("Do_you_want_to_save_the_procedure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Down. + /// + internal static string DownBtnText { + get { + return ResourceManager.GetString("DownBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Leak duration [s]. + /// + internal static string Duration_Leak_s { + get { + return ResourceManager.GetString("Duration_Leak_s", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PMax duration [s]. + /// + internal static string Duration_PMax_s { + get { + return ResourceManager.GetString("Duration_PMax_s", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Duration [s]. + /// + internal static string Duration_s { + get { + return ResourceManager.GetString("Duration_s", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit User. + /// + internal static string Edit_User { + get { + return ResourceManager.GetString("Edit_User", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit. + /// + internal static string EditBtnText { + get { + return ResourceManager.GetString("EditBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Emergency STOP. + /// + internal static string Emergency_STOP { + get { + return ResourceManager.GetString("Emergency_STOP", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Emptying. + /// + internal static string Emptying_chdr { + get { + return ResourceManager.GetString("Emptying_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Emptying ({0}: step {1}/{2}). + /// + internal static string Emptying_i_n { + get { + return ResourceManager.GetString("Emptying_i_n", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Emptying the tank. + /// + internal static string Emptying_tank { + get { + return ResourceManager.GetString("Emptying_tank", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Emptying valve. + /// + internal static string Emptying_valve { + get { + return ResourceManager.GetString("Emptying_valve", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to End. + /// + internal static string End { + get { + return ResourceManager.GetString("End", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to End condition. + /// + internal static string End_Condition { + get { + return ResourceManager.GetString("End_Condition", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to End State. + /// + internal static string End_State { + get { + return ResourceManager.GetString("End_State", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enter password. + /// + internal static string Enter_password { + get { + return ResourceManager.GetString("Enter_password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err. cor. - [%]. + /// + internal static string Err_cor_neg_pct_chdr { + get { + return ResourceManager.GetString("Err_cor_neg_pct_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err. cor. +[%]. + /// + internal static string Err_cor_pos_pct_chdr { + get { + return ResourceManager.GetString("Err_cor_pos_pct_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err. Limit - [%]. + /// + internal static string Err_limit_neg_pct_chdr { + get { + return ResourceManager.GetString("Err_limit_neg_pct_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err. Limit + [%]. + /// + internal static string Err_limit_pos_pct_chdr { + get { + return ResourceManager.GetString("Err_limit_pos_pct_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error. + /// + internal static string Error { + get { + return ResourceManager.GetString("Error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error loading users from the database:. + /// + internal static string Error_loading_users_from_the_database { + get { + return ResourceManager.GetString("Error_loading_users_from_the_database", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error [%]. + /// + internal static string Error_pct { + get { + return ResourceManager.GetString("Error_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error while creating the database. Reason: . + /// + internal static string Error_while_creating_DB_Reason { + get { + return ResourceManager.GetString("Error_while_creating_DB_Reason", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Evaluate. + /// + internal static string Evaluate { + get { + return ResourceManager.GetString("Evaluate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Exit. + /// + internal static string ExitBtnText { + get { + return ResourceManager.GetString("ExitBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to NOK. + /// + internal static string Failed { + get { + return ResourceManager.GetString("Failed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to create a sample database:. + /// + internal static string Failed_to_create_a_sample_database { + get { + return ResourceManager.GetString("Failed_to_create_a_sample_database", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to export the database:. + /// + internal static string Failed_to_export_the_database { + get { + return ResourceManager.GetString("Failed_to_export_the_database", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Feeding. + /// + internal static string Feeding_chdr { + get { + return ResourceManager.GetString("Feeding_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fill the test bench with water?. + /// + internal static string Fill_with_water { + get { + return ResourceManager.GetString("Fill_with_water", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Finish. + /// + internal static string FinishBtnText { + get { + return ResourceManager.GetString("FinishBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Flow [m3/h]. + /// + internal static string Flow_m3h { + get { + return ResourceManager.GetString("Flow_m3h", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Flow Selection. + /// + internal static string Flow_selection { + get { + return ResourceManager.GetString("Flow_selection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Flowmeter. + /// + internal static string Flowmeter { + get { + return ResourceManager.GetString("Flowmeter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Get mass of water in the tank. + /// + internal static string Get_mass_of_water_in_the_tank { + get { + return ResourceManager.GetString("Get_mass_of_water_in_the_tank", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Groups. + /// + internal static string Groups { + get { + return ResourceManager.GetString("Groups", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Head of Lab. + /// + internal static string Head_of_Lab { + get { + return ResourceManager.GetString("Head_of_Lab", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Horizontally. + /// + internal static string Horizontally { + get { + return ResourceManager.GetString("Horizontally", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to hot. + /// + internal static string hot { + get { + return ResourceManager.GetString("hot", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ignore. + /// + internal static string Ignore { + get { + return ResourceManager.GetString("Ignore", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ignore. + /// + internal static string IgnoreBtnText { + get { + return ResourceManager.GetString("IgnoreBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid password. + /// + internal static string Invalid_password { + get { + return ResourceManager.GetString("Invalid_password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid user, password, or bench. + /// + internal static string Invalid_user_password_or_bench { + get { + return ResourceManager.GetString("Invalid_user_password_or_bench", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid username or password. + /// + internal static string Invalid_username_or_password { + get { + return ResourceManager.GetString("Invalid_username_or_password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to iPerl Communication in progress. + /// + internal static string iPerl_Communication_in_progress { + get { + return ResourceManager.GetString("iPerl_Communication_in_progress", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Language. + /// + internal static string Language { + get { + return ResourceManager.GetString("Language", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Less. + /// + internal static string LessBtnText { + get { + return ResourceManager.GetString("LessBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Loading the procedure. + /// + internal static string Loading_the_procedure { + get { + return ResourceManager.GetString("Loading_the_procedure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lock. + /// + internal static string LockBtnText { + get { + return ResourceManager.GetString("LockBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Logging. + /// + internal static string Logging { + get { + return ResourceManager.GetString("Logging", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Main:. + /// + internal static string Main_ { + get { + return ResourceManager.GetString("Main_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Main Water Meter. + /// + internal static string Main_Water_Meter { + get { + return ResourceManager.GetString("Main_Water_Meter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Main WM State. + /// + internal static string Main_Water_Meter_State { + get { + return ResourceManager.GetString("Main_Water_Meter_State", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Main WM Serial Nr.. + /// + internal static string Main_WM_SerialNr { + get { + return ResourceManager.GetString("Main_WM_SerialNr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Maintenance Specialist. + /// + internal static string Maintenance_Specialist { + get { + return ResourceManager.GetString("Maintenance_Specialist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Make tank empty. + /// + internal static string Make_tank_empty { + get { + return ResourceManager.GetString("Make_tank_empty", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Mass [kg]. + /// + internal static string Mass_kg { + get { + return ResourceManager.GetString("Mass_kg", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (max. _X_ alphanumeric characters). + /// + internal static string MaxChars { + get { + return ResourceManager.GetString("MaxChars", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Measure the mass. + /// + internal static string Measure_the_mass { + get { + return ResourceManager.GetString("Measure_the_mass", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Measured. + /// + internal static string Measured { + get { + return ResourceManager.GetString("Measured", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Measuring the weight. + /// + internal static string Measuring_the_weight { + get { + return ResourceManager.GetString("Measuring_the_weight", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Message. + /// + internal static string Message { + get { + return ResourceManager.GetString("Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test method. + /// + internal static string Method_chdr { + get { + return ResourceManager.GetString("Method_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test method selection. + /// + internal static string Method_selection { + get { + return ResourceManager.GetString("Method_selection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Metrological class. + /// + internal static string Metrological_class { + get { + return ResourceManager.GetString("Metrological_class", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Metrologist. + /// + internal static string Metrologist { + get { + return ResourceManager.GetString("Metrologist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Metrology. + /// + internal static string Metrology { + get { + return ResourceManager.GetString("Metrology", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Mode. + /// + internal static string Mode { + get { + return ResourceManager.GetString("Mode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to More. + /// + internal static string MoreBtnText { + get { + return ResourceManager.GetString("MoreBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Name. + /// + internal static string Name { + get { + return ResourceManager.GetString("Name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PBench. + /// + internal static string New_bench_path_name { + get { + return ResourceManager.GetString("New_bench_path_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PFeed. + /// + internal static string New_feeding_path_name { + get { + return ResourceManager.GetString("New_feeding_path_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to - Copy. + /// + internal static string New_name_copy { + get { + return ResourceManager.GetString("New_name_copy", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PQ. + /// + internal static string New_output_path_name { + get { + return ResourceManager.GetString("New_output_path_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Procedure. + /// + internal static string New_procedure_name { + get { + return ResourceManager.GetString("New_procedure_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PSens. + /// + internal static string New_sensors_path_name { + get { + return ResourceManager.GetString("New_sensors_path_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test. + /// + internal static string New_test_name { + get { + return ResourceManager.GetString("New_test_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to New transition name. + /// + internal static string New_transition_name { + get { + return ResourceManager.GetString("New_transition_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to New Tab. + /// + internal static string NewTabBtnText { + get { + return ResourceManager.GetString("NewTabBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Next >. + /// + internal static string NextBtnText { + get { + return ResourceManager.GetString("NextBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to no. + /// + internal static string no { + get { + return ResourceManager.GetString("no", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No test bench in the program configuration.. + /// + internal static string NoBenchMsg { + get { + return ResourceManager.GetString("NoBenchMsg", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No. + /// + internal static string NoBtn { + get { + return ResourceManager.GetString("NoBtn", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot connect to the database.. + /// + internal static string NoDatabaseMsg { + get { + return ResourceManager.GetString("NoDatabaseMsg", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to <nothing to configure>. + /// + internal static string nothing_to_configure { + get { + return ResourceManager.GetString("nothing_to_configure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Notification. + /// + internal static string Notification { + get { + return ResourceManager.GetString("Notification", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Nr.. + /// + internal static string Nr { + get { + return ResourceManager.GetString("Nr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Nr. meters in a group:. + /// + internal static string Nr_meters_in_a_group { + get { + return ResourceManager.GetString("Nr_meters_in_a_group", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to OK. + /// + internal static string OkBtnText { + get { + return ResourceManager.GetString("OkBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to open. + /// + internal static string open { + get { + return ResourceManager.GetString("open", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Output. + /// + internal static string Output_chdr { + get { + return ResourceManager.GetString("Output_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P up. + /// + internal static string P_in { + get { + return ResourceManager.GetString("P_in", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P up end. + /// + internal static string P_in_end { + get { + return ResourceManager.GetString("P_in_end", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P up start. + /// + internal static string P_in_start { + get { + return ResourceManager.GetString("P_in_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P down. + /// + internal static string P_out { + get { + return ResourceManager.GetString("P_out", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P down end. + /// + internal static string P_out_end { + get { + return ResourceManager.GetString("P_out_end", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P down start. + /// + internal static string P_out_start { + get { + return ResourceManager.GetString("P_out_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page. + /// + internal static string Page { + get { + return ResourceManager.GetString("Page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Parameters. + /// + internal static string Parameters { + get { + return ResourceManager.GetString("Parameters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Parent. + /// + internal static string Parent { + get { + return ResourceManager.GetString("Parent", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Part. + /// + internal static string Part { + get { + return ResourceManager.GetString("Part", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to OK. + /// + internal static string Passed { + get { + return ResourceManager.GetString("Passed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Password. + /// + internal static string Password { + get { + return ResourceManager.GetString("Password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PID. + /// + internal static string PID { + get { + return ResourceManager.GetString("PID", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please change the following settings:. + /// + internal static string Please_change_the_following_settings { + get { + return ResourceManager.GetString("Please_change_the_following_settings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please select a cycle, a test or empty. + /// + internal static string Please_select_a_cycle_a_test_or_empty { + get { + return ResourceManager.GetString("Please_select_a_cycle_a_test_or_empty", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please select a procedure. + /// + internal static string Please_select_a_procedure { + get { + return ResourceManager.GetString("Please_select_a_procedure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please select a test. + /// + internal static string Please_select_a_test { + get { + return ResourceManager.GetString("Please_select_a_test", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please, select a test bench. + /// + internal static string PLs_select_testbench { + get { + return ResourceManager.GetString("PLs_select_testbench", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Power [%]. + /// + internal static string PowerPct { + get { + return ResourceManager.GetString("PowerPct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pressure [bar]. + /// + internal static string Pressure_bar { + get { + return ResourceManager.GetString("Pressure_bar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pressure Hi [bar]. + /// + internal static string Pressure_hi_bar { + get { + return ResourceManager.GetString("Pressure_hi_bar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pressure Lo [bar]. + /// + internal static string Pressure_lo_bar { + get { + return ResourceManager.GetString("Pressure_lo_bar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pressure meter. + /// + internal static string Pressure_meter { + get { + return ResourceManager.GetString("Pressure_meter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pressure Selection. + /// + internal static string Pressure_selection { + get { + return ResourceManager.GetString("Pressure_selection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PreasureHi [bar]. + /// + internal static string PressureHi_bar { + get { + return ResourceManager.GetString("PressureHi_bar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PressureLo [bar]. + /// + internal static string PressureLo_bar { + get { + return ResourceManager.GetString("PressureLo_bar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Printer. + /// + internal static string Printer { + get { + return ResourceManager.GetString("Printer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Printer. + /// + internal static string PrinterBtnText { + get { + return ResourceManager.GetString("PrinterBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Procedure. + /// + internal static string Procedure { + get { + return ResourceManager.GetString("Procedure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Procedure: . + /// + internal static string Procedure_ { + get { + return ResourceManager.GetString("Procedure_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Procedure {0} added.. + /// + internal static string Procedure_0_added { + get { + return ResourceManager.GetString("Procedure_0_added", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Procedure {0} modified.. + /// + internal static string Procedure_0_modified { + get { + return ResourceManager.GetString("Procedure_0_modified", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Procedures. + /// + internal static string Procedures { + get { + return ResourceManager.GetString("Procedures", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Producer. + /// + internal static string Producer { + get { + return ResourceManager.GetString("Producer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Product name. + /// + internal static string Product_name { + get { + return ResourceManager.GetString("Product_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Program restart is required to apply some settings. + /// + internal static string Program_restart_is_required_to_apply_some_settings { + get { + return ResourceManager.GetString("Program_restart_is_required_to_apply_some_settings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Progress. + /// + internal static string Progress { + get { + return ResourceManager.GetString("Progress", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Properties. + /// + internal static string Properties { + get { + return ResourceManager.GetString("Properties", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Protocol. + /// + internal static string Protocol { + get { + return ResourceManager.GetString("Protocol", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Publish. + /// + internal static string Publish { + get { + return ResourceManager.GetString("Publish", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pulses per liter. + /// + internal static string PulsesPerLtr { + get { + return ResourceManager.GetString("PulsesPerLtr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pump. + /// + internal static string Pump { + get { + return ResourceManager.GetString("Pump", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pump power [%]. + /// + internal static string Pump_power_pct { + get { + return ResourceManager.GetString("Pump_power_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Purchase Order. + /// + internal static string Purchase_Order { + get { + return ResourceManager.GetString("Purchase_Order", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Purchase order: . + /// + internal static string Purchase_order_ { + get { + return ResourceManager.GetString("Purchase_order_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fill the test bench with water?. + /// + internal static string Purge_bench_qm { + get { + return ResourceManager.GetString("Purge_bench_qm", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Purging. + /// + internal static string Purging { + get { + return ResourceManager.GetString("Purging", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Purging ({0}: step {1}/{2}). + /// + internal static string Purging_i_n { + get { + return ResourceManager.GetString("Purging_i_n", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q from [l/h]. + /// + internal static string Q_from_lph { + get { + return ResourceManager.GetString("Q_from_lph", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q from [m3/h]. + /// + internal static string Q_from_m3h { + get { + return ResourceManager.GetString("Q_from_m3h", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q-Set Method. + /// + internal static string Q_set_method_chdr { + get { + return ResourceManager.GetString("Q_set_method_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q to [l/h]. + /// + internal static string Q_to_lph { + get { + return ResourceManager.GetString("Q_to_lph", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q to [m3/h]. + /// + internal static string Q_to_m3h { + get { + return ResourceManager.GetString("Q_to_m3h", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Qfall. + /// + internal static string Qfall { + get { + return ResourceManager.GetString("Qfall", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Qmin. + /// + internal static string Qmin { + get { + return ResourceManager.GetString("Qmin", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Qn. + /// + internal static string Qn { + get { + return ResourceManager.GetString("Qn", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Qrise. + /// + internal static string Qrise { + get { + return ResourceManager.GetString("Qrise", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Qt. + /// + internal static string Qt { + get { + return ResourceManager.GetString("Qt", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Question. + /// + internal static string Question { + get { + return ResourceManager.GetString("Question", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rate of change [%]. + /// + internal static string RateOfChangePct { + get { + return ResourceManager.GetString("RateOfChangePct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ready. + /// + internal static string Ready { + get { + return ResourceManager.GetString("Ready", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Red. type. + /// + internal static string Red_type_chdr { + get { + return ResourceManager.GetString("Red_type_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Reference. + /// + internal static string Reference { + get { + return ResourceManager.GetString("Reference", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Reg. valve. + /// + internal static string Reg_valve { + get { + return ResourceManager.GetString("Reg_valve", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Relative Q from. + /// + internal static string RelativeQfrom { + get { + return ResourceManager.GetString("RelativeQfrom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Relative Q to. + /// + internal static string RelativeQto { + get { + return ResourceManager.GetString("RelativeQto", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to remaining time. + /// + internal static string remaining_time { + get { + return ResourceManager.GetString("remaining_time", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to < &Remove. + /// + internal static string Remove { + get { + return ResourceManager.GetString("Remove", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to << R&emove all. + /// + internal static string Remove_all { + get { + return ResourceManager.GetString("Remove_all", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove. + /// + internal static string RemoveBtnText { + get { + return ResourceManager.GetString("RemoveBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove Tab. + /// + internal static string RemoveTabBtnText { + get { + return ResourceManager.GetString("RemoveTabBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rename Tab. + /// + internal static string RenameTabBtnText { + get { + return ResourceManager.GetString("RenameTabBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeats nr.. + /// + internal static string Repeats_nr_chdr { + get { + return ResourceManager.GetString("Repeats_nr_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must restart to apply these changes. + /// + internal static string Restart_To_Apply_Changes { + get { + return ResourceManager.GetString("Restart_To_Apply_Changes", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Retry. + /// + internal static string RetryBtnText { + get { + return ResourceManager.GetString("RetryBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Retry connection to the database. + /// + internal static string RetryDatabaseText { + get { + return ResourceManager.GetString("RetryDatabaseText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Revision. + /// + internal static string Revision { + get { + return ResourceManager.GetString("Revision", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ROI Detection in Progress. + /// + internal static string ROI_Detection_in_Progress { + get { + return ResourceManager.GetString("ROI_Detection_in_Progress", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Screen. + /// + internal static string ScreenBtnText { + get { + return ResourceManager.GetString("ScreenBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to s. + /// + internal static string sec { + get { + return ResourceManager.GetString("sec", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Select Component. + /// + internal static string Select_Component { + get { + return ResourceManager.GetString("Select_Component", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Selected results:. + /// + internal static string Selected_results { + get { + return ResourceManager.GetString("Selected_results", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sensor . + /// + internal static string Sensor_ { + get { + return ResourceManager.GetString("Sensor_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sensors. + /// + internal static string Sensors { + get { + return ResourceManager.GetString("Sensors", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sensors. + /// + internal static string Sensors_chdr { + get { + return ResourceManager.GetString("Sensors_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Serial Number. + /// + internal static string Serial_Number { + get { + return ResourceManager.GetString("Serial_Number", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Set flow. + /// + internal static string Set_flow { + get { + return ResourceManager.GetString("Set_flow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Set route. + /// + internal static string Set_route { + get { + return ResourceManager.GetString("Set_route", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Setting the flow. + /// + internal static string Setting_the_flow { + get { + return ResourceManager.GetString("Setting_the_flow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Setting the water pressure. + /// + internal static string Setting_the_water_pressure { + get { + return ResourceManager.GetString("Setting_the_water_pressure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Show cycle end form. + /// + internal static string Show_cycle_end_form { + get { + return ResourceManager.GetString("Show_cycle_end_form", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Simultaneous with next step. + /// + internal static string Simultaneous_with_next_step { + get { + return ResourceManager.GetString("Simultaneous_with_next_step", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Simultaneous with previous step. + /// + internal static string Simultaneous_with_previous_step { + get { + return ResourceManager.GetString("Simultaneous_with_previous_step", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Single. + /// + internal static string SingleBtnText { + get { + return ResourceManager.GetString("SingleBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start. + /// + internal static string Start { + get { + return ResourceManager.GetString("Start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start the pump. + /// + internal static string Start_the_pump { + get { + return ResourceManager.GetString("Start_the_pump", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start the test. + /// + internal static string Start_the_test { + get { + return ResourceManager.GetString("Start_the_test", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting the system. + /// + internal static string Starting_system { + get { + return ResourceManager.GetString("Starting_system", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting the cameras. + /// + internal static string Starting_the_cameras { + get { + return ResourceManager.GetString("Starting_the_cameras", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting the pump. + /// + internal static string Starting_the_pump { + get { + return ResourceManager.GetString("Starting_the_pump", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start valve. + /// + internal static string StartValve { + get { + return ResourceManager.GetString("StartValve", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to State. + /// + internal static string State { + get { + return ResourceManager.GetString("State", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stop the pump. + /// + internal static string Stop_the_pump { + get { + return ResourceManager.GetString("Stop_the_pump", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stop the test. + /// + internal static string Stop_the_test { + get { + return ResourceManager.GetString("Stop_the_test", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopping. + /// + internal static string Stopping { + get { + return ResourceManager.GetString("Stopping", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopping flow before the fixed start test. + /// + internal static string Stopping_flow_for_the_fixed_start { + get { + return ResourceManager.GetString("Stopping_flow_for_the_fixed_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to . + /// + internal static string String1 { + get { + return ResourceManager.GetString("String1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Supress WM trills. + /// + internal static string SupressWMTrills { + get { + return ResourceManager.GetString("SupressWMTrills", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Switching flow detection. + /// + internal static string Switching_flow_detection { + get { + return ResourceManager.GetString("Switching_flow_detection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Switching Points. + /// + internal static string Switching_Points { + get { + return ResourceManager.GetString("Switching_Points", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T div.. + /// + internal static string T_div { + get { + return ResourceManager.GetString("T_div", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T in. + /// + internal static string T_in { + get { + return ResourceManager.GetString("T_in", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T out. + /// + internal static string T_out { + get { + return ResourceManager.GetString("T_out", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Target Q [m3/h]. + /// + internal static string TargetQ { + get { + return ResourceManager.GetString("TargetQ", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tarring. + /// + internal static string Tarring { + get { + return ResourceManager.GetString("Tarring", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test. + /// + internal static string Test { + get { + return ResourceManager.GetString("Test", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench. + /// + internal static string Test_bench { + get { + return ResourceManager.GetString("Test_bench", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test Bench Components Configuration. + /// + internal static string Test_Bench_Components_Configuration { + get { + return ResourceManager.GetString("Test_Bench_Components_Configuration", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench data. + /// + internal static string Test_bench_data { + get { + return ResourceManager.GetString("Test_bench_data", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test Bench Databases Specification. + /// + internal static string Test_Bench_Databases_Specification { + get { + return ResourceManager.GetString("Test_Bench_Databases_Specification", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench is controlled by this computer. + /// + internal static string Test_bench_is_controlled_by_this_computer { + get { + return ResourceManager.GetString("Test_bench_is_controlled_by_this_computer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench name. + /// + internal static string Test_bench_name { + get { + return ResourceManager.GetString("Test_bench_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test bench number. + /// + internal static string Test_bench_number { + get { + return ResourceManager.GetString("Test_bench_number", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test Benches:. + /// + internal static string Test_Benches_ { + get { + return ResourceManager.GetString("Test_Benches_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test. + /// + internal static string Test_chdr { + get { + return ResourceManager.GetString("Test_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test completed. + /// + internal static string Test_completed { + get { + return ResourceManager.GetString("Test_completed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test connection. + /// + internal static string Test_connection { + get { + return ResourceManager.GetString("Test_connection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test in progress. + /// + internal static string Test_in_progress { + get { + return ResourceManager.GetString("Test_in_progress", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test. + /// + internal static string Test_measured_corrected { + get { + return ResourceManager.GetString("Test_measured_corrected", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test method. + /// + internal static string Test_method { + get { + return ResourceManager.GetString("Test_method", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test name. + /// + internal static string Test_name { + get { + return ResourceManager.GetString("Test_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test preparation. + /// + internal static string Test_preparation { + get { + return ResourceManager.GetString("Test_preparation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test start ({0}: step {1}/{2}). + /// + internal static string Test_start_sequence_i_n { + get { + return ResourceManager.GetString("Test_start_sequence_i_n", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test stop ({0}: step {1}/{2}). + /// + internal static string Test_stop_sequence_i_n { + get { + return ResourceManager.GetString("Test_stop_sequence_i_n", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test time [s]. + /// + internal static string Test_time_s_chdr { + get { + return ResourceManager.GetString("Test_time_s_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tester. + /// + internal static string Tester { + get { + return ResourceManager.GetString("Tester", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tester: . + /// + internal static string Tester_ { + get { + return ResourceManager.GetString("Tester_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Testing Specialist. + /// + internal static string Testing_Specialist { + get { + return ResourceManager.GetString("Testing_Specialist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tests are columns. + /// + internal static string Tests_are_columns { + get { + return ResourceManager.GetString("Tests_are_columns", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tests are rows. + /// + internal static string Tests_are_rows { + get { + return ResourceManager.GetString("Tests_are_rows", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T stop - mass msrmt. [s]. + /// + internal static string Time2MassMsrmt_chdr { + get { + return ResourceManager.GetString("Time2MassMsrmt_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T flow stab. - start [s]. + /// + internal static string TimeFlow2Start_chdr { + get { + return ResourceManager.GetString("TimeFlow2Start_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Timeout. + /// + internal static string Timeout { + get { + return ResourceManager.GetString("Timeout", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Toler. red. [%]. + /// + internal static string Tol_red_pct_chdr { + get { + return ResourceManager.GetString("Tol_red_pct_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transition - End. + /// + internal static string TransitionEnd_chdr { + get { + return ResourceManager.GetString("TransitionEnd_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transitions. + /// + internal static string Transitions { + get { + return ResourceManager.GetString("Transitions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transition - Start. + /// + internal static string TransitionStart_chdr { + get { + return ResourceManager.GetString("TransitionStart_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Type. + /// + internal static string Type { + get { + return ResourceManager.GetString("Type", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unhandled error occured in . + /// + internal static string Unhandled_error_occured_in_ { + get { + return ResourceManager.GetString("Unhandled_error_occured_in_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unlock. + /// + internal static string UnlockBtnText { + get { + return ResourceManager.GetString("UnlockBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Up. + /// + internal static string UpBtnText { + get { + return ResourceManager.GetString("UpBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User : . + /// + internal static string User_ { + get { + return ResourceManager.GetString("User_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User Login. + /// + internal static string User_Login { + get { + return ResourceManager.GetString("User_Login", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User Management. + /// + internal static string User_Management { + get { + return ResourceManager.GetString("User_Management", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User name. + /// + internal static string User_name { + get { + return ResourceManager.GetString("User_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Username. + /// + internal static string Username { + get { + return ResourceManager.GetString("Username", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to This Username has already been taken. Please choose another one.. + /// + internal static string Username_taken { + get { + return ResourceManager.GetString("Username_taken", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Users and groups. + /// + internal static string Users_and_groups { + get { + return ResourceManager.GetString("Users_and_groups", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Version. + /// + internal static string Version { + get { + return ResourceManager.GetString("Version", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Version _VERSION_. + /// + internal static string VersionStr { + get { + return ResourceManager.GetString("VersionStr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Vertically. + /// + internal static string Vertically { + get { + return ResourceManager.GetString("Vertically", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volume and error limit selection. + /// + internal static string Volume_and_error_selection { + get { + return ResourceManager.GetString("Volume_and_error_selection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volume [l]. + /// + internal static string Volume_ltr_chdr { + get { + return ResourceManager.GetString("Volume_ltr_chdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warning. + /// + internal static string Warning { + get { + return ResourceManager.GetString("Warning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water. + /// + internal static string Water { + get { + return ResourceManager.GetString("Water", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water Meter. + /// + internal static string Water_Meter { + get { + return ResourceManager.GetString("Water_Meter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water meter data. + /// + internal static string Water_meter_data { + get { + return ResourceManager.GetString("Water_meter_data", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water Meter Serial Numbers ans States. + /// + internal static string Water_Meter_SNs_States { + get { + return ResourceManager.GetString("Water_Meter_SNs_States", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water Meter States. + /// + internal static string Water_Meter_States { + get { + return ResourceManager.GetString("Water_Meter_States", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water meter types. + /// + internal static string Water_meter_types { + get { + return ResourceManager.GetString("Water_meter_types", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Water meters. + /// + internal static string Water_meters { + get { + return ResourceManager.GetString("Water_meters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to S/N:. + /// + internal static string WMSN { + get { + return ResourceManager.GetString("WMSN", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to State [liter]. + /// + internal static string WMState { + get { + return ResourceManager.GetString("WMState", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to yes. + /// + internal static string yes { + get { + return ResourceManager.GetString("yes", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Yes. + /// + internal static string YesBtn { + get { + return ResourceManager.GetString("YesBtn", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Zeroing. + /// + internal static string Zeroing_chdr { + get { + return ResourceManager.GetString("Zeroing_chdr", resourceCulture); + } + } + } +} diff --git a/Config/Resources/Strings.resx b/Config/Resources/Strings.resx new file mode 100644 index 000000000..7d0d0f851 --- /dev/null +++ b/Config/Resources/Strings.resx @@ -0,0 +1,1156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Confirmation + + + Do you want to save the procedure? + + + Error + + + Error loading users from the database: + + + Failed to create a sample database: + + + Failed to export the database: + + + Invalid user, password, or bench + + + Password + + + Please, select a test bench + + + You must restart to apply these changes + + + Test bench + + + User name + + + Warning + + + (max. _X_ alphanumeric characters) + + + This Username has already been taken. Please choose another one. + + + close + + + Diverter + + + Emptying valve + + + Name + + + open + + + Pump + + + P up + + + P down + + + Q from [m3/h] + + + Q to [m3/h] + + + Reference + + + Reg. valve + + + Balance + + + Sensor + + + T div. + + + T in + + + T out + + + Pressure meter + + + Duration [s] + + + no + + + yes + + + PBench + + + PFeed + + + PQ + + + Procedure + + + PSens + + + Test + + + - Copy + + + Correction [g] + + + Nr. + + + Mass [kg] + + + Add + + + Cancel + + + Close + + + Lock + + + Remove + + + Unlock + + + OK + + + Correction [l/h] + + + Correction [mbar] + + + Flow [m3/h] + + + Pressure [bar] + + + Invalid username or password + + + Username + + + User Login + + + Copy + + + Down + + + Edit + + + Up + + + Cannot connect to the database. + + + Configure test benches (password required) + + + Exit + + + Retry connection to the database + + + Enter password + + + Invalid password + + + Test bench name conflict, use another name please + + + The database was successfully created! + + + The database will be overwritten + + + Do you want to proceed? + + + Notification + + + No test bench in the program configuration. + + + Description + + + Procedures + + + Procedure + + + Test + + + Corrected + + + Measured + + + Test + + + Test bench is not running, however you can change the settings to resolve the problem. + + + Volume [l] + + + Emptying + + + Q-Set Method + + + Repeats nr. + + + Test + + + Zeroing + + + Bench + + + Err. cor. - [%] + + + Err. cor. +[%] + + + Err. Limit - [%] + + + Err. Limit + [%] + + + Feeding + + + Output + + + Q from [l/h] + + + Q to [l/h] + + + Red. type + + + Sensors + + + Toler. red. [%] + + + Test time [s] + + + Error while creating the database. Reason: + + + Metrology + + + Please change the following settings: + + + Properties + + + Unhandled error occured in + + + User : + + + (offline) + + + Administrator + + + Calibration Specialist + + + Head of Lab + + + Maintenance Specialist + + + Metrologist + + + Tester + + + Testing Specialist + + + Close emptying valve + + + Get mass of water in the tank + + + Ignore + + + Loading the procedure + + + Make tank empty + + + Measure the mass + + + Please select a procedure + + + Please select a test + + + Purging + + + Ready + + + Set flow + + + Set route + + + Start the pump + + + Start the test + + + Stopping + + + Stop the pump + + + Stop the test + + + Tarring + + + Test in progress + + + < Back + + + Finish + + + Next > + + + Flow Selection + + + Test name + + + Test method + + + Relative Q from + + + Relative Q to + + + Target Q [m3/h] + + + Combined meters + + + Detection threshold [%] + + + Rate of change [%] + + + Pulses per liter + + + Component + + + <none> + + + Test method selection + + + Sensors + + + Test method + + + Volume and error limit selection + + + + Clear results + + + Configure + + + Arrangements of tested meters + + + Arrangement of tests + + + Horizontally + + + Tests are columns + + + Tests are rows + + + Vertically + + + Configuration + + + NOK + + + OK + + + Clear + + + Emptying the tank + + + Measuring the weight + + + Setting the flow + + + Test completed + + + Test preparation + + + Purging ({0}: step {1}/{2}) + + + Emptying ({0}: step {1}/{2}) + + + Switching flow detection + + + Activity + + + Progress + + + + + + Please select a cycle, a test or empty + + + Approval info. + + + Metrological class + + + Producer + + + Qn + + + Water meters + + + Printer + + + Version + + + Test bench number + + + <nothing to configure> + + + Fill the test bench with water? + + + No + + + Question + + + Yes + + + Bench parameters + + + Connection string + + + Create DB + + + Database type + + + Test Bench Databases Specification + + + Test bench is controlled by this computer + + + Test bench name + + + Test connection + + + Users and groups + + + Water meter data + + + Water meter types + + + Logging + + + Mode + + + Parameters + + + Parent + + + Type + + + Test Bench Components Configuration + + + Transitions + + + New Tab + + + Remove Tab + + + Rename Tab + + + New transition name + + + Power [%] + + + ROI Detection in Progress + + + Detection completed + + + Emergency STOP + + + Transition - End + + + Transition - Start + + + Starting the cameras + + + Test start ({0}: step {1}/{2}) + + + Test stop ({0}: step {1}/{2}) + + + &Add > + + + Available results: + + + < &Remove + + + << R&emove all + + + Selected results: + + + Supress WM trills + + + Fill the test bench with water? + + + Message + + + Start valve + + + dflt + + + Stopping flow before the fixed start test + + + Water Meter + + + Water Meter Serial Numbers ans States + + + Water Meter States + + + S/N: + + + State [liter] + + + Detection failed + + + Camera error + + + Starting the system + + + remaining time + + + s + + + T stop - mass msrmt. [s] + + + Less + + + More + + + Program restart is required to apply some settings + + + Changes will be lost. Do you want to proceed? + + + PID + + + Flowmeter + + + Part + + + Timeout + + + Combined + + + Device + + + Printer + + + Screen + + + Single + + + Aux Water Meter + + + Aux. WM State + + + Data + + + End State + + + Main Water Meter + + + Main WM State + + + Protocol + + + Qfall + + + Qrise + + + Serial Number + + + State + + + Switching Points + + + Aux. WM Serial Nr. + + + Main WM Serial Nr. + + + Pump power [%] + + + Adjustment in progress + + + Error [%] + + + Starting the pump + + + Setting the water pressure + + + PreasureHi [bar] + + + PressureLo [bar] + + + Pressure Hi [bar] + + + Pressure Lo [bar] + + + Pressure Selection + + + Leak duration [s] + + + PMax duration [s] + + + P up end + + + P up start + + + P down end + + + P down start + + + Closing input valve, switching the pump off + + + Purchase Order + + + Ambient humidity: + + + Ambient pressure: + + + Ambient temperature: + + + Approval: + + + Date and time: + + + Procedure: + + + Purchase order: + + + Tester: + + + Page + + + T flow stab. - start [s] + + + End + + + Start + + + @temperature [degC] + + + Density [kg/m3] + + + Density + + + Nr. meters in a group: + + + Show cycle end form + + + End condition + + + Communication + + + Aux: + + + Main: + + + Qmin + + + Qt + + + cold + + + hot + + + Water + + + Product name + + + Address + + + Approval date + + + Approval ID + + + Approved by + + + Evaluate + + + Publish + + + Simultaneous with next step + + + Simultaneous with previous step + + + iPerl Communication in progress + + + Language + + + Test bench data + + + Available Components: + + + Select Component + + + Database Settings + + + Test Benches: + + + About Test Bench Framework + + + Build date _BUILD_DATE_ + + + Copyright © 2013 - {0} + + + Version _VERSION_ + + + Edit User + + + Groups + + + User Management + + + An unhandled error occured + + + Ignore + + + Retry + + + Procedure {0} added. + + + Procedure {0} modified. + + + Revision + + \ No newline at end of file diff --git a/Results/Class1.cs b/Results/Class1.cs new file mode 100644 index 000000000..0d6c6312b --- /dev/null +++ b/Results/Class1.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Results +{ + public class Class1 + { + } +} diff --git a/ResultsBrowser/Entities/MeterTestResult.cs b/Results/Entities/MeterTestResult.cs similarity index 55% rename from ResultsBrowser/Entities/MeterTestResult.cs rename to Results/Entities/MeterTestResult.cs index 30fb642ac..9b3c2e1eb 100644 --- a/ResultsBrowser/Entities/MeterTestResult.cs +++ b/Results/Entities/MeterTestResult.cs @@ -1,26 +1,36 @@ -using System; +/// +/// Copyright (c) 2013-2015 Sensus Metering Systems +/// +using System; -namespace ResultsBrowser.Entities +namespace Results.Entities { public class MeterTestResult { public virtual int Id { get; protected set; } public virtual TestResult TestResult { get; set; } /// reference to the TestResult entity - public virtual string SerialNr { get; set; } + public virtual bool Disabled { get; set; } /// true = this meter was disabled and the results should be disregarded + public virtual string SerialNr { get; set; } public virtual string EndState { get; set; } public virtual float VolumeStart { get; set; } /// liter public virtual float VolumeEnd { get; set; } /// liter public virtual float VolumeMeter { get; set; } /// liter public virtual float VolumeRef { get; set; } /// liter public virtual float VolumeErrorPct { get; set; } /// % - public virtual float PulsesMeter { get; set; } /// Not applicable for a combined meter + public virtual float PulsesMeter { get; set; } /// # of pulses + public virtual float PulsesPerLiter { get; set; } /// Pulses per liter public virtual float PulsesMaster { get; set; } public virtual float Time { get; set; } /// sec. - public virtual bool Passed { get; set; } /// true = test passed + public virtual float TimeStart { get; set; } /// sec. - Not mapped to DB !!! + public virtual float TimeEnd { get; set; } /// sec. - Not mapped to DB !!! + public virtual int CalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! + public virtual double Q2Correction { get; set; } /// iPerl Q2 correction used during the test - Not mapped to DB !!! + public virtual bool Passed { get; set; } /// true=test passed - Not mapped to DB !!! public MeterTestResult() { + PulsesPerLiter = 1.0f; } public MeterTestResult(TestResult testResult) @@ -33,7 +43,8 @@ namespace ResultsBrowser.Entities { MeterTestResult result = new MeterTestResult(testResult); - result.SerialNr = SerialNr; + result.Disabled = Disabled; + result.SerialNr = SerialNr; result.EndState = EndState; result.VolumeStart = VolumeStart; result.VolumeEnd = VolumeEnd; @@ -41,8 +52,13 @@ namespace ResultsBrowser.Entities result.VolumeRef = VolumeRef; result.VolumeErrorPct = VolumeErrorPct; result.PulsesMeter = PulsesMeter; + result.PulsesPerLiter = PulsesPerLiter; result.PulsesMaster = PulsesMaster; result.Time = Time; + result.TimeStart = TimeStart; + result.TimeEnd = TimeEnd; + result.CalibFactor = CalibFactor; + result.Q2Correction = Q2Correction; result.Passed = Passed; return result; diff --git a/Results/Entities/TestResult.cs b/Results/Entities/TestResult.cs new file mode 100644 index 000000000..40759e1df --- /dev/null +++ b/Results/Entities/TestResult.cs @@ -0,0 +1,167 @@ +/// +/// Copyright (c) 2013-2015 Sensus Metering Systems +/// +using System; +using System.Collections.Generic; +using Config.Entities; + +namespace Results.Entities +{ + public class TestResult + { + public virtual int Id { get; protected set; } + public virtual string Name { get; set; } + public virtual int BatchNr { get; set; } + public virtual string PurchaseOrder { get; set; } + public virtual MetersKind MetersKind { get; set; } + public virtual IList Meters { get; set; } + public virtual IList CombinedMeters { get; set; } + + /// Value copied from the procedure (Entities.Procedure) + public virtual string ProcedureName { get; set; } + public virtual string ProtocolTitle { get; set; } + + /// Values copied from the test (Entities.Test) + public virtual int TestId { get; set; } /// Test entity ID to distinguish between tests with the same name + public virtual string TestName { get; set; } + public virtual int Part { get; set; } + public virtual bool DoNotEvaluate { get; set; } /// Not mapped to the database + public virtual bool DoNotPublish { get; set; } /// Not mapped to the database + public virtual float Qfrom { get; set; } /// [m3/h] Water flow low limit + public virtual float Qto { get; set; } /// [m3/h] Water flow high limit + public virtual float Volume { get; set; } /// [l] Target test volume + public virtual float TstTime { get; set; } /// [s] Test time estimate + public virtual int Repeats { get; set; } + public virtual bool Emptying { get; set; } + public virtual bool Zeroing { get; set; } + public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps + public virtual int Time2MassMsrmt { get; set; } + public virtual string Method { get; set; } + public virtual float ErrLimLo { get; set; } /// [%] Lower error limit (usually < 0) + public virtual float ErrLimHi { get; set; } /// [%] Upper error limit (usually > 0) + public virtual float Uncertainty { get; set; } /// [%] Makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx) + + /// To be replaced by the virtual bench component parameters + public virtual string FeedingPath { get; set; } + public virtual string BenchPath { get; set; } + public virtual string OutputPath { get; set; } + public virtual string MetersPath { get; set; } + + /// Results + public virtual DateTime TimeStart { get; set; } /// Date and time of the test start + public virtual DateTime TimeEnd { get; set; } /// Date and time of the test end + public virtual int RepetitionNr { get; set; } /// Repetition number from the set of repeated tests (1...) + public virtual float AmbientTempAve { get; set; } /// [deg.C] Average ambient air temperature + public virtual float AmbientPressAve { get; set; } /// Average ambient air pressure + public virtual float AmbientHumiAve { get; set; } /// [%] Average ambient air relative humidity + public virtual float PressInAvrg { get; set; } /// [Bar] Input water pressure (average) + public virtual float PressInStart { get; set; } /// [Bar] + public virtual float PressInEnd { get; set; } /// [Bar] + public virtual float PressOutAvrg { get; set; } /// [Bar] + public virtual float PressOutStart { get; set; } /// [Bar] + public virtual float PressOutEnd { get; set; } /// [Bar] + public virtual float TempInAvrg { get; set; } /// [deg.C] + public virtual float TempInStart { get; set; } /// [deg.C] + public virtual float TempInEnd { get; set; } /// [deg.C] + public virtual float TempOutAvrg { get; set; } /// [deg.C] + public virtual float TempOutStart { get; set; } /// [deg.C] + public virtual float TempOutEnd { get; set; } /// [deg.C] + public virtual float TempDivAvrg { get; set; } /// [deg.C] + public virtual float TempDivStart { get; set; } /// [deg.C] + public virtual float TempDivEnd { get; set; } /// [deg.C] + public virtual float MassStartRaw { get; set; } /// [kg] + public virtual float MassStart { get; set; } /// [kg] + public virtual float MassEndRaw { get; set; } /// [kg] + public virtual float MassEnd { get; set; } /// [kg] + public virtual float MassDiff { get; set; } /// [kg] + public virtual float DensityIn { get; set; } /// [kg/m3] + public virtual float DensityOut { get; set; } /// [kg/m3] + public virtual float DensityDiv { get; set; } /// [kg/m3] + public virtual float Buoyancy { get; set; } ///TODO -> map + public virtual float FlowMass { get; set; } /// [kg/h] calculated from conventional true value + public virtual float FlowVolume { get; set; } /// [l/h] calculated from conventional true value + public virtual float VolumeCTV { get; set; } /// [l] Volume conventional true value + public virtual float VolumeMaster { get; set; } /// [l] Volume from the master flow meter + public virtual float Time { get; set; } /// [s] Measurement time in seconds + public virtual float ErrorMaster { get; set; } /// [%] + public virtual float PulsesMaster { get; set; } + public virtual float ConstMaster { get; set; } /// [pls/l] Pulses per liter master flow meter + public virtual float QRise { get; set; } /// Detected Q_rise of a composed meter + public virtual float QFall { get; set; } /// Detected Q_fall of a composed meter + public virtual float TimeDivStart0 { get; set; } + public virtual float TimeDivStart1 { get; set; } + public virtual float TimeDivStart2 { get; set; } + public virtual float TimeDivStart3 { get; set; } + public virtual float TimeDivStart4 { get; set; } + public virtual float TimeDivStart5 { get; set; } + public virtual float TimeDivEnd0 { get; set; } + public virtual float TimeDivEnd1 { get; set; } + public virtual float TimeDivEnd2 { get; set; } + public virtual float TimeDivEnd3 { get; set; } + public virtual float TimeDivEnd4 { get; set; } + public virtual float TimeDivEnd5 { get; set; } + + public TestResult() + { + Meters = new List(); + CombinedMeters = new List(); + } + + public TestResult(MetersKind kind) + : this() + { + MetersKind = kind; + + if (kind == MetersKind.Single) + { + for (int i = 0; i < Config.Data.WMsCount; i++) Meters.Add(new MeterTestResult(this)); + } + else if (kind == MetersKind.Combined) + { + for (int i = 0; i < 2 * Config.Data.CompoundWMsCount; i++) Meters.Add(new MeterTestResult(this)); + for (int i = 0; i < Config.Data.CompoundWMsCount; i++) CombinedMeters.Add(new MeterTestResult(this)); + } + } + + public TestResult(Test test, int repetitionNr, MetersKind kind) + : this(kind) + { + if (test.Repeats == 1) + { + Name = test.Name; + } + else + { + Name = string.Format("{0} ({1}/{2})", test.Name, repetitionNr, test.Repeats); + } + RepetitionNr = repetitionNr; + + /// Copy test parameters from Entities.Procedure object + ProcedureName = test.Procedure.Name; + ProtocolTitle = test.Procedure.ProtocolTitle; + + /// Copy test parameters from Entities.Test object + TestId = test.Id; + TestName = test.Name; + Part = test.Part; + Qfrom = test.Qfrom; + Qto = test.Qto; + Volume = test.Volume; + TstTime = test.TstTime; + Repeats = test.Repeats; + Emptying = test.Emptying; + Zeroing = test.Zeroing; + PumpPower = PumpPower; + Time2MassMsrmt = test.TimeStop2Mass; + Method = test.Method; + ErrLimLo = test.ErrLimLo; + ErrLimHi = test.ErrLimHi; + Uncertainty = test.Uncertainty; + + FeedingPath = test.FeedingPath; + BenchPath = test.BenchPath; + OutputPath = test.OutputPath; + MetersPath = test.MetersPath; + } + } +} diff --git a/ResultsBrowser/Mappings/MeterTestResultMap.cs b/Results/Mappings/MeterTestResultMap.cs similarity index 68% rename from ResultsBrowser/Mappings/MeterTestResultMap.cs rename to Results/Mappings/MeterTestResultMap.cs index 831c4f3c7..3b80fbaa6 100644 --- a/ResultsBrowser/Mappings/MeterTestResultMap.cs +++ b/Results/Mappings/MeterTestResultMap.cs @@ -1,7 +1,10 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; +/// +/// Copyright (c) 2013-2015 Sensus Metering Systems +/// +using FluentNHibernate.Mapping; +using Results.Entities; -namespace ResultsBrowser.Mappings +namespace Results.Mappings { class MeterTestResultMap : ClassMap { @@ -9,7 +12,8 @@ namespace ResultsBrowser.Mappings { Id(x => x.Id); References(x => x.TestResult); - Map(x => x.SerialNr); + Map(x => x.Disabled); + Map(x => x.SerialNr); Map(x => x.EndState); Map(x => x.VolumeStart); Map(x => x.VolumeEnd); @@ -17,6 +21,7 @@ namespace ResultsBrowser.Mappings Map(x => x.VolumeRef); Map(x => x.VolumeErrorPct); Map(x => x.PulsesMeter); + Map(x => x.PulsesPerLiter); Map(x => x.PulsesMaster); Map(x => x.Time); } diff --git a/ResultsBrowser/Mappings/TestResultMap.cs b/Results/Mappings/TestResultMap.cs similarity index 92% rename from ResultsBrowser/Mappings/TestResultMap.cs rename to Results/Mappings/TestResultMap.cs index 167e0bb0a..4597cb7a7 100644 --- a/ResultsBrowser/Mappings/TestResultMap.cs +++ b/Results/Mappings/TestResultMap.cs @@ -1,7 +1,10 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; +/// +/// Copyright (c) 2013-2015 Sensus Metering Systems +/// +using FluentNHibernate.Mapping; +using Results.Entities; -namespace ResultsBrowser.Mappings +namespace Results.Mappings { class TestResultMap : ClassMap { @@ -9,9 +12,9 @@ namespace ResultsBrowser.Mappings { Id(x => x.Id); Map(x => x.Name); - Map(x => x.BatchNr) - .Column("CycleNr"); - Map(x => x.MetersKind); + Map(x => x.BatchNr); + Map(x => x.PurchaseOrder); + Map(x => x.MetersKind); HasMany(x => x.Meters) .Cascade.All(); HasMany(x => x.CombinedMeters) @@ -35,6 +38,7 @@ namespace ResultsBrowser.Mappings Map(x => x.Method); Map(x => x.ErrLimLo); Map(x => x.ErrLimHi); + Map(x => x.Uncertainty); Map(x => x.FeedingPath) .CustomType("StringClob") diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..10120f6be --- /dev/null +++ b/Results/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Results")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Results")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5da980c4-8924-4762-9b72-91e011e08f6c")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Results/Results.csproj b/Results/Results.csproj new file mode 100644 index 000000000..845607b21 --- /dev/null +++ b/Results/Results.csproj @@ -0,0 +1,76 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} + Library + Properties + Results + Results + v4.0 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll + + + ..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll + + + ..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll + + + ..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll + + + + + + + + + + + + + + + + + + + + {743DF7DB-C7B6-42EB-986D-0F485E5588E4} + Config + + + + + \ No newline at end of file diff --git a/ResultsBrowser/DBSettings.cs b/ResultsBrowser/DBSettings.cs deleted file mode 100644 index 241009bbb..000000000 --- a/ResultsBrowser/DBSettings.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; - -namespace ResultsBrowser -{ - /// - /// Database settings required to make a connection - /// - public class DBSettings : ICloneable - { - public DBType DbType; - public string ConnectionString; - - public DBSettings() - { - } - - public DBSettings(DBType dbType, string connectionString) - { - this.DbType = dbType; - this.ConnectionString = connectionString; - } - - public object Clone() - { - return new DBSettings(DbType, ConnectionString); - } - } -} diff --git a/ResultsBrowser/DatabaseSettings.cs b/ResultsBrowser/DatabaseSettings.cs deleted file mode 100644 index e6de5ae99..000000000 --- a/ResultsBrowser/DatabaseSettings.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Text; -using System.Xml.Serialization; - -namespace ResultsBrowser -{ - /// - /// Test bench database settings, contains bench name and settings od several databases - /// - public class DatabaseSettings : ICloneable - { - // Public fields - public string BenchName; - public bool IsRealBench; - public DBSettings UsersDBSettings; - public DBSettings BenchDBSettings; - public DBSettings ProceduresDBSettings; - public DBSettings WMTypesDBSettings; - public DBSettings WaterMetersDBSettings; - - // Constructor - public DatabaseSettings() - { - BenchName = String.Empty; /// Empty string to avoid null - IsRealBench = false; - UsersDBSettings = new DBSettings(DBType.MySql, "SERVER=localhost; DATABASE=tbf_users; UID=root; PASSWORD=;"); - BenchDBSettings = new DBSettings(DBType.MySql, "SERVER=localhost; DATABASE=tbf_bench; UID=root; PASSWORD=;"); - ProceduresDBSettings = new DBSettings(DBType.MySql, "SERVER=localhost; DATABASE=tbf_procedures; UID=root; PASSWORD=;"); - WMTypesDBSettings = new DBSettings(DBType.MySql, "SERVER=localhost; DATABASE=tbf_wmtypes; UID=root; PASSWORD=;"); - WaterMetersDBSettings = new DBSettings(DBType.MySql, "SERVER=localhost; DATABASE=tbf_watermeters; UID=root; PASSWORD=;"); - } - - public object Clone() - { - DatabaseSettings result = new DatabaseSettings(); - - result.BenchName = BenchName; - result.IsRealBench = IsRealBench; - result.UsersDBSettings = (DBSettings)UsersDBSettings.Clone(); - result.BenchDBSettings = (DBSettings)BenchDBSettings.Clone(); - result.ProceduresDBSettings = (DBSettings)ProceduresDBSettings.Clone(); - result.WMTypesDBSettings = (DBSettings)WMTypesDBSettings.Clone(); - result.WaterMetersDBSettings = (DBSettings)WaterMetersDBSettings.Clone(); - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/BenchPath.cs b/ResultsBrowser/Entities/BenchPath.cs deleted file mode 100644 index 009d1d290..000000000 --- a/ResultsBrowser/Entities/BenchPath.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class BenchPath : IHasItemNr, IHasValves - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual float Qfrom { get; set; } /// Water flow in [m3/h] - public virtual float Qto { get; set; } /// Water flow in [m3/h] - public virtual string TempIn { get; set; } - public virtual string TempOut { get; set; } - public virtual string PressIn { get; set; } - public virtual string PressOut { get; set; } - - /// Valves - public virtual string ValvesOpen { get; set; } - public virtual string ValvesClose { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public BenchPath() - { - } - - public BenchPath(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public BenchPath(BenchControl.BenchPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - TempIn = (path.TempIn != null) ? path.TempIn.Cfg.Name : null; - TempOut = (path.TempOut != null) ? path.TempOut.Cfg.Name : null; - PressIn = (path.PressIn != null) ? path.PressIn.Cfg.Name : null; - PressOut = (path.PressOut != null) ? path.PressOut.Cfg.Name : null; - - string vOpen = string.Empty; - foreach (var valve in path.ValvesOpen) - { - if (vOpen != string.Empty) vOpen += ";"; - vOpen += valve.Cfg.Name; - } - ValvesOpen = vOpen; - - string vClose = string.Empty; - foreach (var valve in path.ValvesClose) - { - if (vClose != string.Empty) vClose += ";"; - vClose += valve.Cfg.Name; - } - ValvesClose = vClose; - } - - public virtual BenchPath Clone(string name, int itemNr) - { - BenchPath result = new BenchPath(name, itemNr); - - result.Qfrom = Qfrom; - result.Qto = Qto; - result.TempIn = TempIn; - result.TempOut = TempOut; - result.PressIn = PressIn; - result.PressOut = PressOut; - result.ValvesOpen = ValvesOpen; - result.ValvesClose = ValvesClose; - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/Component.cs b/ResultsBrowser/Entities/Component.cs deleted file mode 100644 index 49bd24ffc..000000000 --- a/ResultsBrowser/Entities/Component.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class Component : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual string ClassName { get; set; } - public virtual string ParentName { get; set; } - public virtual DebugMode Mode { get; set; } - public virtual LogLevel Logging { get; set; } - public virtual string Parameters { get; set; } - public virtual IList Corrections { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public Component() - { - Corrections = new List(); - } - - public static Component CreateFromCfg(string name, string className, string parentName, int itemNr, - DebugMode debugLevel, LogLevel logLevel, string parameters) - { - Component result = new Component(); - result.ItemNr = itemNr; - result.Name = name; - result.ClassName = className; - result.ParentName = parentName; - result.Mode = debugLevel; - result.Logging = logLevel; - result.Parameters = parameters; - return result; - } - - // Makes a new copy of this object (not just a reference) - public virtual Component Clone() - { - Component result = new Component(); - result.ItemNr = ItemNr; - result.Name = Name; - result.ClassName = ClassName; - result.ParentName = ParentName; - result.Mode = Mode; - result.Logging = Logging; - result.Parameters = Parameters; - return result; - } - - public virtual string ToString(string indent) - { - string result = string.Empty; - - result += indent + "ItemNr = " + (ItemNr + 1).ToString() + Environment.NewLine; - result += indent + "Name = " + Name + Environment.NewLine; - result += indent + "ClassName = " + ClassName + Environment.NewLine; - if (ParentName != null) - { - result += indent + "ParentName = " + ParentName + Environment.NewLine; - } - result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine; - result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine; - result += indent + "Parameters = " + Parameters + Environment.NewLine; - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/ComponentProcedure.cs b/ResultsBrowser/Entities/ComponentProcedure.cs deleted file mode 100644 index 1ef820ec7..000000000 --- a/ResultsBrowser/Entities/ComponentProcedure.cs +++ /dev/null @@ -1,20 +0,0 @@ - -namespace ResultsBrowser.Entities -{ - public class ComponentProcedure - { - public virtual int Id { get; protected set; } - public virtual string CmpntName { get; set; } /// Component name - public virtual string Parameters { get; set; } - public virtual Procedure Procedure { get; set; } - - public virtual ComponentProcedure Clone() - { - ComponentProcedure result = new ComponentProcedure(); - result.CmpntName = CmpntName; - result.Parameters = Parameters; - result.Procedure = Procedure; - return result; - } - } -} diff --git a/ResultsBrowser/Entities/ComponentTest.cs b/ResultsBrowser/Entities/ComponentTest.cs deleted file mode 100644 index 4af5c98b0..000000000 --- a/ResultsBrowser/Entities/ComponentTest.cs +++ /dev/null @@ -1,20 +0,0 @@ - -namespace ResultsBrowser.Entities -{ - public class ComponentTest - { - public virtual int Id { get; protected set; } - public virtual string CmpntName { get; set; } /// Component name - public virtual string Parameters { get; set; } - public virtual Test Test { get; set; } - - public virtual ComponentTest Clone() - { - ComponentTest result = new ComponentTest(); - result.CmpntName = CmpntName; - result.Parameters = Parameters; - result.Test = Test; - return result; - } - } -} diff --git a/ResultsBrowser/Entities/Enums.cs b/ResultsBrowser/Entities/Enums.cs deleted file mode 100644 index 6e2d65983..000000000 --- a/ResultsBrowser/Entities/Enums.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - /// - /// Kind of meters for the procedure / test - /// - public enum MetersKind - { - Single, - Combined, - } - - /// - /// Flow set method Std/ComposedMeter - /// - public enum QSetMethod - { - Std, - ComposedMeter, - Count, - } - - /// - /// Procedure method FSS/SSS - /// - public enum TestMethod2 - { - FSS, - SSS, - Count, - } - - public enum TestRedType - { - Fix, - /// etc. - Count, - } - - public enum FQC1 - { - FQC1, - FQP1, - Count, - } - - public enum Device - { - Screen, - Printer, - Disk, - } - - /// - /// Possible modes of operation of components and devices. - /// - public enum DebugMode - { - DetectedOff = -2, - DetectedOn = -1, - Normal = 0, /// Normal operation - AutoDetect, /// The component (device) will be auto-detected - Off, /// The component is off - Record, - Reply, - Simulate, /// Test bench simulation, this mode does not require any hardware - Inherit, - Count, - } - - public enum LogLevel - { - Off, - Fatal, - Error, - Warn, - Info, - Debug, - All, - Count, - } -} - diff --git a/ResultsBrowser/Entities/FeedingPath.cs b/ResultsBrowser/Entities/FeedingPath.cs deleted file mode 100644 index 9e2b97d16..000000000 --- a/ResultsBrowser/Entities/FeedingPath.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class FeedingPath : IHasItemNr, IHasValves - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual float Qfrom { get; set; } /// Water flow in [m3/h] - public virtual float Qto { get; set; } /// Water flow in [m3/h] - public virtual string Pump { get; set; } - - /// Valves - public virtual string ValvesOpen { get; set; } - public virtual string ValvesClose { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public FeedingPath() - { - } - - public FeedingPath(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public FeedingPath(BenchControl.FeedingPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - Pump = (path.Pump != null) ? path.Pump.Cfg.Name : null; - - string vOpen = string.Empty; - foreach (var valve in path.ValvesOpen) - { - if (vOpen != string.Empty) vOpen += ";"; - vOpen += valve.Cfg.Name; - } - ValvesOpen = vOpen; - - string vClose = string.Empty; - foreach (var valve in path.ValvesClose) - { - if (vClose != string.Empty) vClose += ";"; - vClose += valve.Cfg.Name; - } - ValvesClose = vClose; - } - - public virtual FeedingPath Clone(string name, int itemNr) - { - FeedingPath result = new FeedingPath(name, itemNr); - - result.Qfrom = Qfrom; - result.Qto = Qto; - result.Pump = Pump; - result.ValvesOpen = ValvesOpen; - result.ValvesClose = ValvesClose; - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/Group.cs b/ResultsBrowser/Entities/Group.cs deleted file mode 100644 index 12e004cdf..000000000 --- a/ResultsBrowser/Entities/Group.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class Group - { - public virtual int Id { get; protected set; } - public virtual int Gid { get; set; } - public virtual string Name { get; set; } - } -} diff --git a/ResultsBrowser/Entities/IHasItemNr.cs b/ResultsBrowser/Entities/IHasItemNr.cs deleted file mode 100644 index f62ee62ea..000000000 --- a/ResultsBrowser/Entities/IHasItemNr.cs +++ /dev/null @@ -1,9 +0,0 @@ - -namespace ResultsBrowser.Entities -{ - interface IHasItemNr - { - int Id { get; } - int ItemNr { get; set; } - } -} diff --git a/ResultsBrowser/Entities/IHasValves.cs b/ResultsBrowser/Entities/IHasValves.cs deleted file mode 100644 index 6161f29bb..000000000 --- a/ResultsBrowser/Entities/IHasValves.cs +++ /dev/null @@ -1,9 +0,0 @@ - -namespace ResultsBrowser.Entities -{ - public interface IHasValves - { - string ValvesOpen { get; set; } /// List of valves to be opened - string ValvesClose { get; set; } /// List of valves to be closed - } -} diff --git a/ResultsBrowser/Entities/MeasurementCorrection.cs b/ResultsBrowser/Entities/MeasurementCorrection.cs deleted file mode 100644 index 1a3303c8b..000000000 --- a/ResultsBrowser/Entities/MeasurementCorrection.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace ResultsBrowser.Entities -{ - public class MeasurementCorrection - { - public virtual int Id { get; protected set; } - public virtual float Measurement { get; set; } - public virtual float Correction { get; set; } - } -} diff --git a/ResultsBrowser/Entities/MetersPath.cs b/ResultsBrowser/Entities/MetersPath.cs deleted file mode 100644 index 0111ca705..000000000 --- a/ResultsBrowser/Entities/MetersPath.cs +++ /dev/null @@ -1,157 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class MetersPath : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual float Qfrom { get; set; } /// Water flow in [m3/h] - public virtual float Qto { get; set; } /// Water flow in [m3/h] - - /// Sensors - public virtual string Sensor1 { get; set; } - public virtual string Sensor2 { get; set; } - public virtual string Sensor3 { get; set; } - public virtual string Sensor4 { get; set; } - public virtual string Sensor5 { get; set; } - public virtual string Sensor6 { get; set; } - public virtual string Sensor7 { get; set; } - public virtual string Sensor8 { get; set; } - public virtual string Sensor9 { get; set; } - public virtual string Sensor10 { get; set; } - public virtual string Sensor11 { get; set; } - public virtual string Sensor12 { get; set; } - public virtual string Sensor13 { get; set; } - public virtual string Sensor14 { get; set; } - public virtual string Sensor15 { get; set; } - public virtual string Sensor16 { get; set; } - public virtual string Sensor17 { get; set; } - public virtual string Sensor18 { get; set; } - public virtual string Sensor19 { get; set; } - public virtual string Sensor20 { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public MetersPath() - { - } - - public MetersPath(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public MetersPath(BenchControl.MetersPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - Sensor1 = (path.RegisterReaders[0] != null) ? path.RegisterReaders[0].Cfg.Name : null; -#pragma warning disable - if (Program.WMsCount >= 2) Sensor2 = (path.RegisterReaders[1] != null) ? path.RegisterReaders[1].Cfg.Name : null; - if (Program.WMsCount >= 3) Sensor3 = (path.RegisterReaders[2] != null) ? path.RegisterReaders[2].Cfg.Name : null; - if (Program.WMsCount >= 4) Sensor4 = (path.RegisterReaders[3] != null) ? path.RegisterReaders[3].Cfg.Name : null; - if (Program.WMsCount >= 5) Sensor5 = (path.RegisterReaders[4] != null) ? path.RegisterReaders[4].Cfg.Name : null; - if (Program.WMsCount >= 6) Sensor6 = (path.RegisterReaders[5] != null) ? path.RegisterReaders[5].Cfg.Name : null; - if (Program.WMsCount >= 7) Sensor7 = (path.RegisterReaders[6] != null) ? path.RegisterReaders[6].Cfg.Name : null; - if (Program.WMsCount >= 8) Sensor8 = (path.RegisterReaders[7] != null) ? path.RegisterReaders[7].Cfg.Name : null; - if (Program.WMsCount >= 9) Sensor9 = (path.RegisterReaders[8] != null) ? path.RegisterReaders[8].Cfg.Name : null; - if (Program.WMsCount >= 10) Sensor10 = (path.RegisterReaders[9] != null) ? path.RegisterReaders[9].Cfg.Name : null; - if (Program.WMsCount >= 11) Sensor11 = (path.RegisterReaders[10] != null) ? path.RegisterReaders[10].Cfg.Name : null; - if (Program.WMsCount >= 12) Sensor12 = (path.RegisterReaders[11] != null) ? path.RegisterReaders[11].Cfg.Name : null; - if (Program.WMsCount >= 13) Sensor13 = (path.RegisterReaders[12] != null) ? path.RegisterReaders[12].Cfg.Name : null; - if (Program.WMsCount >= 14) Sensor14 = (path.RegisterReaders[13] != null) ? path.RegisterReaders[13].Cfg.Name : null; - if (Program.WMsCount >= 15) Sensor15 = (path.RegisterReaders[14] != null) ? path.RegisterReaders[14].Cfg.Name : null; - if (Program.WMsCount >= 16) Sensor16 = (path.RegisterReaders[15] != null) ? path.RegisterReaders[15].Cfg.Name : null; - if (Program.WMsCount >= 17) Sensor17 = (path.RegisterReaders[16] != null) ? path.RegisterReaders[16].Cfg.Name : null; - if (Program.WMsCount >= 18) Sensor18 = (path.RegisterReaders[17] != null) ? path.RegisterReaders[17].Cfg.Name : null; - if (Program.WMsCount >= 19) Sensor19 = (path.RegisterReaders[18] != null) ? path.RegisterReaders[18].Cfg.Name : null; - if (Program.WMsCount >= 20) Sensor20 = (path.RegisterReaders[19] != null) ? path.RegisterReaders[19].Cfg.Name : null; -#pragma warning restore - } - - public virtual MetersPath Clone(string name, int itemNr) - { - MetersPath result = new MetersPath(name, itemNr); - result.Qfrom = Qfrom; - result.Qto = Qto; - result.Sensor1 = Sensor1; - result.Sensor2 = Sensor2; - result.Sensor3 = Sensor3; - result.Sensor4 = Sensor4; - result.Sensor5 = Sensor5; - result.Sensor6 = Sensor6; - result.Sensor7 = Sensor7; - result.Sensor8 = Sensor8; - result.Sensor9 = Sensor9; - result.Sensor10 = Sensor10; - result.Sensor11 = Sensor11; - result.Sensor12 = Sensor12; - result.Sensor13 = Sensor13; - result.Sensor14 = Sensor14; - result.Sensor15 = Sensor15; - result.Sensor16 = Sensor16; - result.Sensor17 = Sensor17; - result.Sensor18 = Sensor18; - result.Sensor19 = Sensor19; - result.Sensor20 = Sensor20; - return result; - } - - /// Returns the component name - public virtual string GetSensor(int i) - { - if (i == 0) return Sensor1; - else if (i == 1) return Sensor2; - else if (i == 2) return Sensor3; - else if (i == 3) return Sensor4; - else if (i == 4) return Sensor5; - else if (i == 5) return Sensor6; - else if (i == 6) return Sensor7; - else if (i == 7) return Sensor8; - else if (i == 8) return Sensor9; - else if (i == 9) return Sensor10; - else if (i == 10) return Sensor11; - else if (i == 11) return Sensor12; - else if (i == 12) return Sensor13; - else if (i == 13) return Sensor14; - else if (i == 14) return Sensor15; - else if (i == 15) return Sensor16; - else if (i == 16) return Sensor17; - else if (i == 17) return Sensor18; - else if (i == 18) return Sensor19; - else if (i == 19) return Sensor20; - else return null; - } - - /// Sets the component name - public virtual void SetSensor(int i, string cmpntName) - { - if (i == 0) Sensor1 = cmpntName; - else if (i == 1) Sensor2 = cmpntName; - else if (i == 2) Sensor3 = cmpntName; - else if (i == 3) Sensor4 = cmpntName; - else if (i == 4) Sensor5 = cmpntName; - else if (i == 5) Sensor6 = cmpntName; - else if (i == 6) Sensor7 = cmpntName; - else if (i == 7) Sensor8 = cmpntName; - else if (i == 8) Sensor9 = cmpntName; - else if (i == 9) Sensor10 = cmpntName; - else if (i == 10) Sensor11 = cmpntName; - else if (i == 11) Sensor12 = cmpntName; - else if (i == 12) Sensor13 = cmpntName; - else if (i == 13) Sensor14 = cmpntName; - else if (i == 14) Sensor15 = cmpntName; - else if (i == 15) Sensor16 = cmpntName; - else if (i == 16) Sensor17 = cmpntName; - else if (i == 17) Sensor18 = cmpntName; - else if (i == 18) Sensor19 = cmpntName; - else if (i == 19) Sensor20 = cmpntName; - } - } -} diff --git a/ResultsBrowser/Entities/OutputPath.cs b/ResultsBrowser/Entities/OutputPath.cs deleted file mode 100644 index 5ddcbd938..000000000 --- a/ResultsBrowser/Entities/OutputPath.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class OutputPath : IHasItemNr, IHasValves - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual float Qfrom { get; set; } /// Water flow in [m3/h] - public virtual float Qto { get; set; } /// Water flow in [m3/h] - public virtual string RegulValve { get; set; } - public virtual string FlowMeter { get; set; } - public virtual float PidCoef { get; set; } /// PID coefficient for the regulation path - public virtual string StartValve { get; set; } - public virtual string Diverter { get; set; } - public virtual string TempDiv { get; set; } - public virtual string Balance { get; set; } - public virtual string EmptyTankValve { get; set; } - - /// Valves - public virtual string ValvesOpen { get; set; } - public virtual string ValvesClose { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public OutputPath() - { - } - - public OutputPath(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public OutputPath(BenchControl.OutputPath path) - : this(path.Name, path.ItemNr) - { - Qfrom = path.Qfrom; - Qto = path.Qto; - RegulValve = (path.RegulValve != null) ? path.RegulValve.Cfg.Name : null; - FlowMeter = (path.FlowMeter != null) ? path.FlowMeter.Cfg.Name : null; - PidCoef = path.PidCoef; - StartValve = (path.StartValve != null) ? path.StartValve.Cfg.Name : null; - Diverter = (path.Diverter != null) ? path.Diverter.Cfg.Name : null; - TempDiv = (path.TempDiv != null) ? path.TempDiv.Cfg.Name : null; - Balance = (path.Balance != null) ? path.Balance.Cfg.Name : null; - EmptyTankValve = (path.EmptyTankValve != null) ? path.EmptyTankValve.Cfg.Name : null; - - string vOpen = string.Empty; - foreach (var valve in path.ValvesOpen) - { - if (vOpen != string.Empty) vOpen += ";"; - vOpen += valve.Cfg.Name; - } - ValvesOpen = vOpen; - - string vClose = string.Empty; - foreach (var valve in path.ValvesClose) - { - if (vClose != string.Empty) vClose += ";"; - vClose += valve.Cfg.Name; - } - ValvesClose = vClose; - } - - public virtual OutputPath Clone(string name, int itemNr) - { - OutputPath result = new OutputPath(name, itemNr); - - result.Name = Name; - result.Qfrom = Qfrom; - result.Qto = Qto; - result.RegulValve = RegulValve; - result.FlowMeter = FlowMeter; - result.PidCoef = PidCoef; - result.StartValve = StartValve; - result.Diverter = Diverter; - result.TempDiv = TempDiv; - result.Balance = Balance; - result.EmptyTankValve = EmptyTankValve; - result.ValvesOpen = ValvesOpen; - result.ValvesClose = ValvesClose; - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/Procedure.cs b/ResultsBrowser/Entities/Procedure.cs deleted file mode 100644 index 4ffdbc61f..000000000 --- a/ResultsBrowser/Entities/Procedure.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Collections.Generic; -using TBF.Resources; - -namespace ResultsBrowser.Entities -{ - /// - /// Stores one test procedure, supports revisions and history log - /// - public class Procedure : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual MetersKind MetersKind { get; set; } - public virtual string Description { get; set; } /// Short description - public virtual string CreationUser { get; set; } /// Name of the user who has created or changed this procedure - public virtual DateTime CreationTime { get; set; } /// Date and time of the creation or change - public virtual string LastChgUser { get; set; } /// Name of the user who has created or changed this procedure - public virtual DateTime LastChgTime { get; set; } /// Date and time of the creation or change - public virtual string LongDescription { get; set; } /// Long description (notes) - public virtual string Watermeters { get; set; } /// Water meter name or Id - public virtual string ProtocolTitle { get; set; } /// Title of the printed and saved protocol - - public virtual string DataEntry { get; set; } /// Component to use for data entry - public virtual string ResultsPrinter { get; set; } /// Component to use for printing the results - public virtual string ResultsWriter { get; set; } /// Component to use for saving the results into the file - public virtual string TransitionStart { get; set; } - public virtual string TransitionEnd { get; set; } - - public virtual IList MoreParams { get; set; } - public virtual IList Tests { get; set; } - - ////public virtual string MetrologicalClass { get; set; } - ////public virtual IList WMTypes { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public Procedure() - { - MoreParams = new List(); - Tests = new List(); - - /// - /// Default values - /// - CreationUser = (User.CurrentUser != null) ? User.CurrentUser.Name : null; - CreationTime = DateTime.Now; - LastChgUser = CreationUser; - LastChgTime = CreationTime; - MetersKind = Entities.MetersKind.Single; - ProtocolTitle = "Watermeter test protocol"; - } - - public Procedure(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public virtual Procedure Clone() - { - Procedure result = new Procedure(); - - result.Name = Name; - result.MetersKind = MetersKind; - result.Description = Description; - result.CreationUser = CreationUser; - result.CreationTime = CreationTime; - result.LastChgUser = LastChgUser; - result.LastChgTime = LastChgTime; - result.LongDescription = LongDescription; - result.Watermeters = Watermeters; - result.DataEntry = DataEntry; - result.ResultsPrinter = ResultsPrinter; - result.ResultsWriter = ResultsWriter; - result.TransitionStart = TransitionStart; - result.TransitionEnd = TransitionEnd; - - foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); } - foreach (var test in Tests) { result.Tests.Add(test.Clone()); } - - //result.MetrologicalClass = MetrologicalClass; - //result.WMType = WMType.Clone(); - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/ProcedureHistory.cs b/ResultsBrowser/Entities/ProcedureHistory.cs deleted file mode 100644 index b47a410ec..000000000 --- a/ResultsBrowser/Entities/ProcedureHistory.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class ProcedureHistory - { - public virtual int Id { get; protected set; } - public virtual Procedure Current { get; set; } - public virtual IList OldProcedures { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public ProcedureHistory() - { - Current = new Procedure(); - OldProcedures = new List(); - } - - public virtual ProcedureHistory Clone() - { - ProcedureHistory result = new ProcedureHistory(); - result.Current = Current.Clone(); - foreach (Procedure p in OldProcedures) result.OldProcedures.Add(p.Clone()); - return result; - } - } -} diff --git a/ResultsBrowser/Entities/Test.cs b/ResultsBrowser/Entities/Test.cs deleted file mode 100644 index f3cdc2420..000000000 --- a/ResultsBrowser/Entities/Test.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - /// - /// Test, consisting of one or more repetitions of the test 'SingleTest'. - /// - public class Test : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual int Part { get; set; } /// Part=0 ... test of all WM-s - /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath - public virtual float Qfrom { get; set; } /// Water flow low limit in [m3/h] - public virtual float Qto { get; set; } /// Water flow high limit in [m3/h] - public virtual float Volume { get; set; } /// Test volume (target) in [l] - public virtual float TstTime { get; set; } /// Test time (estimate) in [s] - public virtual int Repeats { get; set; } - public virtual bool Emptying { get; set; } - public virtual bool Zeroing { get; set; } - public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps - public virtual int Time2MassMsrmt { get; set; } /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s] - public virtual string Method { get; set; } - public virtual float ErrLimLo { get; set; } /// in [%] (usually < 0) - public virtual float ErrLimHi { get; set; } /// in [%] (usually > 0) - public virtual double TolerRed { get; set; } /// = Filter - public virtual TestRedType RedType { get; set; } - public virtual string FeedingPath { get; set; } - public virtual string BenchPath { get; set; } - public virtual string OutputPath { get; set; } - public virtual string MetersPath { get; set; } - public virtual string TransitionStart { get; set; } - public virtual string TransitionEnd { get; set; } - - public virtual IList MoreParams { get; set; } - - public virtual Procedure Procedure { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public Test() - { - MoreParams = new List(); - - /// - /// Default values - /// - Repeats = 1; - Emptying = false; - Zeroing = false; - PumpPower = 60.0f; /// [%] - Time2MassMsrmt = 5; /// [s] between the test end and the final mass measurement - ErrLimLo = -2.0f; /// [%] lower error limit - ErrLimHi = 2.0f; /// [%] upper error limit - TolerRed = 5.0; /// = Filter parameter - } - - public Test(string name, int itemNr, Procedure procedure) - : this() - { - Name = name; - ItemNr = itemNr; - Procedure = procedure; - } - - // Makes a new copy of this object (not just a reference) - public virtual Test Clone() - { - Test result = new Test(Name, ItemNr, Procedure); - - result.Part = Part; - result.Qfrom = Qfrom; - result.Qto = Qto; - result.Volume = Volume; - result.TstTime = TstTime; - result.Repeats = Repeats; - result.Emptying = Emptying; - result.Zeroing = Zeroing; - result.PumpPower = PumpPower; - result.Time2MassMsrmt = Time2MassMsrmt; - result.Method = Method; - result.ErrLimLo = ErrLimLo; - result.ErrLimHi = ErrLimHi; - result.TolerRed = TolerRed; - result.RedType = RedType; - result.FeedingPath = FeedingPath; - result.BenchPath = BenchPath; - result.OutputPath = OutputPath; - result.MetersPath = MetersPath; - foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); } - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/TestResult.cs b/ResultsBrowser/Entities/TestResult.cs deleted file mode 100644 index 94621ee89..000000000 --- a/ResultsBrowser/Entities/TestResult.cs +++ /dev/null @@ -1,161 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class TestResult - { - public virtual int Id { get; protected set; } - public virtual string Name { get; set; } - public virtual int BatchNr { get; set; } - public virtual MetersKind MetersKind { get; set; } - public virtual IList Meters { get; set; } - public virtual IList CombinedMeters { get; set; } - - /// Value copied from the procedure (Entities.Procedure) - public virtual string ProcedureName { get; set; } - public virtual string ProtocolTitle { get; set; } - - /// Values copied from the test (Entities.Test) - public virtual int TestId { get; set; } /// Test entity ID to distinguish between tests with the same name - public virtual string TestName { get; set; } - public virtual int Part { get; set; } - public virtual bool DoNotEvaluate { get; set; } /// Not mapped to the database - public virtual bool DoNotPublish { get; set; } /// Not mapped to the database - public virtual float Qfrom { get; set; } /// Water flow low limit in [m3/h] - public virtual float Qto { get; set; } /// Water flow high limit in [m3/h] - public virtual float Volume { get; set; } /// Test volume (target) in [l] - public virtual float TstTime { get; set; } /// Test time (estimate) in [s] - public virtual int Repeats { get; set; } - public virtual bool Emptying { get; set; } - public virtual bool Zeroing { get; set; } - public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps - public virtual int Time2MassMsrmt { get; set; } - public virtual string Method { get; set; } - public virtual float ErrLimLo { get; set; } /// in [%] (usually < 0) - public virtual float ErrLimHi { get; set; } /// in [%] (usually > 0) - - /// To be replaced by the virtual bench component parameters - public virtual string FeedingPath { get; set; } - public virtual string BenchPath { get; set; } - public virtual string OutputPath { get; set; } - public virtual string MetersPath { get; set; } - - /// Results - public virtual DateTime TimeStart { get; set; } /// Date and time of the test start - public virtual DateTime TimeEnd { get; set; } /// Date and time of the test end - public virtual int RepetitionNr { get; set; } /// Repetition number from the set of repeated tests (1...) - public virtual float AmbientTempAve { get; set; } /// Average ambient air temperature [degC] - public virtual float AmbientPressAve { get; set; } /// Average ambient air pressure - public virtual float AmbientHumiAve { get; set; } /// Average ambient air relative humidity [%] - public virtual float PressInAvrg { get; set; } /// Input water pressure (average) [Bar] - public virtual float PressInStart { get; set; } - public virtual float PressInEnd { get; set; } - public virtual float PressOutAvrg { get; set; } - public virtual float PressOutStart { get; set; } - public virtual float PressOutEnd { get; set; } - public virtual float TempInAvrg { get; set; } - public virtual float TempInStart { get; set; } - public virtual float TempInEnd { get; set; } - public virtual float TempOutAvrg { get; set; } - public virtual float TempOutStart { get; set; } - public virtual float TempOutEnd { get; set; } - public virtual float TempDivAvrg { get; set; } - public virtual float TempDivStart { get; set; } - public virtual float TempDivEnd { get; set; } - public virtual float MassStartRaw { get; set; } - public virtual float MassStart { get; set; } - public virtual float MassEndRaw { get; set; } - public virtual float MassEnd { get; set; } - public virtual float MassDiff { get; set; } - public virtual float DensityIn { get; set; } - public virtual float DensityOut { get; set; } - public virtual float DensityDiv { get; set; } - public virtual float Buoyancy { get; set; } ///TODO -> map - public virtual float FlowMass { get; set; } /// from conventional true value - public virtual float FlowVolume { get; set; } /// from conventional true value - public virtual float VolumeCTV { get; set; } /// volume conventional true value - public virtual float VolumeMaster { get; set; } /// volume from the master flow meter - public virtual float Time { get; set; } /// measurement time in seconds - public virtual float ErrorMaster { get; set; } - public virtual float PulsesMaster { get; set; } - public virtual float ConstMaster { get; set; } /// Pulses per liter master flow meter - public virtual float QRise { get; set; } /// Detected Q_rise of a composed meter - public virtual float QFall { get; set; } /// Detected Q_fall of a composed meter - public virtual float TimeDivStart0 { get; set; } - public virtual float TimeDivStart1 { get; set; } - public virtual float TimeDivStart2 { get; set; } - public virtual float TimeDivStart3 { get; set; } - public virtual float TimeDivStart4 { get; set; } - public virtual float TimeDivStart5 { get; set; } - public virtual float TimeDivEnd0 { get; set; } - public virtual float TimeDivEnd1 { get; set; } - public virtual float TimeDivEnd2 { get; set; } - public virtual float TimeDivEnd3 { get; set; } - public virtual float TimeDivEnd4 { get; set; } - public virtual float TimeDivEnd5 { get; set; } - - public TestResult() - { - Meters = new List(); - CombinedMeters = new List(); - } - - public TestResult(MetersKind kind) - : this() - { - MetersKind = kind; - - if (kind == MetersKind.Single) - { - for (int i = 0; i < Program.WMsCount; i++) Meters.Add(new MeterTestResult(this)); - } - else if (kind == MetersKind.Combined) - { - int combinedCount = Program.WMsCount / 2; - for (int i = 0; i < 2 * combinedCount; i++) Meters.Add(new MeterTestResult(this)); - for (int i = 0; i < combinedCount; i++) CombinedMeters.Add(new MeterTestResult(this)); - } - } - - public TestResult(Test test, int repetitionNr, MetersKind kind) - : this(kind) - { - if (test.Repeats == 1) - { - Name = test.Name; - } - else - { - Name = string.Format("{0} ({1}/{2})", test.Name, repetitionNr, test.Repeats); - } - RepetitionNr = repetitionNr; - - /// Copy test parameters from Entities.Procedure object - ProcedureName = test.Procedure.Name; - ProtocolTitle = test.Procedure.ProtocolTitle; - - /// Copy test parameters from Entities.Test object - TestId = test.Id; - TestName = test.Name; - Part = test.Part; - Qfrom = test.Qfrom; - Qto = test.Qto; - Volume = test.Volume; - TstTime = test.TstTime; - Repeats = test.Repeats; - Emptying = test.Emptying; - Zeroing = test.Zeroing; - PumpPower = PumpPower; - Time2MassMsrmt = test.Time2MassMsrmt; - Method = test.Method; - ErrLimLo = test.ErrLimLo; - ErrLimHi = test.ErrLimHi; - - FeedingPath = test.FeedingPath; - BenchPath = test.BenchPath; - OutputPath = test.OutputPath; - MetersPath = test.MetersPath; - } - } -} diff --git a/ResultsBrowser/Entities/TransitionSequence.cs b/ResultsBrowser/Entities/TransitionSequence.cs deleted file mode 100644 index ab48d3fa1..000000000 --- a/ResultsBrowser/Entities/TransitionSequence.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - /// - /// Stores one transition sequence containing a list of transition steps - /// - public class TransitionSequence : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual string Description { get; set; } /// Short description - public virtual IList TransitionSteps { get; set; } - - public TransitionSequence() - { - TransitionSteps = new List(); - } - - public TransitionSequence(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public virtual TransitionSequence Clone() - { - TransitionSequence result = new TransitionSequence(); - result.Name = Name; - result.Description = Description; - foreach (var step in TransitionSteps) { result.TransitionSteps.Add(step.Clone()); } - return result; - } - } -} diff --git a/ResultsBrowser/Entities/TransitionStep.cs b/ResultsBrowser/Entities/TransitionStep.cs deleted file mode 100644 index 8b2751be6..000000000 --- a/ResultsBrowser/Entities/TransitionStep.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class TransitionStep : IHasItemNr, IHasValves - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } /// Order of the preparation step - public virtual int Duration { get; set; } /// Duration in seconds - public virtual string Message { get; set; } /// Message - public virtual string ValvesOpen { get; set; } /// List of valves to be opened - public virtual string ValvesClose { get; set; } /// List of valves to be closed - public virtual string RegulValvesPct { get; set; } /// Positions of regulation valves in % separated by ';' - public virtual string PumpWithFMPcts { get; set; } /// Power of FM controlled pumps in % separated by ';' - - public virtual TransitionSequence TransitionSequence { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public TransitionStep() - { - Duration = 5; /// sec. - } - - public TransitionStep(int itemNr, TransitionSequence sequence) - : this() - { - ItemNr = itemNr; - TransitionSequence = sequence; - } - - public virtual TransitionStep Clone() - { - TransitionStep result = new TransitionStep(ItemNr, TransitionSequence); - result.Duration = Duration; - result.Message = Message; - result.ValvesOpen = ValvesOpen; - result.ValvesClose = ValvesClose; - result.RegulValvesPct = RegulValvesPct; - result.PumpWithFMPcts = PumpWithFMPcts; - return result; - } - - public virtual string ToString(string indent) - { - string result = ""; - result += indent + "ItemNr = " + ItemNr.ToString() + ", "; - result += indent + "Duration = " + Duration.ToString() + ", "; - result += indent + "Message = " + Message + ", "; - result += indent + "ValvesOpen = " + ValvesOpen.ToString() + ", "; - result += indent + "ValvesClose = " + ValvesClose.ToString() + ", "; - result += indent + "RegulValvesPct = " + RegulValvesPct.ToString() + ", "; - result += indent + "PumpsWithFMPct = " + RegulValvesPct.ToString() + Environment.NewLine; - return result; - } - } -} diff --git a/ResultsBrowser/Entities/User.cs b/ResultsBrowser/Entities/User.cs deleted file mode 100644 index 1929b00cd..000000000 --- a/ResultsBrowser/Entities/User.cs +++ /dev/null @@ -1,257 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Text; -using System.Diagnostics; -using TBF.Resources; - -namespace ResultsBrowser.Entities -{ - public class User - { - public virtual int Id { get; protected set; } - public virtual string Name { get; set; } - public virtual string Password { get; set; } - public virtual string Description { get; set; } - public virtual DateTime LastPwChange { get; set; } - public virtual IList Groups { get; set; } //User can be a member of a list of groups - - private bool powerUser; /// Set to tue for built-in users, power users have full access even with empty Groups - - public User() - { - this.powerUser = false; - Groups = new List(); - } - - public virtual void AddGroup(Group group) - { - Groups.Add(group); - } - - - public User(string name) - { - this.powerUser = true; - Name = name; - Groups = new List(); - Description = "Power user"; - } - - /// ------------- Additional stuff not mapped into the database ------------- - - /// - /// Authorized user (static) - /// - private static User currentUser = null; /// Updated by instance methods Authorize, Unauthorize - public static User CurrentUser - { - get { return currentUser; } - set { currentUser = value; } - } - - private static DateTime lastAuthorization = DateTime.Now; - public static DateTime LastAuthorization { get { return lastAuthorization; } } - - /// - /// Check whether user is a member of a group. - /// - /// Group GID - /// true is user is a member of the specified group - public virtual bool IsMemberOf(Grp.GID groupId) - { - if (groupId == Grp.GID.None || powerUser) - { - return true; - } - else if (groupId >= 0 && (int)groupId < Grp.Count) - { - // for all group elements in User.groups - for (int i = 0; i < Groups.Count; ++i) - { - // element GID = parameter GroupId ? - if (((Group)Groups[i]).Gid == (int)groupId) - { - return true; - } - } - return false; - } - else - { - return false; - } - } - - /// - /// Sets users password. It then will be encrypted. - /// - /// Password - public virtual void SetPassword(string password) - { - this.Password = EncryptedPassword(password); - LastPwChange = DateTime.Now; - } - - - public virtual string EncryptedPassword(string password) - { - return getHash(password); - } - - /// - /// Verifies users password. Used by static bool Authorisation(...) - /// - /// Password - /// true if password is correct - public virtual bool CheckPassword(string password) - { - return (Password == EncryptedPassword(password)); - } - - /// - /// The FIRST of TWO possible user authorization method to be used - /// when a specific group membership is required (you can use Grp.GID.None). - /// If the user is not authorized, the current user remains to be a current user - /// (i.e. the access rights were not risen to a higher level). - /// If you require different behavior, use Unauthorize() before calling Authorize(). - /// - /// - /// - /// - /// true = authorized - public virtual bool Authorize(string userName, string password, TBF.Grp.GID requiredGroupMembership) - { - if (Entities.User.IsPowerUser(userName, password)) - { - currentUser = this; - lastAuthorization = DateTime.Now; - return true; - } - - if (Name.ToLower() == userName.ToLower()) - { - if (IsMemberOf(requiredGroupMembership) && CheckPassword(password)) - { - currentUser = this; - lastAuthorization = DateTime.Now; - return true; - } - else - { - return false; - } - } - return false; - } - - /// - /// The SECOND of TWO possible user authorization method to be used when - /// no specific group membership is required. - /// If the user is not authorized, the current user remains to be a current user - /// (i.e. the access rights were not risen to a higher level). - /// If you require different behavior, use Unauthorize() before calling Authorize(). - /// - /// - /// - /// - /// true = authorized - public virtual bool Authorize(string userName, string password) - { - return Authorize(userName, password, Grp.GID.None); - } - - /// - /// Returns a 'User' with a given username from a database. - /// - /// User name for the query - /// reference to a 'User' (if it exists) or null - public static User AuthorizeDummyUser(string username) - { - User user = new User(); - user.Name = username; - currentUser = user; - return user; - } - - /// - /// Returns a 'User' with a given username from an ARBITRARY database. - /// - /// User name for the query - /// reference to a 'User' (if it exists) or null - public static User LoadUserByName(string username, DBSettings dbSettings) - { - IList listOfUsers = FluentCommon.CreateSessionFactory(Database.Users, dbSettings, false) - .OpenSession() - .CreateQuery("FROM User WHERE LOWER(Name) = :username") - .SetParameter("username", username.ToLower()) - .List(); - if (listOfUsers.Count > 0) return listOfUsers[0]; - return null; - } - - /// - /// Returns a 'User' with a given username from the users database. - /// - /// User name for the query - /// reference to a 'User' (if it exists) or null - public static User LoadUserByName(string username) - { - IList listOfUsers = FluentCommon.CreateSession(Database.Users) - .CreateQuery("FROM User WHERE LOWER(Name) = :username") - .SetParameter("username", username.ToLower()) - .List(); - if (listOfUsers.Count > 0) return listOfUsers[0]; - return null; - } - - /// - /// returns an IList of all Users - /// - public static IList GetAllUsers() - { - return FluentCommon.CreateSession(Database.Users) - .CreateQuery("FROM User") - .List(); - } - - - /// - /// Unauthorize, abandon current users authorization. - /// - public static void Unauthorize() - { - currentUser = null; - lastAuthorization = DateTime.Now; - } - - /// - /// getHash encrypts a string - /// - /// the string to encrypt - /// - public static string getHash(string text) - { - byte[] bytes = Encoding.Unicode.GetBytes(text); - SHA512Managed hashstring = new SHA512Managed(); - byte[] hash = hashstring.ComputeHash(bytes); - string hashString = string.Empty; - foreach (byte x in hash) - { - hashString += String.Format("{0:x2}", x); - } - return hashString; - } - - /// - /// Returns 'true' when authentication data are valid for a power user. - /// - /// User name - /// Password - /// true = authenticated, false = refused - public static bool IsPowerUser(string userName, string password) - { - return false; - } - } -} diff --git a/ResultsBrowser/Entities/VirtualBenchSequence.cs b/ResultsBrowser/Entities/VirtualBenchSequence.cs deleted file mode 100644 index af00d579d..000000000 --- a/ResultsBrowser/Entities/VirtualBenchSequence.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class VirtualBenchSequence : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } - public virtual string Name { get; set; } - public virtual string Description { get; set; } /// Short description - public virtual IList VirtualBenchSteps { get; set; } - - public VirtualBenchSequence() - { - VirtualBenchSteps = new List(); - } - - public VirtualBenchSequence(string name, int itemNr) - : this() - { - Name = name; - ItemNr = itemNr; - } - - public virtual VirtualBenchSequence Clone() - { - VirtualBenchSequence result = new VirtualBenchSequence(); - result.Name = Name; - result.Description = Description; - foreach (var step in VirtualBenchSteps) { result.VirtualBenchSteps.Add(step.Clone()); } - return result; - } - } -} diff --git a/ResultsBrowser/Entities/VirtualBenchStep.cs b/ResultsBrowser/Entities/VirtualBenchStep.cs deleted file mode 100644 index 86a979a49..000000000 --- a/ResultsBrowser/Entities/VirtualBenchStep.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ResultsBrowser.Entities -{ - public class VirtualBenchStep : IHasItemNr - { - public virtual int Id { get; protected set; } - public virtual int ItemNr { get; set; } /// Order of the preparation step - public virtual int Duration { get; set; } /// Duration in seconds - /// - - public virtual VirtualBenchSequence VirtualBenchSequence { get; set; } - - /// ------------- Additional stuff not mapped into the database ------------- - - public VirtualBenchStep() - { - Duration = 5; /// sec. - } - - public VirtualBenchStep(int itemNr, VirtualBenchSequence sequence) - : this() - { - ItemNr = itemNr; - VirtualBenchSequence = sequence; - } - - public virtual VirtualBenchStep Clone() - { - VirtualBenchStep result = new VirtualBenchStep(ItemNr, VirtualBenchSequence); - - return result; - } - } -} diff --git a/ResultsBrowser/Entities/WMType.cs b/ResultsBrowser/Entities/WMType.cs deleted file mode 100644 index 780e34b82..000000000 --- a/ResultsBrowser/Entities/WMType.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -/// This class holds the watermeter type specific data -/// that have all watermaters of the same type in common - -namespace ResultsBrowser.Entities -{ - public class WMType - { - // mapped - public virtual int Id { get; protected set; } /// primary key - public virtual DateTime CreateTime { get; set; } /// Date and time of the creation or change - public virtual string CreateUserName { get; set; } /// Name of the user who has created or changed this procedure - public virtual string CreateDescription { get; set; } /// Description\ - - public virtual string Name { get; set; } /// type name - public virtual float PulseRate { get; set; } /// Pulses per Liter - - // not yet mapped - public virtual int IdentNr { get; protected set; } /// identification number of watermeter tzpe - public virtual int Diameter { get; set; } /// nominal diameter - public virtual int Pressure { get; set; } /// nominal pressure - public virtual int Length { get; set; } /// construction length - public virtual int Temperatur { get; set; } /// nominal temperature in C - public virtual float NominalFlow { get; set; } /// nominal flow Qn - - /// ------------- Additional stuff not mapped into the database ------------- - - public WMType() - { - } - - public static WMType DefaultWMType() - { - WMType procedure = new WMType() - { - CreateTime = DateTime.Now, - CreateUserName = User.CurrentUser.Name, - CreateDescription = "A default water meter created.", - Name = "Watermeter", - PulseRate = 1000, - }; - return procedure; - } - - public virtual WMType Clone() - { - WMType result = new WMType(); - - result.CreateTime = CreateTime; - result.CreateUserName = CreateUserName; - result.CreateDescription = CreateDescription; - result.Name = Name; - result.PulseRate = PulseRate; - - return result; - } - - public override string ToString() - { - string result = ""; - result += "WMTpe: " + Environment.NewLine; - result += " Name = " + Name + Environment.NewLine; - result += " Created by = " + CreateUserName + Environment.NewLine; - result += " Created on = " + CreateTime.ToString() + Environment.NewLine; - result += " Description = " + CreateDescription + Environment.NewLine; - result += " Pulse rate = " + PulseRate.ToString() + Environment.NewLine; - return result; - } - } -} - diff --git a/ResultsBrowser/Entities/Watermeter.cs b/ResultsBrowser/Entities/Watermeter.cs deleted file mode 100644 index 83c95c3a2..000000000 --- a/ResultsBrowser/Entities/Watermeter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using TBF; -using NHibernate; -using FluentNHibernate; - -namespace ResultsBrowser.Entities -{ - public class Watermeter - { - public virtual int Id { get; protected set; } /// primary key - - public virtual DateTime CreateTime { get; set; } /// Date and time of the creation or change - public virtual string CreateUserName { get; set; } /// Name of the user who has created or changed this procedure - public virtual string CreateDescription { get; set; } /// Description - - /// mapped - public virtual string Serial { get; set; } /// serial number - public virtual WMType WMType { get; set; } /// type of watermeter - /// - - /// - /// Load a watermeter from the database - /// - public static Watermeter LoadBySerialnr(string SerialNr) - { - IList ListOfWatermeters = FluentCommon.CreateSession(Database.WaterMeters) - .CreateQuery("FROM Watermeter WHERE Serial = :SerialNrParameter") - .SetParameter("SerialNrParameter", SerialNr) - .List(); - if (ListOfWatermeters.Count > 0) return ListOfWatermeters.ElementAt(0); - return null; - } - } -} diff --git a/ResultsBrowser/FluentCommon.cs b/ResultsBrowser/FluentCommon.cs deleted file mode 100644 index f804ee2c6..000000000 --- a/ResultsBrowser/FluentCommon.cs +++ /dev/null @@ -1,316 +0,0 @@ -using System; -using FluentNHibernate.Cfg; -using FluentNHibernate.Cfg.Db; -using NHibernate; -using NHibernate.Cfg; -using NHibernate.Tool.hbm2ddl; - -namespace ResultsBrowser -{ - /// - /// Identifies the content of a database - /// - public enum Database - { - Users, - Bench, - Procedures, - WaterMeters, - Count, - } - - /// - /// Identifies the type of a database - /// - public enum DBType - { - SQLite, /// SQLite - MySql, /// MySQL database - DbTypesCount, - } - - - public static class FluentCommon - { - /// - /// Session factories for regular sessions. - /// - public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Database.Count]; - - /// - /// NHibernate session factory (to create the database session 'SessionFactory') - /// - /// A database session - static ISessionFactory CreateSessionFactory(Database database) - { - DBType dbType; - string connectionString; - - switch (database) - { - default: - case Database.Users: - dbType = Program.CurrentBench.UsersDBSettings.DbType; - connectionString = Program.CurrentBench.UsersDBSettings.ConnectionString; - break; - case Database.Bench: - dbType = Program.CurrentBench.BenchDBSettings.DbType; - connectionString = Program.CurrentBench.BenchDBSettings.ConnectionString; - break; - case Database.Procedures: - dbType = Program.CurrentBench.ProceduresDBSettings.DbType; - connectionString = Program.CurrentBench.ProceduresDBSettings.ConnectionString; - break; - case Database.WaterMeters: - dbType = Program.CurrentBench.WaterMetersDBSettings.DbType; - connectionString = Program.CurrentBench.WaterMetersDBSettings.ConnectionString; - break; - } - - return CreateSessionFactory(database, new DBSettings(dbType, connectionString), false); - } - - /// - /// NHibernate session factory (to create the database session 'SessionFactory') - /// - /// A database session - public static ISessionFactory CreateSessionFactory(Database database, DBSettings dbSettings, bool createDB) - { - try - { - FluentConfiguration cfg = Fluently.Configure(); - - switch (dbSettings.DbType) - { - default: - case DBType.SQLite: - cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(dbSettings.ConnectionString)); - break; - case DBType.MySql: - cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(dbSettings.ConnectionString)); - break; - } - - switch (database) - { - default: - case Database.Users: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); - break; - case Database.Bench: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); - break; - case Database.Procedures: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); - break; - case Database.WaterMeters: - cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf()); - break; - } - - if (createDB) - { - return cfg.ExposeConfiguration(BuildSchemaCreate).BuildSessionFactory(); - } - else - { - return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory(); - } - } - catch (Exception) - { - return null; - } - } - - public delegate void BuildSchemaDlgt(Configuration config); - - static void BuildSchema(Configuration config) - { - /// This NHibernate tool takes a configuration (with mapping info in) - /// and exports a database schema from it - new SchemaExport(config).SetOutputFile("db_schema"); - } - - static void BuildSchemaCreate(Configuration config) - { - /// This NHibernate tool takes a configuration (with mapping info in) - /// and exports a database schema from it - new SchemaExport(config).Create(true, true); - } - - /// Create a NHibernate session for the given database - public static ISession CreateSession(Database database) - { - int ix = (int)database; - if (ix < 0 || ix >= (int)Database.Count) return null; - - if (SessionFactories[ix] == null) SessionFactories[ix] = CreateSessionFactory(database); - - return SessionFactories[ix].OpenSession(); - } - - public static void SaveToDb(Database database, object obj) - { - ISession session = FluentCommon.CreateSession(database); - SaveToDb(session, obj); - } - - public static void SaveToDb(ISession session, object obj) - { - using (var transaction = session.BeginTransaction()) - { - session.SaveOrUpdate(obj); - try { transaction.Commit(); } - catch { } - } - } - - public static void DeleteFromDb(Database database, object obj) - { - ISession session = FluentCommon.CreateSession(database); - SaveToDb(session, obj); - } - - public static void DeleteFromDb(ISession session, object obj) - { - using (var transaction = session.BeginTransaction()) - { - session.Delete(obj); - transaction.Commit(); - } - } - - /// - /// Create an empty users database. - /// Database contains only the user 'admin' and the control board component 'CB'. - /// - /// DBType.SQLite or DBType.MySql - /// Connection string - /// true=success, false=error - public static bool CreateEmptyUsersDB(DBSettings dbSettings) - { - ISessionFactory sessionFactory = CreateSessionFactory(Database.Users, dbSettings, true); - if (sessionFactory == null) return false; - - /// Populate the database - using (var session = sessionFactory.OpenSession()) - { - using (var transaction = session.BeginTransaction()) - { - /// - /// Prepare all groups - /// - var testers = new Entities.Group { Gid = (int)TBF.Grp.GID.Testers, Name = Strings.Tester }; - var testingSpecialists = new Entities.Group { Gid = (int)TBF.Grp.GID.TestingSpecialists, Name = Strings.Testing_Specialist }; - var headOfLab = new Entities.Group { Gid = (int)TBF.Grp.GID.HeadOfLab, Name = Strings.Head_of_Lab }; - var maintenanceSpecialists = new Entities.Group { Gid = (int)TBF.Grp.GID.MaintenanceSpecialists, Name = Strings.Maintenance_Specialist }; - var metrologists = new Entities.Group { Gid = (int)TBF.Grp.GID.Metrologists, Name = Strings.Metrologist }; - var calibrationSpecialists = new Entities.Group { Gid = (int)TBF.Grp.GID.CalibrationSpecialists, Name = Strings.Calibration_Specialist }; - var administrators = new Entities.Group { Gid = (int)TBF.Grp.GID.Administrators, Name = Strings.Administrator }; - - /// Create the user 'admin' add his groups - var admin = new Entities.User - { - Name = Program.AdminUsername, - Description = "Administrator", - LastPwChange = DateTime.Now - }; - admin.SetPassword(Program.AdminPassword); - admin.AddGroup(testers); - admin.AddGroup(testingSpecialists); - admin.AddGroup(headOfLab); - admin.AddGroup(maintenanceSpecialists); - admin.AddGroup(metrologists); - admin.AddGroup(calibrationSpecialists); - admin.AddGroup(administrators); - - session.SaveOrUpdate(admin); - - /// Create the control board component - var cmpnt = (new BenchControl.Elde.ControlBoardCfg(new BenchControl.Elde.ControlBoardFactory())).CreateDbEntity(); - session.SaveOrUpdate(cmpnt); - - transaction.Commit(); - } - } - - return true; - } - - /// - /// Create an empty bench database - /// - /// DBType.SQLite or DBType.MySql - /// Connection string - /// true=success, false=error - public static bool CreateEmptyBenchDB(DBSettings dbSettings) - { - ISessionFactory sessionFactory = CreateSessionFactory(Database.Users, dbSettings, true); - if (sessionFactory == null) return false; - - /// Populate the database - //using (var session = sessionFactory.OpenSession()) - //{ - // using (var transaction = session.BeginTransaction()) - // { - // /// Create one component - // var cmpnt = (new BenchControl.Elde.ControlBoardCfg("CB", 1)).CreateDbEntity(); - // session.SaveOrUpdate(cmpnt); - // transaction.Commit(); - // } - //} - return true; - } - - /// - /// Create an empty procedures database - /// - /// DBType.SQLite or DBType.MySql - /// Connection string - /// true=success, false=error - public static bool CreateEmptyProceduresDB(DBSettings dbSettings) - { - ISessionFactory sessionFactory = CreateSessionFactory(Database.Users, dbSettings, true); - if (sessionFactory == null) return false; - - /// Populate the database - //using (var session = sessionFactory.OpenSession()) - //{ - // using (var transaction = session.BeginTransaction()) - // { - // /// Create one component - // var cmpnt = (new BenchControl.Elde.ControlBoardCfg("CB", 1)).CreateDbEntity(); - // session.SaveOrUpdate(cmpnt); - // transaction.Commit(); - // } - //} - return true; - } - - /// - /// Create an empty water meters database - /// - /// DBType.SQLite or DBType.MySql - /// Connection string - /// true=success, false=error - public static bool CreateEmptyWaterMetersDB(DBSettings dbSettings) - { - ISessionFactory sessionFactory = CreateSessionFactory(Database.Users, dbSettings, true); - if (sessionFactory == null) return false; - - /// Populate the database - //using (var session = sessionFactory.OpenSession()) - //{ - // using (var transaction = session.BeginTransaction()) - // { - // /// Create one component - // var cmpnt = (new BenchControl.Elde.ControlBoardCfg("CB", 1)).CreateDbEntity(); - // session.SaveOrUpdate(cmpnt); - // transaction.Commit(); - // } - //} - return true; - } - } -} diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs index 3fa833264..d7b93b604 100644 --- a/ResultsBrowser/LocalSettings.cs +++ b/ResultsBrowser/LocalSettings.cs @@ -37,10 +37,10 @@ namespace ResultsBrowser /// Names and database settings of test benches. /// [XmlArrayAttribute("TestBenches")] - public DatabaseSettings[] testBenches; + public Config.DatabaseSettings[] testBenches; [XmlIgnore] - public DatabaseSettings[] TestBenches { get { return testBenches; } } + public Config.DatabaseSettings[] TestBenches { get { return testBenches; } } [XmlIgnore] public int BenchesCount { get { return (testBenches != null) ? testBenches.GetLength(0) : 0; } } @@ -130,8 +130,8 @@ namespace ResultsBrowser public int OneProcedureDlgHeight; /// Configuration of results - public Forms.ResultsConfig.Meters ResultsConfigMeters; - public Forms.ResultsConfig.TestsAre ResultsConfigTests; + public Config.Entities.MetersArrangement ResultsConfigMeters; + public Config.Entities.TestsArrangement ResultsConfigTests; public string[] RsltItems_Screen_SingleWM; public string[] RsltItems_Screen_CombinedWM; public string[] RsltItems_Printer_SingleWM; diff --git a/ResultsBrowser/Mappings/BenchPathMap.cs b/ResultsBrowser/Mappings/BenchPathMap.cs deleted file mode 100644 index 586bcc63a..000000000 --- a/ResultsBrowser/Mappings/BenchPathMap.cs +++ /dev/null @@ -1,27 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class BenchPathMap : ClassMap - { - public BenchPathMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Qfrom); - Map(x => x.Qto); - Map(x => x.TempIn); - Map(x => x.TempOut); - Map(x => x.PressIn); - Map(x => x.PressOut); - Map(x => x.ValvesOpen) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - Map(x => x.ValvesClose) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - } - } -} diff --git a/ResultsBrowser/Mappings/ComponentMap.cs b/ResultsBrowser/Mappings/ComponentMap.cs deleted file mode 100644 index 3656f1ff6..000000000 --- a/ResultsBrowser/Mappings/ComponentMap.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class ComponentMap : ClassMap - { - public ComponentMap() - { - Id(x => x.Id); - Map(x => x.Name); - Map(x => x.ClassName); - Map(x => x.ParentName); - Map(x => x.ItemNr); - Map(x => x.Mode); - Map(x => x.Logging); - Map(x => x.Parameters) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - HasMany(x => x.Corrections) - .OrderBy("Measurement") - .Cascade.All(); - } - } -} diff --git a/ResultsBrowser/Mappings/ComponentProcedureMap.cs b/ResultsBrowser/Mappings/ComponentProcedureMap.cs deleted file mode 100644 index a2f5dd022..000000000 --- a/ResultsBrowser/Mappings/ComponentProcedureMap.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class ComponentProcedureMap : ClassMap - { - public ComponentProcedureMap() - { - Id(x => x.Id); - Map(x => x.CmpntName); - Map(x => x.Parameters) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - - References(x => x.Procedure); - } - } -} diff --git a/ResultsBrowser/Mappings/ComponentTestMap.cs b/ResultsBrowser/Mappings/ComponentTestMap.cs deleted file mode 100644 index 2f9498a79..000000000 --- a/ResultsBrowser/Mappings/ComponentTestMap.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class ComponentTestMap : ClassMap - { - public ComponentTestMap() - { - Id(x => x.Id); - Map(x => x.CmpntName); - Map(x => x.Parameters) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - - References(x => x.Test); - } - } -} diff --git a/ResultsBrowser/Mappings/FeedingPathMap.cs b/ResultsBrowser/Mappings/FeedingPathMap.cs deleted file mode 100644 index c5d53f3f0..000000000 --- a/ResultsBrowser/Mappings/FeedingPathMap.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class FeedingPathMap : ClassMap - { - public FeedingPathMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Qfrom); - Map(x => x.Qto); - Map(x => x.Pump); - Map(x => x.ValvesOpen) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - Map(x => x.ValvesClose) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - } - } -} diff --git a/ResultsBrowser/Mappings/GroupMap.cs b/ResultsBrowser/Mappings/GroupMap.cs deleted file mode 100644 index 42ac15c3d..000000000 --- a/ResultsBrowser/Mappings/GroupMap.cs +++ /dev/null @@ -1,14 +0,0 @@ -using FluentNHibernate.Mapping; - -namespace ResultsBrowser.Mappings -{ - class GroupMap : ClassMap - { - public GroupMap() - { - Id(x => x.Id); - Map(x => x.Gid); - Map(x => x.Name); - } - } -} diff --git a/ResultsBrowser/Mappings/MeasurementCorrectionMap.cs b/ResultsBrowser/Mappings/MeasurementCorrectionMap.cs deleted file mode 100644 index f6069dafd..000000000 --- a/ResultsBrowser/Mappings/MeasurementCorrectionMap.cs +++ /dev/null @@ -1,15 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class MeasurementCorrectionMap : ClassMap - { - public MeasurementCorrectionMap() - { - Id(x => x.Id); - Map(x => x.Measurement); - Map(x => x.Correction); - } - } -} diff --git a/ResultsBrowser/Mappings/MetersPathMap.cs b/ResultsBrowser/Mappings/MetersPathMap.cs deleted file mode 100644 index 75ab947c7..000000000 --- a/ResultsBrowser/Mappings/MetersPathMap.cs +++ /dev/null @@ -1,39 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class MetersPathMap : ClassMap - { - public MetersPathMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Qfrom); - Map(x => x.Qto); - Map(x => x.Sensor1); -#pragma warning disable - if (Program.WMsCount >= 2) Map(x => x.Sensor2); - if (Program.WMsCount >= 3) Map(x => x.Sensor3); - if (Program.WMsCount >= 4) Map(x => x.Sensor4); - if (Program.WMsCount >= 5) Map(x => x.Sensor5); - if (Program.WMsCount >= 6) Map(x => x.Sensor6); - if (Program.WMsCount >= 7) Map(x => x.Sensor7); - if (Program.WMsCount >= 8) Map(x => x.Sensor8); - if (Program.WMsCount >= 9) Map(x => x.Sensor9); - if (Program.WMsCount >= 10) Map(x => x.Sensor10); - if (Program.WMsCount >= 11) Map(x => x.Sensor11); - if (Program.WMsCount >= 12) Map(x => x.Sensor12); - if (Program.WMsCount >= 13) Map(x => x.Sensor13); - if (Program.WMsCount >= 14) Map(x => x.Sensor14); - if (Program.WMsCount >= 15) Map(x => x.Sensor15); - if (Program.WMsCount >= 16) Map(x => x.Sensor16); - if (Program.WMsCount >= 17) Map(x => x.Sensor17); - if (Program.WMsCount >= 18) Map(x => x.Sensor18); - if (Program.WMsCount >= 19) Map(x => x.Sensor19); - if (Program.WMsCount >= 20) Map(x => x.Sensor20); -#pragma warning restore - } - } -} diff --git a/ResultsBrowser/Mappings/OutputPathMap.cs b/ResultsBrowser/Mappings/OutputPathMap.cs deleted file mode 100644 index f91868b6b..000000000 --- a/ResultsBrowser/Mappings/OutputPathMap.cs +++ /dev/null @@ -1,31 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class OutputPathMap : ClassMap - { - public OutputPathMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Qfrom); - Map(x => x.Qto); - Map(x => x.RegulValve); - Map(x => x.FlowMeter); - Map(x => x.PidCoef); - Map(x => x.StartValve); - Map(x => x.Diverter); - Map(x => x.TempDiv); - Map(x => x.Balance); - Map(x => x.EmptyTankValve); - Map(x => x.ValvesOpen) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - Map(x => x.ValvesClose) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - } - } -} diff --git a/ResultsBrowser/Mappings/ProcedureMap.cs b/ResultsBrowser/Mappings/ProcedureMap.cs deleted file mode 100644 index 9ec5a77b5..000000000 --- a/ResultsBrowser/Mappings/ProcedureMap.cs +++ /dev/null @@ -1,36 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class ProcedureMap : ClassMap - { - public ProcedureMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.MetersKind); - Map(x => x.Description); - Map(x => x.CreationUser); - Map(x => x.CreationTime); - Map(x => x.LastChgUser); - Map(x => x.LastChgTime); - Map(x => x.LongDescription); - Map(x => x.Watermeters); - Map(x => x.ProtocolTitle); - Map(x => x.DataEntry); - Map(x => x.ResultsPrinter); - Map(x => x.ResultsWriter); - Map(x => x.TransitionStart); - Map(x => x.TransitionEnd); - ////Map(x => x.MetrologicalClass); - ////HasOne(x => x.WMType); - HasMany(x => x.MoreParams) - .Cascade.All(); - HasMany(x => x.Tests) - .OrderBy("ItemNr") - .Cascade.All(); - } - } -} diff --git a/ResultsBrowser/Mappings/TestMap.cs b/ResultsBrowser/Mappings/TestMap.cs deleted file mode 100644 index 69d6a2b59..000000000 --- a/ResultsBrowser/Mappings/TestMap.cs +++ /dev/null @@ -1,39 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class TestMap : ClassMap - { - public TestMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Part); - Map(x => x.Qfrom); - Map(x => x.Qto); - Map(x => x.Volume); - Map(x => x.TstTime); - Map(x => x.Repeats); - Map(x => x.Emptying); - Map(x => x.Zeroing); - Map(x => x.PumpPower); - Map(x => x.Time2MassMsrmt); - Map(x => x.Method); - Map(x => x.ErrLimLo); - Map(x => x.ErrLimHi); - Map(x => x.TolerRed); /// ??? - Map(x => x.RedType); /// ??? - Map(x => x.FeedingPath); - Map(x => x.BenchPath); - Map(x => x.OutputPath); - Map(x => x.MetersPath); - Map(x => x.TransitionStart); - Map(x => x.TransitionEnd); - HasMany(x => x.MoreParams) - .Cascade.All(); - References(x => x.Procedure); - } - } -} diff --git a/ResultsBrowser/Mappings/TransitionSequenceMap.cs b/ResultsBrowser/Mappings/TransitionSequenceMap.cs deleted file mode 100644 index 4b326cb28..000000000 --- a/ResultsBrowser/Mappings/TransitionSequenceMap.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class TransitionSequenceMap : ClassMap - { - public TransitionSequenceMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Description); - HasMany(x => x.TransitionSteps) - .OrderBy("ItemNr") - .Cascade.All(); - } - } -} diff --git a/ResultsBrowser/Mappings/TransitionStepMap.cs b/ResultsBrowser/Mappings/TransitionStepMap.cs deleted file mode 100644 index fc15b9e2c..000000000 --- a/ResultsBrowser/Mappings/TransitionStepMap.cs +++ /dev/null @@ -1,26 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class TransitionStepMap : ClassMap - { - public TransitionStepMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Duration); - Map(x => x.Message); - Map(x => x.ValvesOpen) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - Map(x => x.ValvesClose) - .CustomType("StringClob") - .CustomSqlType("varchar(8000)"); - Map(x => x.RegulValvesPct); - Map(x => x.PumpWithFMPcts); - - References(x => x.TransitionSequence); - } - } -} diff --git a/ResultsBrowser/Mappings/UserMap.cs b/ResultsBrowser/Mappings/UserMap.cs deleted file mode 100644 index 0e4ee9bc8..000000000 --- a/ResultsBrowser/Mappings/UserMap.cs +++ /dev/null @@ -1,18 +0,0 @@ -using FluentNHibernate.Mapping; - -namespace ResultsBrowser.Mappings -{ - class UserMap : ClassMap - { - public UserMap() - { - Id(x => x.Id); - Map(x => x.Name); - Map(x => x.Password); - Map(x => x.Description); - Map(x => x.LastPwChange); - HasMany(x => x.Groups) - .Cascade.All(); - } - } -} diff --git a/ResultsBrowser/Mappings/VirtualBenchSequenceMap.cs b/ResultsBrowser/Mappings/VirtualBenchSequenceMap.cs deleted file mode 100644 index 4e71ef99d..000000000 --- a/ResultsBrowser/Mappings/VirtualBenchSequenceMap.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class VirtualBenchSequenceMap : ClassMap - { - public VirtualBenchSequenceMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Name); - Map(x => x.Description); - HasMany(x => x.VirtualBenchSteps) - .OrderBy("ItemNr") - .Cascade.All(); - } - } -} diff --git a/ResultsBrowser/Mappings/VirtualBenchStepMap.cs b/ResultsBrowser/Mappings/VirtualBenchStepMap.cs deleted file mode 100644 index a3fae516f..000000000 --- a/ResultsBrowser/Mappings/VirtualBenchStepMap.cs +++ /dev/null @@ -1,17 +0,0 @@ -using FluentNHibernate.Mapping; -using ResultsBrowser.Entities; - -namespace ResultsBrowser.Mappings -{ - class VirtualBenchStepMap : ClassMap - { - public VirtualBenchStepMap() - { - Id(x => x.Id); - Map(x => x.ItemNr); - Map(x => x.Duration); - - References(x => x.VirtualBenchSequence); - } - } -} diff --git a/ResultsBrowser/Mappings/WMTypeMap.cs b/ResultsBrowser/Mappings/WMTypeMap.cs deleted file mode 100644 index 2da440717..000000000 --- a/ResultsBrowser/Mappings/WMTypeMap.cs +++ /dev/null @@ -1,17 +0,0 @@ -using FluentNHibernate.Mapping; - -namespace ResultsBrowser.Mappings -{ - class WMTypeMap : ClassMap - { - public WMTypeMap() - { - Id(x => x.Id); - Map(x => x.CreateTime); - Map(x => x.CreateUserName); - Map(x => x.CreateDescription); - Map(x => x.Name); - Map(x => x.PulseRate); - } - } -} diff --git a/ResultsBrowser/Mappings/WatermeterMap.cs b/ResultsBrowser/Mappings/WatermeterMap.cs deleted file mode 100644 index e71b78ae3..000000000 --- a/ResultsBrowser/Mappings/WatermeterMap.cs +++ /dev/null @@ -1,16 +0,0 @@ -using FluentNHibernate.Mapping; - -namespace ResultsBrowser.Mappings -{ - class WatermeterMap : ClassMap - { - public WatermeterMap() - { - Id(x => x.Id); - Map(x => x.Serial); - // HasOne(x => x.WMType) - // .Cascade.All(); - References(x => x.WMType); - } - } -} diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs index c0038fed0..96933fb5d 100644 --- a/ResultsBrowser/Program.cs +++ b/ResultsBrowser/Program.cs @@ -6,18 +6,13 @@ using System.IO; using System.Collections.Generic; using System.Windows.Forms; using log4net; +using Config.Entities; using ResultsBrowser.Forms; -using ResultsBrowser.Entities; - -using NHibernate; namespace ResultsBrowser { public class Program { - public const string AdminUsername = "admin"; - public const string AdminPassword = "staratura"; - public const string HomeDir = "C:\\Tbf\\"; /// Contains subdirectories Results, Logs, Images, ... /// log4net @@ -28,35 +23,6 @@ namespace ResultsBrowser public static LocalSettings LocalSettings = new LocalSettings(); public const string LocalSettingsFileName = "config.xml"; - /// Database related: This object reference is set after a successful user login - public static DatabaseSettings CurrentBench; - const string SQLiteDbFName = "SQLite.db"; - -#if MUNICH - public const int WMsCount = 3; - public const int LineSize = 1; - public const int CompoundWMsCount = 1; -#elif DN100 || BADGER_VELKA_TRAT - public const int WMsCount = 3; - public const int LineSize = 3; - public const int CompoundWMsCount = 1; -#elif FUZHOU300 || FUZHOU150 || PT200IL - public const int WMsCount = 6; - public const int LineSize = 6; - public const int CompoundWMsCount = 3; -#elif TORINO50 || BADGER_MALA_TRAT - public const int WMsCount = 6; - public const int LineSize = 6; - public const int CompoundWMsCount = 1; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 - public const int WMsCount = 20; - public const int LineSize = 10; - public const int CompoundWMsCount = 1; -#elif IPERLST - public const int WMsCount = 40; - public const int LineSize = 20; - public const int CompoundWMsCount = 1; -#endif /// /// Selected procedure data @@ -69,7 +35,7 @@ namespace ResultsBrowser /// of procedure data and uses them for the test. Changes of 'SelectedProcedure' /// done during the test do not have any influence on the currently running test. /// - public static Entities.Procedure SelectedProcedure = null; + public static Config.Entities.Procedure SelectedProcedure = null; /// /// Main window object. @@ -102,11 +68,11 @@ namespace ResultsBrowser string sampleConfig = Application.StartupPath + Path.DirectorySeparatorChar + "SampleConfig" + Path.DirectorySeparatorChar; if (File.Exists(sampleConfig + LocalSettingsFileName)) { File.Copy(sampleConfig + LocalSettingsFileName, LocalSettingsFileName); } if (File.Exists(sampleConfig + log4netConfigFName)) { File.Copy(sampleConfig + log4netConfigFName, log4netConfigFName); } - if (File.Exists(sampleConfig + SQLiteDbFName)) { File.Copy(sampleConfig + SQLiteDbFName, SQLiteDbFName); } + if (File.Exists(sampleConfig + Config.Data.SQLiteDbFName)) { File.Copy(sampleConfig + Config.Data.SQLiteDbFName, Config.Data.SQLiteDbFName); } File.SetAttributes(LocalSettingsFileName, FileAttributes.Normal); File.SetAttributes(log4netConfigFName, FileAttributes.Normal); - File.SetAttributes(SQLiteDbFName, FileAttributes.Normal); + File.SetAttributes(Config.Data.SQLiteDbFName, FileAttributes.Normal); } else { @@ -176,22 +142,22 @@ namespace ResultsBrowser { if (LocalSettings.TestBenches[i].BenchName == loginDlgBench.BenchName) { - Entities.User loadedUser = null; + User loadedUser = null; try { bool authorized = false; - if (Entities.User.IsPowerUser(loginDlgBench.User, loginDlgBench.Password)) + if (User.IsPowerUser(loginDlgBench.User, loginDlgBench.Password)) { - loadedUser = new Entities.User(loginDlgBench.User); + loadedUser = new User(loginDlgBench.User); authorized = loadedUser.Authorize(loginDlgBench.User, loginDlgBench.Password); } if (!authorized) { /// Load user from the UsersAndGroupsDB database - loadedUser = Entities.User.LoadUserByName(loginDlgBench.User, - LocalSettings.TestBenches[i].UsersDBSettings); + loadedUser = User.LoadUserByName(loginDlgBench.User, + LocalSettings.TestBenches[i].UsersDBSettings); if (loadedUser != null) { authorized = loadedUser.Authorize(loginDlgBench.User, loginDlgBench.Password); @@ -205,10 +171,10 @@ namespace ResultsBrowser /// Copy the selected bench settings to CurrentBench. /// Clone() guarantees that current bench settings wont be modified /// when user modifies the database settings in DatabaseSettingsDlg. - CurrentBench = (DatabaseSettings)LocalSettings.TestBenches[i].Clone(); + Config.Data.CurrentBench = (Config.DatabaseSettings)LocalSettings.TestBenches[i].Clone(); /// Save the selection to local settings - LocalSettings.LastBenchName = CurrentBench.BenchName; + LocalSettings.LastBenchName = Config.Data.CurrentBench.BenchName; retryLogin = false; break; @@ -249,10 +215,10 @@ namespace ResultsBrowser /// if (LocalSettings.LastProcedureName != null) { - IList listOfProcedures = FluentCommon.CreateSession(Database.Procedures) + IList listOfProcedures = Config.FluentCommon.CreateSession(Config.Database.Procedures) .CreateQuery("FROM Procedure WHERE ProcedureState = 'Active' AND Name = :procName") .SetParameter("procName", LocalSettings.LastProcedureName) - .List(); + .List(); if (listOfProcedures.Count == 1) { diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index 77561aae9..b097721e0 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -34,21 +34,9 @@ 4 - - ..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll - - - ..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll - - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll - - - ..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll - @@ -67,33 +55,6 @@ BenchesDlg.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - Form @@ -119,26 +80,6 @@ MainWnd.cs - - - - - - - - - - - - - - - - - - - - @@ -184,7 +125,12 @@ True - + + + {743DF7DB-C7B6-42EB-986D-0F485E5588E4} + Config + +