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

TBF.UI.Results namespace --> TBF.UI.ResultsMI, etc.

Browse Source
This commit is contained in:
Milan Hanajik 2019-11-22 09:17:16 +01:00
parent e9c6f58e0d
commit a43031c0a5
58 changed files with 691 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Config/Entities/Enums.cs
View File

@ -85,9 +85,18 @@ namespace Config.Entities
public enum ProfileType
{
One,
Two,
Three,
Q3R,
QnClassLT15,
QnClassGT15,
QpQi,
Manual,
Count,
}
public enum ErrorLimitType
{
Manual,
QpClass,
Count,
}

11
Config/Entities/Profile.cs
View File

@ -16,12 +16,13 @@ namespace Config.Entities
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 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 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 ProfileType ProfileType { get; set; }
public virtual ErrorLimitType ErrorLimitType { get; set; }
public virtual IList<PTest> Tests { get; set; }

3
Config/Mappings/ProfileMap.cs
View File

@ -19,7 +19,8 @@ namespace Config.Mappings
Map(x => x.LastChgUser);
Map(x => x.LastChgTime);
Map(x => x.ProfileType);
HasMany(x => x.Tests)
Map(x => x.ErrorLimitType);
HasMany(x => x.Tests)
.OrderBy("ItemNr")
.Cascade.All();
}

36
TBF/Resources/Strings.Designer.cs generated
View File

@ -3778,20 +3778,11 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Q from [l/h].
/// Looks up a localized string similar to Q from.
/// </summary>
internal static string Q_from_lph {
internal static string Q_from {
get {
return ResourceManager.GetString("Q_from_lph", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Q from [m3/h].
/// </summary>
internal static string Q_from_m3h {
get {
return ResourceManager.GetString("Q_from_m3h", resourceCulture);
return ResourceManager.GetString("Q_from", resourceCulture);
}
}
@ -3805,29 +3796,20 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Q tg [m3/h].
/// Looks up a localized string similar to Q tg.
/// </summary>
internal static string Q_tg_m3h {
internal static string Q_tg {
get {
return ResourceManager.GetString("Q_tg_m3h", resourceCulture);
return ResourceManager.GetString("Q_tg", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Q to [l/h].
/// Looks up a localized string similar to Q to.
/// </summary>
internal static string Q_to_lph {
internal static string Q_to {
get {
return ResourceManager.GetString("Q_to_lph", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Q to [m3/h].
/// </summary>
internal static string Q_to_m3h {
get {
return ResourceManager.GetString("Q_to_m3h", resourceCulture);
return ResourceManager.GetString("Q_to", resourceCulture);
}
}

12
TBF/Resources/Strings.cs.resx
View File

@ -723,24 +723,12 @@
<data name="Q_from" xml:space="preserve">
<value>Q od</value>
</data>
<data name="Q_from_lph" xml:space="preserve">
<value>Q od [l/h]</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q od [m3/h]</value>
</data>
<data name="Q_set_method_chdr" xml:space="preserve">
<value>Q-Set Metoda</value>
</data>
<data name="Q_to" xml:space="preserve">
<value>Q do</value>
</data>
<data name="Q_to_lph" xml:space="preserve">
<value>Q do [l / h]</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q do [m3/h]</value>
</data>
<data name="Qfall" xml:space="preserve">
<value>Qfall</value>
</data>

6
TBF/Resources/Strings.de.resx
View File

@ -312,18 +312,12 @@
<data name="Q_from_lph" xml:space="preserve">
<value>Q von [l/h]</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q von [m3/h]</value>
</data>
<data name="Q_set_method_chdr" xml:space="preserve">
<value>Q-Set Methode</value>
</data>
<data name="Q_to_lph" xml:space="preserve">
<value>Q bis [l/h]</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q bis [m3/h]</value>
</data>
<data name="Red_type_chdr" xml:space="preserve">
<value>Reduktionsart</value>
</data>

8
TBF/Resources/Strings.it.resx
View File

@ -189,11 +189,11 @@
<data name="P_out" xml:space="preserve">
<value>P giù</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q da [m3/h]</value>
<data name="Q_from" xml:space="preserve">
<value>Q da</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q a [m3/h]</value>
<data name="Q_to" xml:space="preserve">
<value>Q a</value>
</data>
<data name="Reference" xml:space="preserve">
<value>referenze</value>

6
TBF/Resources/Strings.pl.resx
View File

@ -678,9 +678,6 @@
<data name="Q_from_lph" xml:space="preserve">
<value>Q od [l/h]</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q od [m3/h]</value>
</data>
<data name="Q_set_method_chdr" xml:space="preserve">
<value>Metoda Q-Set</value>
</data>
@ -690,9 +687,6 @@
<data name="Q_to_lph" xml:space="preserve">
<value>Q do [l/h]</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q od [m3/h]</value>
</data>
<data name="Qfall" xml:space="preserve">
<value>Qopad</value>
</data>

18
TBF/Resources/Strings.resx
View File

@ -186,11 +186,11 @@
<data name="P_out" xml:space="preserve">
<value>P dn</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q from [m3/h]</value>
<data name="Q_from" xml:space="preserve">
<value>Q from</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q to [m3/h]</value>
<data name="Q_to" xml:space="preserve">
<value>Q to</value>
</data>
<data name="Reference" xml:space="preserve">
<value>Reference</value>
@ -387,12 +387,6 @@
<data name="Output_chdr" xml:space="preserve">
<value>Output</value>
</data>
<data name="Q_from_lph" xml:space="preserve">
<value>Q from [l/h]</value>
</data>
<data name="Q_to_lph" xml:space="preserve">
<value>Q to [l/h]</value>
</data>
<data name="Red_type_chdr" xml:space="preserve">
<value>Red. type</value>
</data>
@ -2089,8 +2083,8 @@
<data name="Draining_before" xml:space="preserve">
<value>Draining before</value>
</data>
<data name="Q_tg_m3h" xml:space="preserve">
<value>Q tg [m3/h]</value>
<data name="Q_tg" xml:space="preserve">
<value>Q tg</value>
</data>
<data name="Test_profiles" xml:space="preserve">
<value>Test profiles</value>

7
TBF/Resources/Strings.ro.resx
View File

@ -534,8 +534,8 @@
<data name="Q_from_lph" xml:space="preserve">
<value>Q de la [l/h]</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q de la [m3/h]</value>
<data name="Q_from" xml:space="preserve">
<value>Q de la</value>
</data>
<data name="Q_set_method_chdr" xml:space="preserve">
<value>Q-Metoda Selectata</value>
@ -546,9 +546,6 @@
<data name="Q_to_lph" xml:space="preserve">
<value>Q pana la [l/h]</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q pana la [m3/h]</value>
</data>
<data name="Qn" xml:space="preserve">
<value>Qn</value>
</data>

6
TBF/Resources/Strings.ru.resx
View File

@ -183,12 +183,6 @@
<data name="P_out" xml:space="preserve">
<value>P вниз</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q от [м3/ч]</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q до [м3/ч]</value>
</data>
<data name="Reference" xml:space="preserve">
<value>Ссылка</value>
</data>

8
TBF/Resources/Strings.zh-CN.resx
View File

@ -738,8 +738,8 @@
<data name="Q_from_lph" xml:space="preserve">
<value>Q起始点 [l/h]</value>
</data>
<data name="Q_from_m3h" xml:space="preserve">
<value>Q起始点 [m3/h]</value>
<data name="Q_from" xml:space="preserve">
<value>Q起始点</value>
</data>
<data name="Q_set_method_chdr" xml:space="preserve">
<value>Q-设置方法</value>
@ -747,8 +747,8 @@
<data name="Q_to_lph" xml:space="preserve">
<value>Q终止点 [l/h]</value>
</data>
<data name="Q_to_m3h" xml:space="preserve">
<value>Q终止 [m3/h]</value>
<data name="Q_to" xml:space="preserve">
<value>Q终止</value>
</data>
<data name="Qfall" xml:space="preserve">
<value>Q下降</value>

26
TBF/TBF.csproj
View File

@ -2323,29 +2323,29 @@
<Compile Include="UI\Process\ProcessTabPageExCtrl.designer.cs">
<DependentUpon>ProcessTabPageExCtrl.cs</DependentUpon>
</Compile>
<Compile Include="UI\Results\PreviousResultCtrl.cs">
<Compile Include="UI\ResultsMI\PreviousResultCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\Results\PreviousResultCtrl.designer.cs">
<Compile Include="UI\ResultsMI\PreviousResultCtrl.designer.cs">
<DependentUpon>PreviousResultCtrl.cs</DependentUpon>
</Compile>
<Compile Include="UI\Results\PreviousResultIdEventArgs.cs" />
<Compile Include="UI\Results\PreviousResultsDlg.cs">
<Compile Include="UI\ResultsMI\PreviousResultIdEventArgs.cs" />
<Compile Include="UI\ResultsMI\PreviousResultsDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Results\PreviousResultsDlg.designer.cs">
<Compile Include="UI\ResultsMI\PreviousResultsDlg.designer.cs">
<DependentUpon>PreviousResultsDlg.cs</DependentUpon>
</Compile>
<Compile Include="UI\Results\ResultsArrangementDlg.cs">
<Compile Include="UI\ResultsMI\ResultsArrangementDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Results\ResultsArrangementDlg.designer.cs">
<Compile Include="UI\ResultsMI\ResultsArrangementDlg.designer.cs">
<DependentUpon>ResultsArrangementDlg.cs</DependentUpon>
</Compile>
<Compile Include="UI\Results\ResultsTabPageCtrl.cs">
<Compile Include="UI\ResultsMI\ResultsTabPageCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\Results\ResultsTabPageCtrl.designer.cs">
<Compile Include="UI\ResultsMI\ResultsTabPageCtrl.designer.cs">
<DependentUpon>ResultsTabPageCtrl.cs</DependentUpon>
</Compile>
<Compile Include="UI\Settings\BenchesDlg.cs">
@ -3255,16 +3255,16 @@
<EmbeddedResource Include="UI\Process\ProcessTabPageExCtrl.resx">
<DependentUpon>ProcessTabPageExCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Results\PreviousResultCtrl.resx">
<EmbeddedResource Include="UI\ResultsMI\PreviousResultCtrl.resx">
<DependentUpon>PreviousResultCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Results\PreviousResultsDlg.resx">
<EmbeddedResource Include="UI\ResultsMI\PreviousResultsDlg.resx">
<DependentUpon>PreviousResultsDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Results\ResultsArrangementDlg.resx">
<EmbeddedResource Include="UI\ResultsMI\ResultsArrangementDlg.resx">
<DependentUpon>ResultsArrangementDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Results\ResultsTabPageCtrl.resx">
<EmbeddedResource Include="UI\ResultsMI\ResultsTabPageCtrl.resx">
<DependentUpon>ResultsTabPageCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Settings\BenchesDlg.resx">

6
TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs generated
View File

@ -33,7 +33,7 @@ namespace TBF.UI.Bench.Components
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ComponentsManagerDlg));
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout();
@ -68,7 +68,7 @@ namespace TBF.UI.Bench.Components
this.listViewEx.Name = "listViewEx";
this.listViewEx.UseCompatibleStateImageBehavior = false;
this.listViewEx.View = System.Windows.Forms.View.Details;
this.listViewEx.SubItemRightClicked += new global::Results.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked);
this.listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked);
this.listViewEx.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewEx_ColumnClick);
this.listViewEx.SelectedIndexChanged += new System.EventHandler(this.componentsListView_SelectedIndexChanged);
this.listViewEx.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listViewEx_MouseDoubleClick);
@ -96,7 +96,7 @@ namespace TBF.UI.Bench.Components
#endregion
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.SplitContainer splitContainer;
private TBF.UI.Shared.SharedButtons sharedButtons;
}

4
TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs generated
View File

@ -57,7 +57,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -369,7 +369,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.Label cmpntNameLabel;
private System.Windows.Forms.SplitContainer splitContainer1;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.Label measuredLabel;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;

2
TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs
View File

@ -84,7 +84,7 @@ namespace TBF.UI.Bench.Metrology
{
double buoyancy = Utils.ParseUDouble(buoyancyTextBox.Text);
global::Results.WMeterRsltItemSpec.Buoyancy =
Results.WMeterRsltItemSpec.Buoyancy =
Config.Data.Buoyancy = BuoyancyCfg.Buoyancy = buoyancy;
Component modified = BuoyancyCfg.CreateDbEntity();

4
TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
View File

@ -90,10 +90,10 @@ namespace TBF.UI.Bench.Metrology
double realDensity = Utils.ParseUDouble(densityTextBox.Text);
double atTemperature = Utils.ParseUDouble(temperatureTextBox.Text);
global::Results.WMeterRsltItemSpec.RealDensity =
Results.WMeterRsltItemSpec.RealDensity =
Config.Data.RealDensity = DensityCfg.RealDensity = realDensity;
global::Results.WMeterRsltItemSpec.AtTemperature =
Results.WMeterRsltItemSpec.AtTemperature =
Config.Data.AtTemperature = DensityCfg.AtTemperature = atTemperature;
Component modified = DensityCfg.CreateDbEntity();

4
TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs generated
View File

@ -48,7 +48,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

4
TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs generated
View File

@ -48,7 +48,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

4
TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs generated
View File

@ -48,7 +48,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

4
TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs generated
View File

@ -48,7 +48,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

4
TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs generated
View File

@ -39,7 +39,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredLabel = new System.Windows.Forms.Label();
this.componentLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -172,7 +172,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label componentLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

4
TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs generated
View File

@ -39,7 +39,7 @@ namespace TBF.UI.Bench.Metrology
this.measuredLabel = new System.Windows.Forms.Label();
this.componentLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -172,7 +172,7 @@ namespace TBF.UI.Bench.Metrology
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label componentLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

4
TBF/UI/Bench/Paths/PathsBenchCtrl.cs
View File

@ -67,8 +67,8 @@ namespace TBF.UI.Bench.Paths
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.BenchColumnCount > 0) ? ls.BenchColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_from_m3h, (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_to_m3h, (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} [m3/h]", Strings.Q_from), (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} [m3/h]", Strings.Q_to), (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.T_in, (ls.BenchColumnCount > 3) ? ls.BenchColumnWidths[3] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.T_out, (ls.BenchColumnCount > 4) ? ls.BenchColumnWidths[4] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.P_in, (ls.BenchColumnCount > 5) ? ls.BenchColumnWidths[5] : 50 * parent.Dpi / Constants.Dpi100pct);

4
TBF/UI/Bench/Paths/PathsFeedingCtrl.cs
View File

@ -63,8 +63,8 @@ namespace TBF.UI.Bench.Paths
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.FeedingColumnCount > 0) ? ls.FeedingColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_from_m3h, (ls.FeedingColumnCount > 1) ? ls.FeedingColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_to_m3h, (ls.FeedingColumnCount > 2) ? ls.FeedingColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} [m3/h]", Strings.Q_from), (ls.FeedingColumnCount > 1) ? ls.FeedingColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} [m3/h]", Strings.Q_to), (ls.FeedingColumnCount > 2) ? ls.FeedingColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Pump, (ls.FeedingColumnCount > 3) ? ls.FeedingColumnWidths[3] : 60 * parent.Dpi / Constants.Dpi100pct);
int clmn = (int)Column.FixedColumnsCount;

4
TBF/UI/Bench/Paths/PathsOutputCtrl.cs
View File

@ -74,8 +74,8 @@ namespace TBF.UI.Bench.Paths
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.OutputColumnCount > 0) ? ls.OutputColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_from_m3h, (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_to_m3h, (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} [m3/h]", Strings.Q_from), (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} [m3/h]", Strings.Q_to), (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Flowmeter, (ls.OutputColumnCount > 3) ? ls.OutputColumnWidths[3] : 85 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Reg_valve, (ls.OutputColumnCount > 4) ? ls.OutputColumnWidths[4] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.PID, (ls.OutputColumnCount > 5) ? ls.OutputColumnWidths[5] : 50 * parent.Dpi / Constants.Dpi100pct);

420
TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
View File

@ -71,6 +71,10 @@ namespace TBF.UI.Bench.TestProfiles
errorFlagsListViewEx.SubItemRightClicked += new SubItemEventHandler(errorFlagsListViewEx_SubItemRightClicked);
errorFlagsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(errorFlagsListViewEx_SubItemEndEditing);
errorFlags2ListViewEx.SubItemClicked += new SubItemEventHandler(errorFlags2ListViewEx_SubItemClicked);
errorFlags2ListViewEx.SubItemRightClicked += new SubItemEventHandler(errorFlags2ListViewEx_SubItemRightClicked);
errorFlags2ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(errorFlags2ListViewEx_SubItemEndEditing);
SelectedTestIx = -1;
}
@ -86,7 +90,7 @@ namespace TBF.UI.Bench.TestProfiles
sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.WaterMeterAuthority };
}
private void ProcedureDlg_Load(object sender, EventArgs e)
private void TestProfileDlg_Load(object sender, EventArgs e)
{
Localize();
@ -96,26 +100,32 @@ namespace TBF.UI.Bench.TestProfiles
procNameTextBox.Enabled = false;
descriptionTextBox.Enabled = false;
profileTypeRadioButton1.Enabled = false;
profileTypeRadioButton2.Enabled = false;
profileTypeRadioButton3.Enabled = false;
#if !HEAT_METERS
profileTypeRadioButton3.Visible = false;
#endif
/// Make some controls readonly
createdByTextBox.ReadOnly = true;
createdOnTextBox.ReadOnly = true;
lastChangedByTextBox.ReadOnly = true;
lastChangedOnTextBox.ReadOnly = true;
profileTypeRadioButton1.Enabled = false;
profileTypeRadioButton2.Enabled = false;
profileTypeRadioButton3.Enabled = false;
profileTypeRadioButton4.Enabled = false;
profileTypeRadioButton5.Enabled = false;
errorCalculationRadioButton1.Enabled = false;
errorCalculationRadioButton2.Enabled = false;
/// LisViewEx columns and edit controls for 'Metrology1', 'Metrology2', 'Process' and 'Parameters' tabs
PrepareMetrologyTab();
PrepareErrorFlags();
PrepareErrorFlags2();
/// Now refresh the content of the dialog
RefreshGeneralTab();
RefreshMetrologyTab();
RefreshErrorFlagsTab();
RefreshErrorFlags2Tab();
/// Optionally unlock this dialog
if (openUnlocked)
@ -127,11 +137,12 @@ namespace TBF.UI.Bench.TestProfiles
void Localize()
{
Text = Strings.Test_profiles;
Text = Strings.Profile;
generalTabPage.Text = Strings.General;
metrology1TabPage.Text = Strings.Metrology;
parametersTabPage.Text = Strings.Parameters;
metrologyTabPage.Text = Strings.Metrology;
errorFlagsTabPage.Text = "Error flags";
errorFlags2TabPage.Text = "Error flags details";
label1.Text = Strings.Procedure_name;
label12.Text = Strings.Short_description;
@ -139,10 +150,6 @@ namespace TBF.UI.Bench.TestProfiles
label16.Text = Strings.Last_changed_by;
label14.Text = Strings.Date;
label15.Text = Strings.Date;
//profileTypeRadioButton1.Text = Strings.SingleBtnText;
//profileTypeRadioButton2.Text = Strings.Compound;
//profileTypeRadioButton3.Text = Strings.Heat_meter;
}
#region General
@ -156,10 +163,27 @@ namespace TBF.UI.Bench.TestProfiles
createdByTextBox.Text = LoadedProfile.CreationUser;
createdOnTextBox.Text = LoadedProfile.CreationTime.ToString();
lastChangedByTextBox.Text = LoadedProfile.LastChgUser;
if (LoadedProfile.LastChgTime > LoadedProfile.CreationTime)
{
lastChangedOnTextBox.Text = LoadedProfile.LastChgTime.ToString();
}
if (LoadedProfile.LastChgTime > LoadedProfile.CreationTime)
{
lastChangedOnTextBox.Text = LoadedProfile.LastChgTime.ToString();
}
switch(LoadedProfile.ProfileType)
{
default:
case ProfileType.Q3R: profileTypeRadioButton1.Checked = true; break;
case ProfileType.QnClassLT15: profileTypeRadioButton2.Checked = true; break;
case ProfileType.QnClassGT15: profileTypeRadioButton3.Checked = true; break;
case ProfileType.QpQi: profileTypeRadioButton4.Checked = true; break;
case ProfileType.Manual: profileTypeRadioButton5.Checked = true; break;
}
switch(LoadedProfile.ErrorLimitType)
{
default:
case ErrorLimitType.Manual: errorCalculationRadioButton1.Checked = true; break;
case ErrorLimitType.QpClass: errorCalculationRadioButton2.Checked = true; break;
}
}
void UpdateFromGeneralTab()
@ -168,7 +192,16 @@ namespace TBF.UI.Bench.TestProfiles
Text = string.Format("{0} {1} {2}", Strings.Profile, LoadedProfile.ItemNr + 1, LoadedProfile.Name);
LoadedProfile.Description = descriptionTextBox.Text;
}
LoadedProfile.ProfileType = profileTypeRadioButton1.Checked ? ProfileType.Q3R :
(profileTypeRadioButton2.Checked ? ProfileType.QnClassLT15 :
(profileTypeRadioButton3.Checked ? ProfileType.QnClassGT15 :
(profileTypeRadioButton4.Checked ? ProfileType.QpQi
: ProfileType.Manual)));
LoadedProfile.ErrorLimitType = errorCalculationRadioButton1.Checked ? ErrorLimitType.Manual
: ErrorLimitType.QpClass;
}
#endregion
@ -194,8 +227,8 @@ namespace TBF.UI.Bench.TestProfiles
{
ListViewEx lv = metrologyListViewEx;
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("Coef. {0}", Strings.Q_from), Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("Coef. {0}", Strings.Q_to), Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_neg_pct_chdr, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_lo_chdr), Width = 100 });
@ -218,7 +251,7 @@ namespace TBF.UI.Bench.TestProfiles
foreach (var ctrl in metrologyEditors)
{
metrology1TabPage.Controls.Add(ctrl);
metrologyTabPage.Controls.Add(ctrl);
}
}
@ -276,7 +309,6 @@ namespace TBF.UI.Bench.TestProfiles
private void metrologyListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (e.SubItem == (int)MtrlgyClmn.Name) return;
if (unlocked && (e.SubItem < (int)MtrlgyClmn.ColumnsCount))
{
metrologyListViewEx.StartEditing(metrologyEditors[e.SubItem], e.Item, e.SubItem);
@ -322,12 +354,12 @@ namespace TBF.UI.Bench.TestProfiles
}
float fdummy;
if ((e.SubItem == (int)MtrlgyClmn.CoefQfrom && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.CoefQto && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.ErrLimLo && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.ErrLimHi && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.TempLimLo && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.TempLimHi && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
if ((e.SubItem == (int)MtrlgyClmn.CoefQfrom && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.CoefQto && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.ErrLimLo && !Utils.TryParseSFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.ErrLimHi && !Utils.TryParseSFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.TempLimLo && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.TempLimHi && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.PressLimLo && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) ||
(e.SubItem == (int)MtrlgyClmn.PressLimHi && !Utils.TryParseUFloat(e.DisplayText, out fdummy)))
{
@ -387,16 +419,8 @@ namespace TBF.UI.Bench.TestProfiles
for (ErrorFlagsMode efm = 0; efm < ErrorFlagsMode.Count; efm++) cb.Items.Add(efm.ToDescription());
errorFlagsEditors[ix++] = cb;
}
//lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 });
//lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_spread_kg, Width = 110 });
//lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_method, Width = 90 });
//lv.Columns.Add(new ColumnHeader { Text = Strings.TimePump2StartV_chdr, Width = 70 });
//lv.Columns.Add(new ColumnHeader { Text = Strings.TimeBeforeSettingFlow, Width = 70 });
//lv.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 });
//lv.Columns.Add(new ColumnHeader { Text = Strings.Time2MassMsrmt_chdr, Width = 70 });
foreach (var ctrl in errorFlagsEditors) parametersTabPage.Controls.Add(ctrl);
foreach (var ctrl in errorFlagsEditors) errorFlagsTabPage.Controls.Add(ctrl);
}
void RefreshErrorFlagsTab()
@ -410,39 +434,27 @@ namespace TBF.UI.Bench.TestProfiles
}
}
void AddToErrorFlagsTab(PTest test)
void AddToErrorFlagsTab(PTest pTest)
{
///
/// Parameters item with subitems
///
ListViewItem lvi = new ListViewItem(test.Name); /// Name
lvi.Tag = test;
lvi.SubItems.Add(SByte2String(test.E1));
lvi.SubItems.Add(SByte2String(test.E2));
lvi.SubItems.Add(SByte2String(test.E3));
lvi.SubItems.Add(SByte2String(test.E4));
lvi.SubItems.Add(SByte2String(test.E5));
lvi.SubItems.Add(SByte2String(test.E6));
lvi.SubItems.Add(SByte2String(test.E7));
lvi.SubItems.Add(SByte2String(test.E8));
lvi.SubItems.Add(SByte2String(test.E9));
lvi.SubItems.Add(SByte2String(test.E10));
lvi.SubItems.Add(SByte2String(test.E11));
lvi.SubItems.Add(SByte2String(test.E12));
lvi.SubItems.Add(SByte2String(test.E13));
lvi.SubItems.Add(SByte2String(test.E14));
lvi.SubItems.Add(SByte2String(test.E15));
lvi.SubItems.Add(SByte2String(test.E16));
lvi.SubItems.Add(SByte2String(test.E21));
//lvi.SubItems.Add(test.PumpPower.ToString("F1"));
//lvi.SubItems.Add((test.MassRepeats < 4 ? 5 : test.MassRepeats).ToString());
//lvi.SubItems.Add(test.MassSpread.ToString("F4"));
//lvi.SubItems.Add(test.MassMethod.ToDescription());
//lvi.SubItems.Add(test.TimePump2StartV.ToString());
//lvi.SubItems.Add(test.TimeBeforeFlow.ToString());
//lvi.SubItems.Add(test.TimeFlow2Mass.ToString());
//lvi.SubItems.Add(test.TimeStop2Mass.ToString());
ListViewItem lvi = new ListViewItem(pTest.Name);
lvi.Tag = pTest;
lvi.SubItems.Add(SByte2String(pTest.E1));
lvi.SubItems.Add(SByte2String(pTest.E2));
lvi.SubItems.Add(SByte2String(pTest.E3));
lvi.SubItems.Add(SByte2String(pTest.E4));
lvi.SubItems.Add(SByte2String(pTest.E5));
lvi.SubItems.Add(SByte2String(pTest.E6));
lvi.SubItems.Add(SByte2String(pTest.E7));
lvi.SubItems.Add(SByte2String(pTest.E8));
lvi.SubItems.Add(SByte2String(pTest.E9));
lvi.SubItems.Add(SByte2String(pTest.E10));
lvi.SubItems.Add(SByte2String(pTest.E11));
lvi.SubItems.Add(SByte2String(pTest.E12));
lvi.SubItems.Add(SByte2String(pTest.E13));
lvi.SubItems.Add(SByte2String(pTest.E14));
lvi.SubItems.Add(SByte2String(pTest.E15));
lvi.SubItems.Add(SByte2String(pTest.E16));
lvi.SubItems.Add(SByte2String(pTest.E21));
errorFlagsListViewEx.Items.Add(lvi);
}
@ -537,6 +549,187 @@ namespace TBF.UI.Bench.TestProfiles
}
}
#endregion
#region Error flags 2
public enum ErrorFlags2Clmn
{
Name,
Delta_Q_pct,
Delta_T,
Delta_Tup_Tdn,
TestTime_min,
TestTime_max,
AmbTemp_min,
AmbTemp_max,
Coef_E9,
Coef_E10,
Coef_E11,
Coef_E12,
Offset_E9,
Offset_E12,
ColumnsCount
}
Control[] errorFlags2Editors;
void PrepareErrorFlags2()
{
string[] paramNames = new string[]
{
Strings.Test_chdr,
"Delta Q [%]",
"Delta T [°C]",
"max. Abs(Tup - Tdn) [°C]",
string.Format("min. {0}", Strings.Test_time_s_chdr),
string.Format("max. {0}", Strings.Test_time_s_chdr),
string.Format("min. {0} [°C]", Strings.Air_temperature),
string.Format("max. {0} [°C]", Strings.Air_temperature),
"Coef.E9",
"Coef.E10",
"Coef.E11",
"Coef.E12",
"Offset E9 [s]",
"Offset E12 [s]",
};
/// Compare ErrorFlags2Clmn with paramNames array. Return on mismatch
if ((int)ErrorFlags2Clmn.ColumnsCount != paramNames.Length) return;
ListViewEx lv = errorFlags2ListViewEx;
errorFlags2Editors = new Control[(int)ErrorFlags2Clmn.ColumnsCount];
int ix = 0;
for (int i = 0; i < paramNames.Length; i++)
{
lv.Columns.Add(new ColumnHeader { Text = paramNames[i], Width = 70 }); /// Column header
Control ctrl;
errorFlags2Editors[ix++] = ctrl = new TextBox(); /// Edit control
errorFlags2TabPage.Controls.Add(ctrl);
}
}
void RefreshErrorFlags2Tab()
{
errorFlags2ListViewEx.Items.Clear();
foreach (var test in LoadedProfile.Tests) AddToErrorFlags2Tab(test);
if (0 <= SelectedTestIx && SelectedTestIx < errorFlags2ListViewEx.Items.Count)
{
errorFlags2ListViewEx.Items[SelectedTestIx].Selected = true;
}
}
void AddToErrorFlags2Tab(PTest pTest)
{
ListViewItem lvi = new ListViewItem(pTest.Name);
lvi.Tag = pTest;
lvi.SubItems.Add(pTest.Delta_Q_pct.ToString());
lvi.SubItems.Add(pTest.Delta_T.ToString());
lvi.SubItems.Add(pTest.Delta_Tup_Tdn.ToString());
lvi.SubItems.Add(pTest.TestTime_min.ToString());
lvi.SubItems.Add(pTest.TestTime_max.ToString());
lvi.SubItems.Add(pTest.AmbTemp_min.ToString());
lvi.SubItems.Add(pTest.AmbTemp_max.ToString());
lvi.SubItems.Add(pTest.Coef_E9.ToString());
lvi.SubItems.Add(pTest.Coef_E10.ToString());
lvi.SubItems.Add(pTest.Coef_E11.ToString());
lvi.SubItems.Add(pTest.Coef_E12.ToString());
lvi.SubItems.Add(pTest.Offset_E9.ToString());
lvi.SubItems.Add(pTest.Offset_E12.ToString());
errorFlags2ListViewEx.Items.Add(lvi);
}
void UpdateFromErrorFlags2Tab()
{
for (int i = 0; i < errorFlags2ListViewEx.Items.Count; i++)
{
ListViewItem lvi = errorFlags2ListViewEx.Items[i];
PTest entity = (PTest)lvi.Tag;
entity.Name = lvi.Text;
entity.ItemNr = i;
int j = 1;
entity.Delta_Q_pct = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Delta_T = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Delta_Tup_Tdn = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.TestTime_min = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.TestTime_max = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.AmbTemp_min = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.AmbTemp_max = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Coef_E9 = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Coef_E10 = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Coef_E11 = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Coef_E12 = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Offset_E9 = Utils.ParseUFloat(lvi.SubItems[j++].Text);
entity.Offset_E12 = Utils.ParseUFloat(lvi.SubItems[j++].Text);
}
}
private void errorFlags2ListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!unlocked || e.SubItem >= (int)ErrorFlags2Clmn.ColumnsCount)
{
return;
}
errorFlags2ListViewEx.StartEditing(errorFlags2Editors[e.SubItem], e.Item, e.SubItem);
}
void errorFlags2ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!unlocked || e.SubItem >= (int)ErrorFlags2Clmn.ColumnsCount)
{
return;
}
if (DialogResult.Yes == MessageBox.Show(Strings.Do_you_want_to_copy_this_value_to_all_cells_below_this_cell,
Strings.Confirmation, MessageBoxButtons.YesNo, MessageBoxIcon.Question))
{
int columnNr = e.SubItem;
string value = null;
System.Drawing.Color backColor = System.Drawing.Color.White;
foreach (ListViewItem item in errorFlags2ListViewEx.Items)
{
if (value != null && item.SubItems.Count > columnNr)
{
item.SubItems[columnNr].Text = value;
item.SubItems[columnNr].BackColor = backColor;
}
else if (item == e.Item)
{
value = item.SubItems[columnNr].Text;
backColor = item.SubItems[columnNr].BackColor;
}
}
}
}
private void errorFlags2ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (e.SubItem == (int)ErrorFlags2Clmn.Name)
{
if (!Utils.IsGoodFName(e.DisplayText))
{
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
e.Cancel = true;
return; /// NOK
}
}
float dummy;
if ((e.SubItem >= 1) && (e.SubItem < (int)ErrorFlags2Clmn.ColumnsCount) && !Utils.TryParseUFloat(e.DisplayText, out dummy))
{
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
e.Cancel = true;
return; /// NOK
}
}
#endregion
@ -544,6 +737,7 @@ namespace TBF.UI.Bench.TestProfiles
{
RefreshMetrologyTab();
RefreshErrorFlagsTab();
RefreshErrorFlags2Tab();
}
@ -557,16 +751,23 @@ namespace TBF.UI.Bench.TestProfiles
descriptionTextBox.Enabled = true;
profileTypeRadioButton1.Enabled = true;
profileTypeRadioButton2.Enabled = true;
#if HEAT_METERS
metersKindRadioButton3.Enabled = true;
#endif
profileTypeRadioButton1.Enabled = true;
profileTypeRadioButton2.Enabled = true;
profileTypeRadioButton3.Enabled = true;
profileTypeRadioButton4.Enabled = true;
profileTypeRadioButton5.Enabled = true;
errorCalculationRadioButton1.Enabled = true;
errorCalculationRadioButton2.Enabled = true;
ListViewEx listViewEx = null;
switch (selectedTab)
{
case TestProfileTabs.Metrology: listViewEx = metrologyListViewEx; break;
case TestProfileTabs.ErrorFlags: listViewEx = errorFlagsListViewEx; break;
}
case TestProfileTabs.ErrorFlags2: listViewEx = errorFlags2ListViewEx; break;
}
if ((listViewEx != null) && (listViewEx.SelectedItems.Count == 1))
{
@ -584,6 +785,7 @@ namespace TBF.UI.Bench.TestProfiles
case TestProfileTabs.General: UpdateFromGeneralTab(); break;
case TestProfileTabs.Metrology: UpdateFromMetrologyTab(); break;
case TestProfileTabs.ErrorFlags: UpdateFromErrorFlagsTab(); break;
case TestProfileTabs.ErrorFlags2: UpdateFromErrorFlags2Tab(); break;
}
//foreach (var ctrl in testParamsCtrls) if (!ctrl.UpdateAll()) MessageBox.Show(string.Format(Strings.Error_saving_parameters_of_0, ctrl.Name));
@ -656,6 +858,7 @@ namespace TBF.UI.Bench.TestProfiles
General,
Metrology,
ErrorFlags,
ErrorFlags2,
}
TestProfileTabs selectedTab = TestProfileTabs.General;
@ -673,11 +876,15 @@ namespace TBF.UI.Bench.TestProfiles
case TestProfileTabs.ErrorFlags:
UpdateFromErrorFlagsTab();
break;
case TestProfileTabs.ErrorFlags2:
UpdateFromErrorFlags2Tab();
break;
}
selectedTab = (TestProfileTabs)tabControl.SelectedIndex;
bool isMetrologyOrErrorFlags = selectedTab == TestProfileTabs.Metrology ||
selectedTab == TestProfileTabs.ErrorFlags;
selectedTab == TestProfileTabs.ErrorFlags ||
selectedTab == TestProfileTabs.ErrorFlags2;
if (isMetrologyOrErrorFlags)
{
@ -702,7 +909,7 @@ namespace TBF.UI.Bench.TestProfiles
case TestProfileTabs.Metrology:
RefreshMetrologyTab();
lv = metrologyListViewEx; /// ListVIewEx for test selection
lv = metrologyListViewEx; /// ListVIewEx for test selection
break;
case TestProfileTabs.ErrorFlags:
@ -710,6 +917,11 @@ namespace TBF.UI.Bench.TestProfiles
lv = errorFlagsListViewEx; /// ListVIewEx for test selection
break;
case TestProfileTabs.ErrorFlags2:
RefreshErrorFlags2Tab();
lv = errorFlags2ListViewEx; /// ListVIewEx for test selection
break;
default:
UpdateButtonStates(SharedButtons.SelectedItemPos.None);
break;
@ -732,7 +944,41 @@ namespace TBF.UI.Bench.TestProfiles
private void addButton_Click(object sender, EventArgs e)
{
}
ListViewEx listViewEx;
switch (selectedTab)
{
case TestProfileTabs.Metrology: listViewEx = metrologyListViewEx; break;
case TestProfileTabs.ErrorFlags: listViewEx = errorFlagsListViewEx; break;
case TestProfileTabs.ErrorFlags2: listViewEx = errorFlags2ListViewEx; break;
default: return;
}
/// Find an unused test name
string newName;
for (int nameId = 1; true; nameId++)
{
newName = Strings.New_test_name + nameId.ToString();
bool notUsed = true;
foreach (var t in LoadedProfile.Tests) if (t.Name.Equals(newName)) notUsed = false;
if (notUsed) break;
}
/// Add a profile test
PTest ptest = new PTest(newName, listViewEx.Items.Count, LoadedProfile);
LoadedProfile.Tests.Add(ptest);
AddToMetrologyTab(ptest);
AddToErrorFlagsTab(ptest);
if (listViewEx != null)
{
listViewEx.Focus();
listViewEx.SelectedItems.Clear();
listViewEx.Items[listViewEx.Items.Count - 1].Selected = true;
listViewEx.Items[listViewEx.Items.Count - 1].EnsureVisible();
}
}
private void removeButton_Click(object sender, EventArgs e)
{
@ -750,6 +996,11 @@ namespace TBF.UI.Bench.TestProfiles
listViewEx = errorFlagsListViewEx;
break;
case TestProfileTabs.ErrorFlags2:
UpdateFromErrorFlags2Tab();
listViewEx = errorFlags2ListViewEx;
break;
default: return;
}
@ -793,6 +1044,11 @@ namespace TBF.UI.Bench.TestProfiles
listViewEx = errorFlagsListViewEx;
break;
case TestProfileTabs.ErrorFlags2:
UpdateFromErrorFlags2Tab();
listViewEx = errorFlags2ListViewEx;
break;
default: return;
}
@ -835,6 +1091,11 @@ namespace TBF.UI.Bench.TestProfiles
listViewEx = errorFlagsListViewEx;
break;
case TestProfileTabs.ErrorFlags2:
UpdateFromErrorFlags2Tab();
listViewEx = errorFlags2ListViewEx;
break;
default: return;
}
@ -863,8 +1124,9 @@ namespace TBF.UI.Bench.TestProfiles
#endregion
private void metrology1ListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); }
private void parametersListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); }
private void metrologyListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); }
private void errorFlagsListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); }
private void errorFlags2ListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); }
/// <summary>
/// Common part for four xxxListViewEx_SelectedIndexChanged event handlers

216
TBF/UI/Bench/TestProfiles/TestProfileDlg.designer.cs generated
View File

@ -35,9 +35,15 @@ namespace TBF.UI.Bench.TestProfiles
this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl = new System.Windows.Forms.TabControl();
this.generalTabPage = new System.Windows.Forms.TabPage();
this.profileTypeRadioButton3 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton2 = new System.Windows.Forms.RadioButton();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.errorCalculationRadioButton2 = new System.Windows.Forms.RadioButton();
this.errorCalculationRadioButton1 = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.profileTypeRadioButton1 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton5 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton2 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton4 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton3 = new System.Windows.Forms.RadioButton();
this.lastChangedOnTextBox = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.lastChangedByTextBox = new System.Windows.Forms.TextBox();
@ -50,27 +56,24 @@ namespace TBF.UI.Bench.TestProfiles
this.label12 = new System.Windows.Forms.Label();
this.procNameTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.metrology1TabPage = new System.Windows.Forms.TabPage();
this.metrologyListViewEx = new global::Results.Forms.ListViewEx();
this.parametersTabPage = new System.Windows.Forms.TabPage();
this.errorFlagsListViewEx = new global::Results.Forms.ListViewEx();
this.metrologyTabPage = new System.Windows.Forms.TabPage();
this.metrologyListViewEx = new Results.Forms.ListViewEx();
this.errorFlagsTabPage = new System.Windows.Forms.TabPage();
this.errorFlagsListViewEx = new Results.Forms.ListViewEx();
this.errorFlags2TabPage = new System.Windows.Forms.TabPage();
this.errorFlags2ListViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
this.profileTypeRadioButton4 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton5 = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.errorCalculationRadioButton1 = new System.Windows.Forms.RadioButton();
this.errorCalculationRadioButton2 = new System.Windows.Forms.RadioButton();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
this.mainSplitContainer.Panel2.SuspendLayout();
this.mainSplitContainer.SuspendLayout();
this.tabControl.SuspendLayout();
this.generalTabPage.SuspendLayout();
this.metrology1TabPage.SuspendLayout();
this.parametersTabPage.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.metrologyTabPage.SuspendLayout();
this.errorFlagsTabPage.SuspendLayout();
this.errorFlags2TabPage.SuspendLayout();
this.SuspendLayout();
//
// mainSplitContainer
@ -90,8 +93,9 @@ namespace TBF.UI.Bench.TestProfiles
// tabControl
//
this.tabControl.Controls.Add(this.generalTabPage);
this.tabControl.Controls.Add(this.metrology1TabPage);
this.tabControl.Controls.Add(this.parametersTabPage);
this.tabControl.Controls.Add(this.metrologyTabPage);
this.tabControl.Controls.Add(this.errorFlagsTabPage);
this.tabControl.Controls.Add(this.errorFlags2TabPage);
resources.ApplyResources(this.tabControl, "tabControl");
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
@ -117,12 +121,52 @@ namespace TBF.UI.Bench.TestProfiles
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton3
// groupBox2
//
resources.ApplyResources(this.profileTypeRadioButton3, "profileTypeRadioButton3");
this.profileTypeRadioButton3.Name = "profileTypeRadioButton3";
this.profileTypeRadioButton3.TabStop = true;
this.profileTypeRadioButton3.UseVisualStyleBackColor = true;
this.groupBox2.Controls.Add(this.errorCalculationRadioButton2);
this.groupBox2.Controls.Add(this.errorCalculationRadioButton1);
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
// errorCalculationRadioButton2
//
resources.ApplyResources(this.errorCalculationRadioButton2, "errorCalculationRadioButton2");
this.errorCalculationRadioButton2.Name = "errorCalculationRadioButton2";
this.errorCalculationRadioButton2.TabStop = true;
this.errorCalculationRadioButton2.UseVisualStyleBackColor = true;
//
// errorCalculationRadioButton1
//
resources.ApplyResources(this.errorCalculationRadioButton1, "errorCalculationRadioButton1");
this.errorCalculationRadioButton1.Name = "errorCalculationRadioButton1";
this.errorCalculationRadioButton1.TabStop = true;
this.errorCalculationRadioButton1.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.profileTypeRadioButton1);
this.groupBox1.Controls.Add(this.profileTypeRadioButton5);
this.groupBox1.Controls.Add(this.profileTypeRadioButton2);
this.groupBox1.Controls.Add(this.profileTypeRadioButton4);
this.groupBox1.Controls.Add(this.profileTypeRadioButton3);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// profileTypeRadioButton1
//
resources.ApplyResources(this.profileTypeRadioButton1, "profileTypeRadioButton1");
this.profileTypeRadioButton1.Name = "profileTypeRadioButton1";
this.profileTypeRadioButton1.TabStop = true;
this.profileTypeRadioButton1.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton5
//
resources.ApplyResources(this.profileTypeRadioButton5, "profileTypeRadioButton5");
this.profileTypeRadioButton5.Name = "profileTypeRadioButton5";
this.profileTypeRadioButton5.TabStop = true;
this.profileTypeRadioButton5.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton2
//
@ -131,12 +175,19 @@ namespace TBF.UI.Bench.TestProfiles
this.profileTypeRadioButton2.TabStop = true;
this.profileTypeRadioButton2.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton1
// profileTypeRadioButton4
//
resources.ApplyResources(this.profileTypeRadioButton1, "profileTypeRadioButton1");
this.profileTypeRadioButton1.Name = "profileTypeRadioButton1";
this.profileTypeRadioButton1.TabStop = true;
this.profileTypeRadioButton1.UseVisualStyleBackColor = true;
resources.ApplyResources(this.profileTypeRadioButton4, "profileTypeRadioButton4");
this.profileTypeRadioButton4.Name = "profileTypeRadioButton4";
this.profileTypeRadioButton4.TabStop = true;
this.profileTypeRadioButton4.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton3
//
resources.ApplyResources(this.profileTypeRadioButton3, "profileTypeRadioButton3");
this.profileTypeRadioButton3.Name = "profileTypeRadioButton3";
this.profileTypeRadioButton3.TabStop = true;
this.profileTypeRadioButton3.UseVisualStyleBackColor = true;
//
// lastChangedOnTextBox
//
@ -198,12 +249,12 @@ namespace TBF.UI.Bench.TestProfiles
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// metrology1TabPage
// metrologyTabPage
//
this.metrology1TabPage.Controls.Add(this.metrologyListViewEx);
resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
this.metrology1TabPage.Name = "metrology1TabPage";
this.metrology1TabPage.UseVisualStyleBackColor = true;
this.metrologyTabPage.Controls.Add(this.metrologyListViewEx);
resources.ApplyResources(this.metrologyTabPage, "metrologyTabPage");
this.metrologyTabPage.Name = "metrologyTabPage";
this.metrologyTabPage.UseVisualStyleBackColor = true;
//
// metrologyListViewEx
//
@ -215,14 +266,14 @@ namespace TBF.UI.Bench.TestProfiles
this.metrologyListViewEx.Name = "metrologyListViewEx";
this.metrologyListViewEx.UseCompatibleStateImageBehavior = false;
this.metrologyListViewEx.View = System.Windows.Forms.View.Details;
this.metrologyListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged);
this.metrologyListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrologyListViewEx_SelectedIndexChanged);
//
// parametersTabPage
// errorFlagsTabPage
//
this.parametersTabPage.Controls.Add(this.errorFlagsListViewEx);
resources.ApplyResources(this.parametersTabPage, "parametersTabPage");
this.parametersTabPage.Name = "parametersTabPage";
this.parametersTabPage.UseVisualStyleBackColor = true;
this.errorFlagsTabPage.Controls.Add(this.errorFlagsListViewEx);
resources.ApplyResources(this.errorFlagsTabPage, "errorFlagsTabPage");
this.errorFlagsTabPage.Name = "errorFlagsTabPage";
this.errorFlagsTabPage.UseVisualStyleBackColor = true;
//
// errorFlagsListViewEx
//
@ -234,67 +285,39 @@ namespace TBF.UI.Bench.TestProfiles
this.errorFlagsListViewEx.Name = "errorFlagsListViewEx";
this.errorFlagsListViewEx.UseCompatibleStateImageBehavior = false;
this.errorFlagsListViewEx.View = System.Windows.Forms.View.Details;
this.errorFlagsListViewEx.SelectedIndexChanged += new System.EventHandler(this.parametersListViewEx_SelectedIndexChanged);
this.errorFlagsListViewEx.SelectedIndexChanged += new System.EventHandler(this.errorFlagsListViewEx_SelectedIndexChanged);
//
// errorFlags2TabPage
//
this.errorFlags2TabPage.Controls.Add(this.errorFlags2ListViewEx);
resources.ApplyResources(this.errorFlags2TabPage, "errorFlags2TabPage");
this.errorFlags2TabPage.Name = "errorFlags2TabPage";
this.errorFlags2TabPage.UseVisualStyleBackColor = true;
//
// errorFlags2ListViewEx
//
this.errorFlags2ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.errorFlags2ListViewEx, "errorFlags2ListViewEx");
this.errorFlags2ListViewEx.DoubleClickActivation = false;
this.errorFlags2ListViewEx.FullRowSelect = true;
this.errorFlags2ListViewEx.GridLines = true;
this.errorFlags2ListViewEx.Name = "errorFlags2ListViewEx";
this.errorFlags2ListViewEx.UseCompatibleStateImageBehavior = false;
this.errorFlags2ListViewEx.View = System.Windows.Forms.View.Details;
this.errorFlags2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.errorFlags2ListViewEx_SelectedIndexChanged);
//
// sharedButtons
//
resources.ApplyResources(this.sharedButtons, "sharedButtons");
this.sharedButtons.Name = "sharedButtons";
//
// profileTypeRadioButton4
//
resources.ApplyResources(this.profileTypeRadioButton4, "profileTypeRadioButton4");
this.profileTypeRadioButton4.Name = "profileTypeRadioButton4";
this.profileTypeRadioButton4.TabStop = true;
this.profileTypeRadioButton4.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton5
//
resources.ApplyResources(this.profileTypeRadioButton5, "profileTypeRadioButton5");
this.profileTypeRadioButton5.Name = "profileTypeRadioButton5";
this.profileTypeRadioButton5.TabStop = true;
this.profileTypeRadioButton5.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.profileTypeRadioButton1);
this.groupBox1.Controls.Add(this.profileTypeRadioButton5);
this.groupBox1.Controls.Add(this.profileTypeRadioButton2);
this.groupBox1.Controls.Add(this.profileTypeRadioButton4);
this.groupBox1.Controls.Add(this.profileTypeRadioButton3);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.errorCalculationRadioButton2);
this.groupBox2.Controls.Add(this.errorCalculationRadioButton1);
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
// errorCalculationRadioButton1
//
resources.ApplyResources(this.errorCalculationRadioButton1, "errorCalculationRadioButton1");
this.errorCalculationRadioButton1.Name = "errorCalculationRadioButton1";
this.errorCalculationRadioButton1.TabStop = true;
this.errorCalculationRadioButton1.UseVisualStyleBackColor = true;
//
// errorCalculationRadioButton2
//
resources.ApplyResources(this.errorCalculationRadioButton2, "errorCalculationRadioButton2");
this.errorCalculationRadioButton2.Name = "errorCalculationRadioButton2";
this.errorCalculationRadioButton2.TabStop = true;
this.errorCalculationRadioButton2.UseVisualStyleBackColor = true;
//
// TestProfileDlg
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.mainSplitContainer);
this.Name = "TestProfileDlg";
this.Load += new System.EventHandler(this.ProcedureDlg_Load);
this.Load += new System.EventHandler(this.TestProfileDlg_Load);
this.mainSplitContainer.Panel1.ResumeLayout(false);
this.mainSplitContainer.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit();
@ -302,12 +325,13 @@ namespace TBF.UI.Bench.TestProfiles
this.tabControl.ResumeLayout(false);
this.generalTabPage.ResumeLayout(false);
this.generalTabPage.PerformLayout();
this.metrology1TabPage.ResumeLayout(false);
this.parametersTabPage.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.metrologyTabPage.ResumeLayout(false);
this.errorFlagsTabPage.ResumeLayout(false);
this.errorFlags2TabPage.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -316,8 +340,8 @@ namespace TBF.UI.Bench.TestProfiles
private System.Windows.Forms.SplitContainer mainSplitContainer;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage metrology1TabPage;
private global::Results.Forms.ListViewEx metrologyListViewEx;
private System.Windows.Forms.TabPage metrologyTabPage;
private Results.Forms.ListViewEx metrologyListViewEx;
private TBF.UI.Shared.SharedButtons sharedButtons;
private System.Windows.Forms.TabPage generalTabPage;
private System.Windows.Forms.TextBox lastChangedOnTextBox;
@ -334,8 +358,8 @@ namespace TBF.UI.Bench.TestProfiles
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RadioButton profileTypeRadioButton2;
private System.Windows.Forms.RadioButton profileTypeRadioButton1;
private System.Windows.Forms.TabPage parametersTabPage;
private global::Results.Forms.ListViewEx errorFlagsListViewEx;
private System.Windows.Forms.TabPage errorFlagsTabPage;
private Results.Forms.ListViewEx errorFlagsListViewEx;
private System.Windows.Forms.RadioButton profileTypeRadioButton3;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.RadioButton errorCalculationRadioButton2;
@ -343,5 +367,7 @@ namespace TBF.UI.Bench.TestProfiles
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.RadioButton profileTypeRadioButton5;
private System.Windows.Forms.RadioButton profileTypeRadioButton4;
private System.Windows.Forms.TabPage errorFlags2TabPage;
private Results.Forms.ListViewEx errorFlags2ListViewEx;
}
}

102
TBF/UI/Bench/TestProfiles/TestProfileDlg.resx
View File

@ -736,39 +736,39 @@
<value>metrologyListViewEx</value>
</data>
<data name="&gt;&gt;metrologyListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.24.1315.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.24.1359.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;metrologyListViewEx.Parent" xml:space="preserve">
<value>metrology1TabPage</value>
<value>metrologyTabPage</value>
</data>
<data name="&gt;&gt;metrologyListViewEx.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="metrology1TabPage.Location" type="System.Drawing.Point, System.Drawing">
<data name="metrologyTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 34</value>
</data>
<data name="metrology1TabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<data name="metrologyTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="metrology1TabPage.Size" type="System.Drawing.Size, System.Drawing">
<data name="metrologyTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 366</value>
</data>
<data name="metrology1TabPage.TabIndex" type="System.Int32, mscorlib">
<data name="metrologyTabPage.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="metrology1TabPage.Text" xml:space="preserve">
<value> Metrology I. </value>
<data name="metrologyTabPage.Text" xml:space="preserve">
<value> Metrology</value>
</data>
<data name="&gt;&gt;metrology1TabPage.Name" xml:space="preserve">
<value>metrology1TabPage</value>
<data name="&gt;&gt;metrologyTabPage.Name" xml:space="preserve">
<value>metrologyTabPage</value>
</data>
<data name="&gt;&gt;metrology1TabPage.Type" xml:space="preserve">
<data name="&gt;&gt;metrologyTabPage.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;metrology1TabPage.Parent" xml:space="preserve">
<data name="&gt;&gt;metrologyTabPage.Parent" xml:space="preserve">
<value>tabControl</value>
</data>
<data name="&gt;&gt;metrology1TabPage.ZOrder" xml:space="preserve">
<data name="&gt;&gt;metrologyTabPage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="errorFlagsListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -787,38 +787,86 @@
<value>errorFlagsListViewEx</value>
</data>
<data name="&gt;&gt;errorFlagsListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.24.1315.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.24.1359.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;errorFlagsListViewEx.Parent" xml:space="preserve">
<value>parametersTabPage</value>
<value>errorFlagsTabPage</value>
</data>
<data name="&gt;&gt;errorFlagsListViewEx.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="parametersTabPage.Location" type="System.Drawing.Point, System.Drawing">
<data name="errorFlagsTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 34</value>
</data>
<data name="parametersTabPage.Size" type="System.Drawing.Size, System.Drawing">
<data name="errorFlagsTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 366</value>
</data>
<data name="parametersTabPage.TabIndex" type="System.Int32, mscorlib">
<data name="errorFlagsTabPage.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="parametersTabPage.Text" xml:space="preserve">
<value> Parameters </value>
<data name="errorFlagsTabPage.Text" xml:space="preserve">
<value>Error flags</value>
</data>
<data name="&gt;&gt;parametersTabPage.Name" xml:space="preserve">
<value>parametersTabPage</value>
<data name="&gt;&gt;errorFlagsTabPage.Name" xml:space="preserve">
<value>errorFlagsTabPage</value>
</data>
<data name="&gt;&gt;parametersTabPage.Type" xml:space="preserve">
<data name="&gt;&gt;errorFlagsTabPage.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;parametersTabPage.Parent" xml:space="preserve">
<data name="&gt;&gt;errorFlagsTabPage.Parent" xml:space="preserve">
<value>tabControl</value>
</data>
<data name="&gt;&gt;parametersTabPage.ZOrder" xml:space="preserve">
<data name="&gt;&gt;errorFlagsTabPage.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="errorFlags2ListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="errorFlags2ListViewEx.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="errorFlags2ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 366</value>
</data>
<data name="errorFlags2ListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;errorFlags2ListViewEx.Name" xml:space="preserve">
<value>errorFlags2ListViewEx</value>
</data>
<data name="&gt;&gt;errorFlags2ListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.24.1359.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;errorFlags2ListViewEx.Parent" xml:space="preserve">
<value>errorFlags2TabPage</value>
</data>
<data name="&gt;&gt;errorFlags2ListViewEx.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="errorFlags2TabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 34</value>
</data>
<data name="errorFlags2TabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 366</value>
</data>
<data name="errorFlags2TabPage.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="errorFlags2TabPage.Text" xml:space="preserve">
<value>Error flags details</value>
</data>
<data name="&gt;&gt;errorFlags2TabPage.Name" xml:space="preserve">
<value>errorFlags2TabPage</value>
</data>
<data name="&gt;&gt;errorFlags2TabPage.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;errorFlags2TabPage.Parent" xml:space="preserve">
<value>tabControl</value>
</data>
<data name="&gt;&gt;errorFlags2TabPage.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="tabControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -871,7 +919,7 @@
<value>sharedButtons</value>
</data>
<data name="&gt;&gt;sharedButtons.Type" xml:space="preserve">
<value>TBF.UI.Shared.SharedButtons, TBF, Version=2.24.1320.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Shared.SharedButtons, TBF, Version=2.24.1365.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;sharedButtons.Parent" xml:space="preserve">
<value>mainSplitContainer.Panel2</value>
@ -925,7 +973,7 @@
<value>CenterParent</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Procedure</value>
<value>Test profiles</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>TestProfileDlg</value>

4
TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
View File

@ -49,7 +49,7 @@ namespace TBF.UI.Bench.TestProfiles
private void ProceduresDlg_Load(object sender, EventArgs e)
{
LoadUISettings();
Text = Strings.Procedures;
Text = Strings.Test_profiles;
testProfilesCtrl.Initialize(this, splitContainer.Panel1);
}
@ -178,7 +178,7 @@ namespace TBF.UI.Bench.TestProfiles
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
global::Results.Forms.ListViewEx listViewEx = sender as global::Results.Forms.ListViewEx;
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
/// No item selected

2
TBF/UI/Bench/TestProfiles/TestProfilesDlg.designer.cs generated
View File

@ -87,7 +87,7 @@ namespace TBF.UI.Bench.TestProfiles
this.Controls.Add(this.splitContainer);
this.Name = "TestProfilesDlg";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "ProceduresDlg";
this.Text = "TestProfilesDlg";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ProceduresDlg_FormClosed);
this.Load += new System.EventHandler(this.ProceduresDlg_Load);
this.splitContainer.Panel1.ResumeLayout(false);

4
TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.designer.cs generated
View File

@ -34,7 +34,7 @@ namespace TBF.UI.Bench.Uncertainties
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.cmpntLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -116,7 +116,7 @@ namespace TBF.UI.Bench.Uncertainties
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

4
TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.designer.cs generated
View File

@ -34,7 +34,7 @@ namespace TBF.UI.Bench.Uncertainties
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.cmpntLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -116,7 +116,7 @@ namespace TBF.UI.Bench.Uncertainties
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

4
TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.designer.cs generated
View File

@ -32,7 +32,7 @@ namespace TBF.UI.Bench.Uncertainties
private void InitializeComponent()
{
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.cmpntLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@ -114,7 +114,7 @@ namespace TBF.UI.Bench.Uncertainties
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.Label cmpntLabel;
private System.Windows.Forms.Label cmpntNameLabel;
}

4
TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.designer.cs generated
View File

@ -34,7 +34,7 @@ namespace TBF.UI.Bench.Uncertainties
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.cmpntLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -116,7 +116,7 @@ namespace TBF.UI.Bench.Uncertainties
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

24
TBF/UI/MainWnd.Designer.cs generated
View File

@ -59,7 +59,7 @@ namespace TBF.UI
this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl6();
this.insertTabPage = new System.Windows.Forms.TabPage();
this.resultsTabPage = new System.Windows.Forms.TabPage();
this.resultsTabPageCtrl = new TBF.UI.Results.ResultsTabPageCtrl();
this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl();
this.graphsTabPage = new System.Windows.Forms.TabPage();
this.graphsTabPageCtrl = new TBF.UI.Graphs.GraphsTabPageCtrl();
this.logsTabPage = new System.Windows.Forms.TabPage();
@ -698,33 +698,33 @@ namespace TBF.UI
private System.Windows.Forms.ToolStripStatusLabel statusPStatusLabel;
private System.Windows.Forms.ToolStripStatusLabel routeStatusLabel;
private System.Windows.Forms.ToolStripStatusLabel activityStatusLabel;
private Results.ResultsTabPageCtrl resultsTabPageCtrl;
private TBF.UI.ResultsMI.ResultsTabPageCtrl resultsTabPageCtrl;
private Logs.LogsTabPageCtrl logsTabPageCtrl;
#if DN100
private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
private ProcessTabPageCtrl6 processTabPageCtrl;
private TBF.UI.ProcessTabPageCtrl6 processTabPageCtrl;
#elif MUNICH || FUZHOU_150
private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl6 processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif FUZHOU_300
private ControlComponent3F300.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl6 processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl6 processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl6 processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || DEWA_300 || ROMA_200 || ALZIR_25
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl24 processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageCtrl24 processTabPageCtrl;
#elif TURA_SPECIAL || SLM_50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageExCtrl processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageExCtrl processTabPageCtrl;
#elif TURA_IPERL || TURA_IPERL_NEW || IZRAEL_50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl48 processTabPageCtrl;
private TBF.UI.Process.ProcessTabPageCtrl48 processTabPageCtrl;
#endif
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
@ -758,7 +758,7 @@ namespace TBF.UI
private System.Windows.Forms.ComboBox procedureComboBox;
private System.Windows.Forms.ToolStripMenuItem benchTransitionsToolStripMenuItem;
private System.Windows.Forms.TabPage picturesTabPage;
private Camera.PicturesTabPageCtrl picturesTabPageCtrl;
private TBF.UI.Camera.PicturesTabPageCtrl picturesTabPageCtrl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.GroupBox descriptionGroupBox;
@ -770,7 +770,7 @@ namespace TBF.UI
private System.Windows.Forms.SplitContainer topHorizontalSplitContainer;
private System.Windows.Forms.ToolStripMenuItem upgradeTSMenuItem;
private System.Windows.Forms.TabPage graphsTabPage;
private Graphs.GraphsTabPageCtrl graphsTabPageCtrl;
private TBF.UI.Graphs.GraphsTabPageCtrl graphsTabPageCtrl;
private System.Windows.Forms.ToolStripMenuItem iPerlHeadsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem backUpTSMItem;

20
TBF/UI/Procedures/ProcedureDlg.Designer.cs generated
View File

@ -76,15 +76,15 @@ namespace TBF.UI.Procedures
this.procNameTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.historyTabPage = new System.Windows.Forms.TabPage();
this.historyListViewEx = new global::Results.Forms.ListViewEx();
this.historyListViewEx = new Results.Forms.ListViewEx();
this.metrology1TabPage = new System.Windows.Forms.TabPage();
this.metrology1ListViewEx = new global::Results.Forms.ListViewEx();
this.metrology1ListViewEx = new Results.Forms.ListViewEx();
this.metrology2TabPage = new System.Windows.Forms.TabPage();
this.metrology2ListViewEx = new global::Results.Forms.ListViewEx();
this.metrology2ListViewEx = new Results.Forms.ListViewEx();
this.processTabPage = new System.Windows.Forms.TabPage();
this.processListViewEx = new global::Results.Forms.ListViewEx();
this.processListViewEx = new Results.Forms.ListViewEx();
this.parametersTabPage = new System.Windows.Forms.TabPage();
this.parametersListViewEx = new global::Results.Forms.ListViewEx();
this.parametersListViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
@ -517,13 +517,13 @@ namespace TBF.UI.Procedures
private System.Windows.Forms.SplitContainer mainSplitContainer;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage historyTabPage;
private global::Results.Forms.ListViewEx historyListViewEx;
private Results.Forms.ListViewEx historyListViewEx;
private System.Windows.Forms.TabPage metrology1TabPage;
private global::Results.Forms.ListViewEx metrology1ListViewEx;
private Results.Forms.ListViewEx metrology1ListViewEx;
private System.Windows.Forms.TabPage metrology2TabPage;
private global::Results.Forms.ListViewEx metrology2ListViewEx;
private Results.Forms.ListViewEx metrology2ListViewEx;
private System.Windows.Forms.TabPage processTabPage;
private global::Results.Forms.ListViewEx processListViewEx;
private Results.Forms.ListViewEx processListViewEx;
private TBF.UI.Shared.SharedButtons sharedButtons;
private System.Windows.Forms.TabPage generalTabPage;
private System.Windows.Forms.ComboBox fileWriter1ComboBox;
@ -555,7 +555,7 @@ namespace TBF.UI.Procedures
private System.Windows.Forms.RadioButton metersKindRadioButton2;
private System.Windows.Forms.RadioButton metersKindRadioButton1;
private System.Windows.Forms.TabPage parametersTabPage;
private global::Results.Forms.ListViewEx parametersListViewEx;
private Results.Forms.ListViewEx parametersListViewEx;
private System.Windows.Forms.ComboBox fileWriter2ComboBox;
private System.Windows.Forms.ComboBox fileWriter3ComboBox;
private System.Windows.Forms.ComboBox printer2ComboBox;

8
TBF/UI/Procedures/ProcedureDlg.cs
View File

@ -685,11 +685,11 @@ namespace TBF.UI.Procedures
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
#if TEST_PROFILES
lv.Columns.Add(new ColumnHeader { Text = Strings.Q_tg_m3h, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [m3/h]", Strings.Q_tg), Width = 80 });
#endif
lv.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Volume + " [l]", Width = 70 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [m3/h]", Strings.Q_from), Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [m3/h]", Strings.Q_to), Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [l]", Strings.Volume), Width = 70 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_time_s_chdr, Width = 70 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_neg_pct_chdr, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 80 });

4
TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs generated
View File

@ -31,7 +31,7 @@ namespace TBF.UI.Procedures
/// </summary>
private void InitializeComponent()
{
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.SuspendLayout();
//
// listViewEx
@ -60,6 +60,6 @@ namespace TBF.UI.Procedures
#endregion
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

2
TBF/UI/Procedures/ProceduresDlg.cs
View File

@ -178,7 +178,7 @@ namespace TBF.UI.Procedures
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
global::Results.Forms.ListViewEx listViewEx = sender as global::Results.Forms.ListViewEx;
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
/// No item selected

4
TBF/UI/Procedures/TestParamsCtrl.Designer.cs generated
View File

@ -31,7 +31,7 @@ namespace TBF.UI.Procedures
/// </summary>
private void InitializeComponent()
{
this.listViewEx = new global::Results.Forms.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.SuspendLayout();
//
// listViewEx
@ -60,6 +60,6 @@ namespace TBF.UI.Procedures
#endregion
private global::Results.Forms.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

4
TBF/UI/Procedures/TestWizard/FlowSelection.cs
View File

@ -29,8 +29,8 @@ namespace TBF.UI.Procedures.TestWizard
qSpec = 0;
Text = Strings.Flow_selection;
qFromLabel.Text = Strings.Q_from_m3h;
qToLabel.Text = Strings.Q_to_m3h;
qFromLabel.Text = string.Format("{0} [m3/h]", Strings.Q_from);
qToLabel.Text = string.Format("{0} [m3/h]", Strings.Q_to);
sensorsLabel.Text = Strings.Sensors;
}

6
TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
View File

@ -55,8 +55,8 @@ namespace TBF.UI.Procedures.TestWizard
listViewEx.Columns.Add("ID", 30);
listViewEx.Columns.Add("Test name", 70);
listViewEx.Columns.Add("QBezeichnung", 85);
listViewEx.Columns.Add(Strings.Q_from_m3h, 80);
listViewEx.Columns.Add(Strings.Q_to_m3h, 70);
listViewEx.Columns.Add(string.Format("{0} [m3/h]", Strings.Q_from), 80);
listViewEx.Columns.Add(string.Format("{0} [m3/h]", Strings.Q_to), 70);
listViewEx.Columns.Add(Strings.Test_time_s_chdr, 70);
listViewEx.Columns.Add(string.Format("{0} [l]", Strings.Volume, 60));
listViewEx.Columns.Add(Strings.Err_limit_neg_pct_chdr, 80);
@ -195,7 +195,7 @@ namespace TBF.UI.Procedures.TestWizard
{
if (t.Publish != (byte)Config.Entities.Publish.Never)
{
wmTestNames.Add(global::Results.Utils.GetTestName(t.Name, 1, 1));
wmTestNames.Add(Results.Utils.GetTestName(t.Name, 1, 1));
}
}

2
TBF/UI/Results/PreviousResultCtrl.Designer.cs → TBF/UI/ResultsMI/PreviousResultCtrl.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
partial class PreviousResultCtrl
{

4
TBF/UI/Results/PreviousResultCtrl.cs → TBF/UI/ResultsMI/PreviousResultCtrl.cs
View File

@ -1,11 +1,11 @@
///
/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
using TBF.Resources;
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
public partial class PreviousResultCtrl : UserControl
{

0
TBF/UI/Results/PreviousResultCtrl.resx → TBF/UI/ResultsMI/PreviousResultCtrl.resx
View File

2
TBF/UI/Results/PreviousResultIdEventArgs.cs → TBF/UI/ResultsMI/PreviousResultIdEventArgs.cs
View File

@ -1,6 +1,6 @@
using System;
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
public class PreviousResultIdEventArgs : EventArgs
{

2
TBF/UI/Results/PreviousResultsDlg.Designer.cs → TBF/UI/ResultsMI/PreviousResultsDlg.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
partial class PreviousResultsDlg
{

6
TBF/UI/Results/PreviousResultsDlg.cs → TBF/UI/ResultsMI/PreviousResultsDlg.cs
View File

@ -12,7 +12,7 @@ using Results.Entities;
using TBF.Resources;
using TBF.BenchControl.Output.DB.SensusOracle;
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
public enum PreviousResultsMode
{
@ -214,7 +214,7 @@ namespace TBF.UI.Results
}
foreach (var wm in b.WaterMeters)
{
new global::Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print();
new Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print();
}
#endif
}
@ -269,7 +269,7 @@ namespace TBF.UI.Results
if (items == null) items = new List<WMeterRsltItemSpec>();
/// Show dialog with results
global::Results.Forms.BatchResultsDlg dlg = new global::Results.Forms.BatchResultsDlg
Results.Forms.BatchResultsDlg dlg = new Results.Forms.BatchResultsDlg
{
Text = string.Format(Strings.Results_of_batch_0, b.BatchNr),
Results = BatchResults.FromBatch(b),

0
TBF/UI/Results/PreviousResultsDlg.resx → TBF/UI/ResultsMI/PreviousResultsDlg.resx
View File

6
TBF/UI/Results/ResultsArrangementDlg.Designer.cs → TBF/UI/ResultsMI/ResultsArrangementDlg.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
partial class ResultsArrangementDlg
{
@ -47,7 +47,7 @@ namespace TBF.UI.Results
this.okButton = new System.Windows.Forms.Button();
this.cancelButton = new System.Windows.Forms.Button();
this.unlockButton = new System.Windows.Forms.Button();
this.resultsConfigCtrl = new global::Results.Forms.ResultsConfigCtrl();
this.resultsConfigCtrl = new Results.Forms.ResultsConfigCtrl();
this.testsArangementGroupBox.SuspendLayout();
this.metersArangementGroupBox.SuspendLayout();
this.SuspendLayout();
@ -271,7 +271,7 @@ namespace TBF.UI.Results
private System.Windows.Forms.Button unlockButton;
private System.Windows.Forms.TextBox nrMetersTextBox;
private System.Windows.Forms.Label nrMetersLabel;
private global::Results.Forms.ResultsConfigCtrl resultsConfigCtrl;
private Results.Forms.ResultsConfigCtrl resultsConfigCtrl;
private System.Windows.Forms.TextBox minHeightTextBox;
private System.Windows.Forms.Label minHeightLabel;
private System.Windows.Forms.TextBox minWidthTextBox;

2
TBF/UI/Results/ResultsArrangementDlg.cs → TBF/UI/ResultsMI/ResultsArrangementDlg.cs
View File

@ -8,7 +8,7 @@ using Config.Entities;
using Results;
using TBF.Resources;
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
public partial class ResultsArrangementDlg : Form
{

0
TBF/UI/Results/ResultsArrangementDlg.resx → TBF/UI/ResultsMI/ResultsArrangementDlg.resx
View File

2
TBF/UI/Results/ResultsTabPageCtrl.Designer.cs → TBF/UI/ResultsMI/ResultsTabPageCtrl.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
partial class ResultsTabPageCtrl
{

12
TBF/UI/Results/ResultsTabPageCtrl.cs → TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
View File

@ -15,7 +15,7 @@ using TracingDB.Entities;
using TBF.Resources;
using TBF.UiBridge;
namespace TBF.UI.Results
namespace TBF.UI.ResultsMI
{
public partial class ResultsTabPageCtrl : UserControl
{
@ -122,7 +122,7 @@ namespace TBF.UI.Results
if ((batchResults != null) && (Program.LocalSettings != null))
{
global::Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters);
}
if (IsLayoutChangedDueToData(batchResults)) CreateControlsAndFillPanel(batchResults);
@ -135,7 +135,7 @@ namespace TBF.UI.Results
if ((batchResults != null) && (Program.LocalSettings != null))
{
global::Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters);
}
if (IsLayoutChangedDueToData(batchResults)) CreateControlsAndFillPanel(batchResults);
@ -184,7 +184,7 @@ namespace TBF.UI.Results
#endif
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
global::Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
CreateControlsAndFillPanel(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
@ -271,7 +271,7 @@ namespace TBF.UI.Results
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
global::Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
if (isLayoutChangedDueToConfig)
@ -300,7 +300,7 @@ namespace TBF.UI.Results
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
global::Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
UpdateColumnWidths(Program.LocalSettings.RsltsClmnWidths);

0
TBF/UI/Results/ResultsTabPageCtrl.resx → TBF/UI/ResultsMI/ResultsTabPageCtrl.resx
View File

4
TBF/UI/TestProgressControls.cs
View File

@ -119,7 +119,7 @@ namespace TBF.UI
break;
}
string test2Name = global::Results.Utils.GetTestName(test2.Name, test2.Repeats, r);
string test2Name = Results.Utils.GetTestName(test2.Name, test2.Repeats, r);
TestProgressCtrl progress =
new TestProgressCtrl(test2.Id, test2Name, test2.Part, test2.GetExpandedTestName(r), r, test2.Repeats);
progresses.Add(progress);
@ -129,7 +129,7 @@ namespace TBF.UI
}
else
{
string testName = global::Results.Utils.GetTestName(test.Name, test.Repeats, r);
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, r);
TestProgressCtrl progress =
new TestProgressCtrl(test.Id, testName, test.Part, test.GetExpandedTestName(r), r, test.Repeats);
progresses.Add(progress);

8
Users/Grp.cs
View File

@ -34,10 +34,8 @@ namespace Users
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
TraceabilityManagement,
#endif
#if TEST_PROFILES
MetrologicalAuthority,
WaterMeterAuthority,
#endif
NrOfGroups, // Number of groups (this is not a GroupID)
None, // Not a GroupID, can be used to indicate no group membership is required
Invalid = -1, // Not a GroupID, indicates a variable has not been properly set so far
@ -62,10 +60,8 @@ namespace Users
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
case GID.TraceabilityManagement: return Strings.production_tracing_administrator;
#endif
#if KEMPNO_50
case GID.MetrologicalAuthority: return Strings.metrological_authority;
case GID.WaterMeterAuthority: return Strings.water_meter_authority;
#endif
case GID.MetrologicalAuthority: return Strings.metrological_authority;
case GID.WaterMeterAuthority: return Strings.water_meter_authority;
default: return Strings.invalid;
}
}