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

Patch applied - Added new calibration-related properties for IPERL mode, integrated AppDiagnostic functionality into UI, and updated project configuration.

Browse Source
This commit is contained in:
michal
2025-09-07 17:42:26 +02:00
parent f95198e40e
commit efd0515295
78 changed files with 6917 additions and 6221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Paths/PathsOutputCtrl.cs
+215 -198
View File
@@ -17,26 +17,27 @@ using TBF.UI.Shared;
namespace TBF.UI.Bench.Paths
{
public class PathsOutputCtrl : BaseWithListViewEx<Config.Entities.OutputPath>, ITabWithListViewEx
{
static readonly ILog log = LogManager.GetLogger(typeof(PathsOutputCtrl));
public class PathsOutputCtrl : BaseWithListViewEx<Config.Entities.OutputPath>, ITabWithListViewEx
{
static readonly ILog log = LogManager.GetLogger(typeof(PathsOutputCtrl));
/// <summary>
/// Fixed ListViewEx columns
/// </summary>
enum Column
{
Name,
Qfrom,
Qto,
/// <summary>
/// Fixed ListViewEx columns
/// </summary>
enum Column
{
Name,
Qfrom,
Qto,
FlowUnit,
Selector,
RefFlowmtr,
RegulValve,
PidCoef,
Div,
Tdiv,
Scale,
RegulMinStep,
PidCoef,
Div,
Tdiv,
Scale,
StartValve1,
InvertSV1,
StartValve2,
@@ -46,28 +47,28 @@ namespace TBF.UI.Bench.Paths
InvertSV3,
LagSV3,
FixedColumnsCount,
}
readonly int fixedColumnsCount = (int)Column.FixedColumnsCount;
}
readonly int fixedColumnsCount = (int)Column.FixedColumnsCount;
int valvescount;
int regulValvesCount;
PathsDlg parent;
Control parentControl;
Control[] editors;
PathsDlg parent;
Control parentControl;
Control[] editors;
public PathsOutputCtrl()
: base()
{
FixedRowsCount = 1;
}
public PathsOutputCtrl()
: base()
{
FixedRowsCount = 1;
}
public void Initialize(PathsDlg parent, Control parentControl)
{
this.parent = parent;
this.parentControl = parentControl;
public void Initialize(PathsDlg parent, Control parentControl)
{
this.parent = parent;
this.parentControl = parentControl;
/// Load the paths
/// Load the paths
MyItems = parent.Session.QueryOver<Config.Entities.OutputPath>()
.OrderBy(x => x.ItemNr).Asc
.List();
@@ -82,27 +83,28 @@ namespace TBF.UI.Bench.Paths
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
/// 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, (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_to, (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add("Unit", (ls.OutputColumnCount > 3) ? ls.OutputColumnWidths[3] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add("Selector", (ls.OutputColumnCount > 4) ? ls.OutputColumnWidths[4] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Name, (ls.OutputColumnCount > 0) ? ls.OutputColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_from, (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Q_to, (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add("Unit", (ls.OutputColumnCount > 3) ? ls.OutputColumnWidths[3] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add("Selector", (ls.OutputColumnCount > 4) ? ls.OutputColumnWidths[4] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Flowmeter, (ls.OutputColumnCount > 5) ? ls.OutputColumnWidths[5] : 85 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Reg_valve, (ls.OutputColumnCount > 6) ? ls.OutputColumnWidths[6] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.PID, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Diverter, (ls.OutputColumnCount > 8) ? ls.OutputColumnWidths[8] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.T_div, (ls.OutputColumnCount > 9) ? ls.OutputColumnWidths[9] : 70 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Balance, (ls.OutputColumnCount > 10) ? ls.OutputColumnWidths[10] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.RegulMinStep, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.PID, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Diverter, (ls.OutputColumnCount > 8) ? ls.OutputColumnWidths[8] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.T_div, (ls.OutputColumnCount > 9) ? ls.OutputColumnWidths[9] : 70 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Balance, (ls.OutputColumnCount > 10) ? ls.OutputColumnWidths[10] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} 1", Strings.StartValve), (ls.OutputColumnCount > 11) ? ls.OutputColumnWidths[11] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv. SV1"), (ls.OutputColumnCount > 12) ? ls.OutputColumnWidths[12] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv. SV1"), (ls.OutputColumnCount > 12) ? ls.OutputColumnWidths[12] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} 2", Strings.StartValve), (ls.OutputColumnCount > 13) ? ls.OutputColumnWidths[13] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv.SV2"), (ls.OutputColumnCount > 14) ? ls.OutputColumnWidths[14] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Lag SV2"), (ls.OutputColumnCount > 15) ? ls.OutputColumnWidths[15] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv.SV2"), (ls.OutputColumnCount > 14) ? ls.OutputColumnWidths[14] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Lag SV2"), (ls.OutputColumnCount > 15) ? ls.OutputColumnWidths[15] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} 3", Strings.StartValve), (ls.OutputColumnCount > 16) ? ls.OutputColumnWidths[16] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv.SV3"), (ls.OutputColumnCount > 17) ? ls.OutputColumnWidths[17] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Lag SV3"), (ls.OutputColumnCount > 18) ? ls.OutputColumnWidths[18] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv.SV3"), (ls.OutputColumnCount > 17) ? ls.OutputColumnWidths[17] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Lag SV3"), (ls.OutputColumnCount > 18) ? ls.OutputColumnWidths[18] : 80 * parent.Dpi / Constants.Dpi100pct);
valvescount = 0;
regulValvesCount = 0;
@@ -124,12 +126,13 @@ namespace TBF.UI.Bench.Paths
regulValvesCount++;
}
/// Prepare fixed columns combo boxes
/// Prepare fixed columns combo boxes
ComboBox flowMeterComboBox = new ComboBox();
ComboBox regulValveComboBox = new ComboBox();
ComboBox RegulMinStepComboBox = new ComboBox();
ComboBox diverterComboBox = new ComboBox();
ComboBox tempMeterDivComboBox = new ComboBox();
ComboBox scaleComboBox = new ComboBox();
ComboBox tempMeterDivComboBox = new ComboBox();
ComboBox scaleComboBox = new ComboBox();
ComboBox startValve1ComboBox = new ComboBox();
ComboBox invertSV1ComboBox = new ComboBox();
ComboBox startValve2ComboBox = new ComboBox();
@@ -140,9 +143,10 @@ namespace TBF.UI.Bench.Paths
TextBox lagSV3TextBox = new TextBox();
flowMeterComboBox.Items.Add("---");
regulValveComboBox.Items.Add("---");
RegulMinStepComboBox.Items.Add("---");
diverterComboBox.Items.Add("---");
tempMeterDivComboBox.Items.Add("---");
scaleComboBox.Items.Add("---");
tempMeterDivComboBox.Items.Add("---");
scaleComboBox.Items.Add("---");
startValve1ComboBox.Items.Add("---");
invertSV1ComboBox.Items.Add(Strings.no);
invertSV1ComboBox.Items.Add(Strings.yes);
@@ -153,10 +157,10 @@ namespace TBF.UI.Bench.Paths
invertSV3ComboBox.Items.Add(Strings.no);
invertSV3ComboBox.Items.Add(Strings.yes);
foreach (var cmpnt in parent.TbfComponents)
{
{
if (cmpnt is IFlowMeter) flowMeterComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IRegValve) regulValveComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IDiverter) diverterComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IDiverter) diverterComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is ITempMeter) tempMeterDivComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IScaleOrTank) scaleComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IValve && (cmpnt as IValve).CoupledTo == null)
@@ -165,42 +169,43 @@ namespace TBF.UI.Bench.Paths
startValve2ComboBox.Items.Add(cmpnt.Cfg.Name);
startValve3ComboBox.Items.Add(cmpnt.Cfg.Name);
}
}
}
/// Flow unit
var flowUnitBox = new ComboBox();
for (Unit u = 0; u < Unit.Count; u++) if (Units.IsFlow(u)) flowUnitBox.Items.Add(u.ToDescription());
editors = new Control[fixedColumnsCount + valvescount + regulValvesCount];
///
editors[(int)Column.Name] = new TextBox(); /// Name
editors[(int)Column.Qfrom] = new TextBox(); /// Q_from
editors[(int)Column.Qto] = new TextBox(); /// Q_to
editors[(int)Column.FlowUnit] = flowUnitBox; /// Flow unit
editors[(int)Column.Selector] = new TextBox(); /// Selector
editors[(int)Column.RefFlowmtr] = flowMeterComboBox;
editors[(int)Column.RegulValve] = regulValveComboBox;
editors[(int)Column.PidCoef] = new TextBox(); /// PID
editors[(int)Column.Div] = diverterComboBox;
editors[(int)Column.Tdiv] = tempMeterDivComboBox;
editors[(int)Column.Scale] = scaleComboBox;
///
editors[(int)Column.Name] = new TextBox(); /// Name
editors[(int)Column.Qfrom] = new TextBox(); /// Q_from
editors[(int)Column.Qto] = new TextBox(); /// Q_to
editors[(int)Column.FlowUnit] = flowUnitBox; /// Flow unit
editors[(int)Column.Selector] = new TextBox(); /// Selector
editors[(int)Column.RefFlowmtr] = flowMeterComboBox;
editors[(int)Column.RegulValve] = regulValveComboBox;
editors[(int)Column.RegulMinStep] = RegulMinStepComboBox;
editors[(int)Column.PidCoef] = new TextBox(); /// PID
editors[(int)Column.Div] = diverterComboBox;
editors[(int)Column.Tdiv] = tempMeterDivComboBox;
editors[(int)Column.Scale] = scaleComboBox;
editors[(int)Column.StartValve1] = startValve1ComboBox;
editors[(int)Column.InvertSV1] = invertSV1ComboBox;
editors[(int)Column.InvertSV1] = invertSV1ComboBox;
editors[(int)Column.StartValve2] = startValve2ComboBox;
editors[(int)Column.InvertSV2] = invertSV2ComboBox;
editors[(int)Column.LagSV2] = lagSV2TextBox;
editors[(int)Column.InvertSV2] = invertSV2ComboBox;
editors[(int)Column.LagSV2] = lagSV2TextBox;
editors[(int)Column.StartValve3] = startValve3ComboBox;
editors[(int)Column.InvertSV3] = invertSV3ComboBox;
editors[(int)Column.LagSV3] = lagSV3TextBox;
editors[(int)Column.InvertSV3] = invertSV3ComboBox;
editors[(int)Column.LagSV3] = lagSV3TextBox;
/// Prepare valve combo-boxes (max. 64 valves)
for (int i = 0; i < valvescount; i++)
{
ComboBox cb = new ComboBox();
cb.Items.Add("---");
cb.Items.Add(Strings.open);
cb.Items.Add(Strings.close);
editors[fixedColumnsCount + i] = cb;
}
{
ComboBox cb = new ComboBox();
cb.Items.Add("---");
cb.Items.Add(Strings.open);
cb.Items.Add(Strings.close);
editors[fixedColumnsCount + i] = cb;
}
/// Prepare regul. valve combo-boxes
for (int i = 0; i < regulValvesCount; i++)
{
@@ -220,21 +225,29 @@ namespace TBF.UI.Bench.Paths
parent.Controls.Add(editors[i]);
}
base.RedrawAll();
}
RegulMinStepComboBox.Items.Add("0");
RegulMinStepComboBox.Items.Add("50");
RegulMinStepComboBox.Items.Add("100");
RegulMinStepComboBox.Items.Add("150");
RegulMinStepComboBox.Items.Add("200");
RegulMinStepComboBox.Items.Add("250");
RegulMinStepComboBox.Items.Add("300");
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
{
if (e.SubItem != (int)Column.FlowUnit && (!Unlocked || e.SubItem >= editors.Length)) return;
if ((e.Item.Tag is IHasItemNr) &&
((e.Item.Tag as IHasItemNr).ItemNr < FixedRowsCount) &&
(e.SubItem < fixedColumnsCount))
{
return;
}
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
((e.Item.Tag as IHasItemNr).ItemNr < FixedRowsCount) &&
(e.SubItem < fixedColumnsCount))
{
return;
}
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
@@ -265,7 +278,7 @@ namespace TBF.UI.Bench.Paths
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
{
var entity = e.Item.Tag as Config.Entities.OutputPath;
double ddummy;
@@ -332,12 +345,12 @@ namespace TBF.UI.Bench.Paths
item.SubItems[ix].Text = Units.ConvertTo(newUnit, entity.QtoTextChngd ? flowM3ph : entity.Qto).ToString();
}
public override void DrawOne(object myItem)
{
Config.Entities.OutputPath entity =(Config.Entities.OutputPath)myItem;
Rig.OutputPath path = new Rig.OutputPath(entity, parent.TbfComponents);
public override void DrawOne(object myItem)
{
Config.Entities.OutputPath entity = (Config.Entities.OutputPath)myItem;
Rig.OutputPath path = new Rig.OutputPath(entity, parent.TbfComponents);
ListViewItem lvi = new ListViewItem(entity.Name);
ListViewItem lvi = new ListViewItem(entity.Name);
lvi.UseItemStyleForSubItems = false;
lvi.SubItems.Add(Units.ConvertTo(entity.FlowUnit, path.Qfrom).ToString()); /// Q_from
@@ -346,10 +359,11 @@ namespace TBF.UI.Bench.Paths
lvi.SubItems.Add(path.Selector);
lvi.SubItems.Add((path.FlowMeter != null) ? path.FlowMeter.Cfg.Name : "---");
lvi.SubItems.Add((path.RegValve != null) ? path.RegValve.Cfg.Name : "---");
lvi.SubItems.Add(path.PidCoef.ToString("F1"));
lvi.SubItems.Add((path.RegValve != null) ? (path.RegulMinStep * 50).ToString() : "---");
lvi.SubItems.Add(path.PidCoef.ToString("F1"));
lvi.SubItems.Add((path.Diverter != null) ? path.Diverter.Cfg.Name : "---");
lvi.SubItems.Add((path.TempMtrDiv != null) ? path.TempMtrDiv.Cfg.Name : "---");
lvi.SubItems.Add((path.Scale != null) ? path.Scale.Cfg.Name : "---");
lvi.SubItems.Add((path.TempMtrDiv != null) ? path.TempMtrDiv.Cfg.Name : "---");
lvi.SubItems.Add((path.Scale != null) ? path.Scale.Cfg.Name : "---");
lvi.SubItems.Add((path.StartValve1 != null) ? path.StartValve1.Cfg.Name : "---");
@@ -361,28 +375,28 @@ namespace TBF.UI.Bench.Paths
lvi.SubItems.Add(path.InvertSV3 ? Strings.yes : Strings.no);
lvi.SubItems.Add(path.LagSV3.ToString());
foreach (var valve in parent.Valves)
{
foreach (var valve in parent.Valves)
{
int subItemNr = lvi.SubItems.Count;
if (valve.Category == ValveCategory.Output)
{
if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve))
{
lvi.SubItems.Add(Strings.open);
if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve))
{
lvi.SubItems.Add(Strings.open);
lvi.SubItems[subItemNr].BackColor = Color.LightGray;
}
else if (path.ValvesClose != null && path.ValvesClose.Contains(valve))
{
lvi.SubItems.Add(Strings.close);
else if (path.ValvesClose != null && path.ValvesClose.Contains(valve))
{
lvi.SubItems.Add(Strings.close);
lvi.SubItems[subItemNr].BackColor = Color.White;
}
else
{
lvi.SubItems.Add("---");
else
{
lvi.SubItems.Add("---");
lvi.SubItems[subItemNr].BackColor = Color.White;
}
}
}
}
}
foreach (var rvp in path.RegVPositions)
{
@@ -400,36 +414,39 @@ namespace TBF.UI.Bench.Paths
}
}
lvi.Tag = entity;
lvi.Tag = entity;
Items.Add(lvi);
}
Items.Add(lvi);
}
public override void UpdateOne(ListViewItem lvi, object myItem)
{
Config.Entities.OutputPath entity = (Config.Entities.OutputPath)myItem;
public override void UpdateOne(ListViewItem lvi, object myItem)
{
Config.Entities.OutputPath entity = (Config.Entities.OutputPath)myItem;
entity.Name = lvi.Text;
entity.Name = lvi.Text;
double Qfrom;
double Qfrom;
bool allOk = Utils.TryParseUDouble(lvi.SubItems[(int)Column.Qfrom].Text, out Qfrom);
entity.Qfrom = Units.ConvertFrom(entity.FlowUnit, Qfrom);
double Qto;
double Qto;
allOk &= Utils.TryParseUDouble(lvi.SubItems[(int)Column.Qto].Text, out Qto);
entity.Qto = Units.ConvertFrom(entity.FlowUnit, Qto);
entity.Selector = lvi.SubItems[(int)Column.Selector].Text;
entity.FlowMeter = lvi.SubItems[(int)Column.RefFlowmtr].Text.Equals("---") ? null : lvi.SubItems[(int)Column.RefFlowmtr].Text;
entity.FlowMeter = lvi.SubItems[(int)Column.RefFlowmtr].Text.Equals("---") ? null : lvi.SubItems[(int)Column.RefFlowmtr].Text;
entity.RegValve = lvi.SubItems[(int)Column.RegulValve].Text.Equals("---") ? null : lvi.SubItems[(int)Column.RegulValve].Text;
int val;
int.TryParse(lvi.SubItems[(int)Column.RegulMinStep].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)Column.RegulMinStep].Text, out val);
entity.RegulMinStep = val / 50;
float pid;
allOk &= Utils.TryParseSFloat(lvi.SubItems[(int)Column.PidCoef].Text, out pid);
entity.PidCoef = pid;
float pid;
allOk &= Utils.TryParseSFloat(lvi.SubItems[(int)Column.PidCoef].Text, out pid);
entity.PidCoef = pid;
entity.Diverter = lvi.SubItems[(int)Column.Div].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Div].Text;
entity.TempMtrDiv = lvi.SubItems[(int)Column.Tdiv].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Tdiv].Text;
entity.Scale = lvi.SubItems[(int)Column.Scale].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Scale].Text;
entity.Diverter = lvi.SubItems[(int)Column.Div].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Div].Text;
entity.TempMtrDiv = lvi.SubItems[(int)Column.Tdiv].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Tdiv].Text;
entity.Scale = lvi.SubItems[(int)Column.Scale].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Scale].Text;
string sv1 = lvi.SubItems[(int)Column.StartValve1].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)Column.StartValve1].Text;
bool invertSV1 = lvi.SubItems[(int)Column.InvertSV1].Text.Equals(Strings.yes);
@@ -444,29 +461,29 @@ namespace TBF.UI.Bench.Paths
///
entity.StartValve = string.Format("{0}~{1}~{2}~{3}~{4}~{5}~{6}~{7}", sv1, (invertSV1 ? "i" : "n"), sv2, (invertSV2 ? "i" : "n"), lagSV2, sv3, (invertSV3 ? "i" : "n"), lagSV3);
string valvesOpen = string.Empty;
string valvesClose = string.Empty;
string valvesOpen = string.Empty;
string valvesClose = string.Empty;
int k = 0;
foreach (var valve in parent.Valves)
{
foreach (var valve in parent.Valves)
{
if (valve.Category == ValveCategory.Output)
{
string text = lvi.SubItems[fixedColumnsCount + k].Text;
if (text.Equals(Strings.open))
{
if (valvesOpen != string.Empty) valvesOpen += ";";
valvesOpen += valve.Cfg.Name;
}
if (text.Equals(Strings.close))
{
if (valvesClose != string.Empty) valvesClose += ";";
valvesClose += valve.Cfg.Name;
}
if (text.Equals(Strings.open))
{
if (valvesOpen != string.Empty) valvesOpen += ";";
valvesOpen += valve.Cfg.Name;
}
if (text.Equals(Strings.close))
{
if (valvesClose != string.Empty) valvesClose += ";";
valvesClose += valve.Cfg.Name;
}
k++;
}
}
entity.ValvesOpen = valvesOpen;
entity.ValvesClose = valvesClose;
}
entity.ValvesOpen = valvesOpen;
entity.ValvesClose = valvesClose;
StringBuilder sb = new StringBuilder();
for (int i = 0; i < regulValvesCount; i++)
@@ -487,47 +504,47 @@ namespace TBF.UI.Bench.Paths
}
}
entity.RegVPositions = sb.ToString();
}
}
public void AddOne()
{
Config.Entities.OutputPath entity;
public void AddOne()
{
Config.Entities.OutputPath entity;
if (MyItems.Count < FixedRowsCount)
{
entity = new Config.Entities.OutputPath(Strings._none_, MyItems.Count);
}
else
{
/// Find an unused test name
string newName;
for (int nameId = 1; true; nameId++)
{
newName = Strings.New_output_path_name + nameId.ToString();
bool notUsed = true;
foreach (var t in MyItems) if (t.Name.Equals(newName)) notUsed = false;
if (notUsed) break;
}
entity = new Config.Entities.OutputPath(newName, MyItems.Count);
}
if (MyItems.Count < FixedRowsCount)
{
entity = new Config.Entities.OutputPath(Strings._none_, MyItems.Count);
}
else
{
/// Find an unused test name
string newName;
for (int nameId = 1; true; nameId++)
{
newName = Strings.New_output_path_name + nameId.ToString();
bool notUsed = true;
foreach (var t in MyItems) if (t.Name.Equals(newName)) notUsed = false;
if (notUsed) break;
}
entity = new Config.Entities.OutputPath(newName, MyItems.Count);
}
base.AddOne(entity);
}
base.AddOne(entity);
}
public new void RemoveSelected()
{
bool lastOneRemoved = base.RemoveSelected();
if (lastOneRemoved && parent != null)
{
parent.UpdateButtonStates(SharedButtons.SelectedItemPos.None);
}
}
public new void RemoveSelected()
{
bool lastOneRemoved = base.RemoveSelected();
if (lastOneRemoved && parent != null)
{
parent.UpdateButtonStates(SharedButtons.SelectedItemPos.None);
}
}
public string GetWarningsBeforeSaving(ref Dictionary<string, string> renmInfo)
{
base.OkBtnClicked(); /// = UpdateAll()
public string GetWarningsBeforeSaving(ref Dictionary<string, string> renmInfo)
{
base.OkBtnClicked(); /// = UpdateAll()
string warnings = string.Empty;
string warnings = string.Empty;
foreach (var entity in ToBeRemovedItems)
{
@@ -553,30 +570,30 @@ namespace TBF.UI.Bench.Paths
if (occurances > 0)
{
warnings += string.Format(Strings._0_path_1_used_by_2_tests_will_be_renamed_to_3_4, Strings.OutputTabPageTitle, entity.OriName, occurances, entity.Name, Environment.NewLine);
warnings += string.Format(Strings._0_path_1_used_by_2_tests_will_be_renamed_to_3_4, Strings.OutputTabPageTitle, entity.OriName, occurances, entity.Name, Environment.NewLine);
renmInfo.Add(entity.OriName, entity.Name);
}
}
}
return warnings;
}
return warnings;
}
public void UpdateRelatedItems(Dictionary<string, string> renameInfo)
public void UpdateRelatedItems(Dictionary<string, string> renameInfo)
{
foreach (var ri in renameInfo)
{
var tests = parent.Session.QueryOver<Config.Entities.Test>()
.Where(x => x.OutputPath == ri.Key)
.List();
foreach (var ri in renameInfo)
{
var tests = parent.Session.QueryOver<Config.Entities.Test>()
.Where(x => x.OutputPath == ri.Key)
.List();
foreach (var t in tests)
{
t.OutputPath = ri.Value;
parent.Session.Update(t);
}
}
}
foreach (var t in tests)
{
t.OutputPath = ri.Value;
parent.Session.Update(t);
}
}
}
/// <summary>
/// Update the entities and save them to the database
@@ -588,13 +605,13 @@ namespace TBF.UI.Bench.Paths
/// Update the database
foreach (var entity in ToBeRemovedItems)
{
parent.Session.Delete(entity);
}
parent.Session.Delete(entity);
}
foreach (var entity in MyItems)
{
parent.Session.SaveOrUpdate(entity);
}
parent.Session.SaveOrUpdate(entity);
}
SaveUISettings();
}
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+4 -4
View File
@@ -28,11 +28,11 @@ namespace TBF.UI.Bench.Uncertainties
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
#if LANG_PL
sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
#else
//#if LANG_PL
// sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
//#else
sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists, GID.MetrologicalAuthority };
#endif
//#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
sharedButtons.Unlocked += unlockButton_Click;
sharedButtons.OKClicked += okButton_Click;
TBF/UI/MainWnd.Designer.cs
Generated
+10 -2
View File
@@ -91,6 +91,7 @@ namespace TBF.UI
this.homeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.eventLogsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.settingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.appDiagnosticMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.usersTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.languageTSMItem = new System.Windows.Forms.ToolStripMenuItem();
this.databaseSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -564,6 +565,7 @@ namespace TBF.UI
// settingsTSMenuItem
//
this.settingsTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.appDiagnosticMenuItem,
this.usersTSMenuItem,
this.languageTSMItem,
this.databaseSettingsTSMenuItem,
@@ -575,6 +577,12 @@ namespace TBF.UI
this.settingsTSMenuItem.Name = "settingsTSMenuItem";
resources.ApplyResources(this.settingsTSMenuItem, "settingsTSMenuItem");
//
// appDiagnosticMenuItem
//
this.appDiagnosticMenuItem.Name = "appDiagnosticMenuItem";
resources.ApplyResources(this.appDiagnosticMenuItem, "appDiagnosticMenuItem");
this.appDiagnosticMenuItem.Click += new System.EventHandler(this.appDiagnosticMenuItem_Click);
//
// usersTSMenuItem
//
this.usersTSMenuItem.Name = "usersTSMenuItem";
@@ -652,7 +660,6 @@ namespace TBF.UI
//
// mainMenuStrip
//
this.mainMenuStrip.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2);
this.mainMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.benchTSMenuItem,
@@ -821,7 +828,8 @@ namespace TBF.UI
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.SplitContainer topHorizontalSplitContainer;
private System.Windows.Forms.ToolStripMenuItem upgradeTSMenuItem;
private System.Windows.Forms.TabPage graphsTabPage;
private System.Windows.Forms.ToolStripMenuItem appDiagnosticMenuItem;
private System.Windows.Forms.TabPage graphsTabPage;
private TBF.UI.Graphs.GraphsTabPageCtrl graphsTabPageCtrl;
private System.Windows.Forms.ToolStripMenuItem optoHeadsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem;
TBF/UI/MainWnd.cs
+50 -1
View File
@@ -17,6 +17,9 @@ using SharedDatabase;
using TBF.Resources;
using TBF.UiBridge;
using TBF.UI.Shared;
using AppDiagnostic;
using SharedComponents;
using System.Diagnostics;
namespace TBF.UI
{
@@ -252,7 +255,8 @@ namespace TBF.UI
backUpResultsTSMItem.Text = Strings.Results;
passwdTSMItem.Text = Strings.Password;
upgradeTSMenuItem.Text = Strings.Upgrade_DB;
optoHeadsToolStripMenuItem.Text = Strings.Optical_heads;
appDiagnosticMenuItem.Text = Strings.Application_Diagnostic;
optoHeadsToolStripMenuItem.Text = Strings.Optical_heads;
clearCountersToolStripMenuItem.Text = Strings.Clear_counters;
helpTSMenuItem.Text = Strings.Help;
aboutTSMenuItem.Text = Strings.About;
@@ -474,6 +478,9 @@ namespace TBF.UI
System.Windows.Forms.MessageBoxButtons.OK,
System.Windows.Forms.MessageBoxIcon.Exclamation);
}
rightHorizSplitContainer.SplitterDistance = rightHorizSplitContainer.Height / 3;// - BenchControlPanel.Height;
topVerticalSplitContainer.SplitterDistance = topVerticalSplitContainer.Width / 2;
}
/// <summary>
@@ -675,6 +682,7 @@ namespace TBF.UI
CurrentUser.IsMemberOf(GID.HeadOfLab) ||
CurrentUser.IsMemberOf(GID.TestingSpecialists) ||
CurrentUser.IsMemberOf(GID.Metrologists);
appDiagnosticMenuItem.Visible = CurrentUser.IsMemberOf(GID.Administrators) && CurrentUser.IsPowerUser();
}
public void UpdateStatusP(string statusPStr)
@@ -1147,6 +1155,43 @@ namespace TBF.UI
new TBF.UI.Settings.UpgradeSelectionDlg().ShowDialog();
}
private void appDiagnosticMenuItem_Click(object sender, EventArgs e)
{
/*diagApi = new DiagApi(liveLogCache);
//diagApi.AddLog("ahoj, toto je prvy log");
ILog loger = LogManager.GetLogger("logCache");
log.Debug("ahoj, ideme");*/
LiveLogCache.Instance.AddLog("=== Live diagnostic entry ===");
DiagApi liveDiagApi = new DiagApi();
/*try
{
// Predpoklad�me, �e ApplicationDiagnostic.exe je v rovnakom adres�ri ako hlavn� aplik�cia
string exePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AppDiagnostic.exe");
if (File.Exists(exePath))
{
ProcessStartInfo startInfo = new ProcessStartInfo
{
FileName = exePath,
UseShellExecute = true // Spust� aplik�ciu ako samostatn� proces
};
System.Diagnostics.Process.Start(startInfo);
}
else
{
MessageBox.Show("ApplicationDiagnostic.exe not found.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
{
MessageBox.Show($"Failed to start ApplicationDiagnostic: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}*/
}
private void optoHeadsToolStripMenuItem_Click(object sender, EventArgs e)
{
new Rig.TestMethods.iPerlCommunication.iPerlCommunicationForm(true).ShowDialog();
@@ -1362,5 +1407,9 @@ namespace TBF.UI
return;
}
}
protected override void OnFormClosing(FormClosingEventArgs e)
{
base.OnFormClosing(e);
}
}
}
TBF/UI/MainWnd.de.resx
+3
View File
@@ -383,4 +383,7 @@
<data name="$this.Text" xml:space="preserve">
<value>Test Bench Framework</value>
</data>
<data name="rightHorizSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>232, 644</value>
</data>
</root>
TBF/UI/MainWnd.resx
+115 -217
View File
@@ -125,9 +125,6 @@
<data name="topVerticalSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="topVerticalSplitContainer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="messageLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -139,13 +136,10 @@
<value>NoControl</value>
</data>
<data name="messageLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 105</value>
</data>
<data name="messageLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
<value>6, 68</value>
</data>
<data name="messageLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 38</value>
<value>0, 25</value>
</data>
<data name="messageLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -172,13 +166,10 @@
<value>NoControl</value>
</data>
<data name="activityLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 43</value>
</data>
<data name="activityLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
<value>6, 28</value>
</data>
<data name="activityLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 38</value>
<value>0, 25</value>
</data>
<data name="activityLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -202,16 +193,10 @@
<value>Verdana, 12pt</value>
</data>
<data name="activityGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="activityGroupBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="activityGroupBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>5, 5</value>
</data>
<data name="activityGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>540, 112</value>
<value>334, 115</value>
</data>
<data name="activityGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
@@ -232,7 +217,7 @@
<value>0</value>
</data>
<data name="topVerticalSplitContainer.Panel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 0, 0</value>
<value>5, 5, 0, 0</value>
</data>
<data name="&gt;&gt;topVerticalSplitContainer.Panel1.Name" xml:space="preserve">
<value>topVerticalSplitContainer.Panel1</value>
@@ -253,10 +238,7 @@
<value>True</value>
</data>
<data name="topHorizontalSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="topHorizontalSplitContainer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>5, 5</value>
</data>
<data name="topHorizontalSplitContainer.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
<value>Horizontal</value>
@@ -270,9 +252,6 @@
<data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="splitContainer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="splitContainer2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -280,10 +259,7 @@
<value>True</value>
</data>
<data name="splitContainer2.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 35</value>
</data>
<data name="splitContainer2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>13, 23</value>
</data>
<data name="procedureComboBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -298,10 +274,10 @@
<value>0, 0</value>
</data>
<data name="procedureComboBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>34, 5, 4, 5</value>
<value>23, 3, 3, 3</value>
</data>
<data name="procedureComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>758, 46</value>
<value>360, 33</value>
</data>
<data name="procedureComboBox.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -337,13 +313,10 @@
<value>NoControl</value>
</data>
<data name="reloadProceduresButton.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 0</value>
</data>
<data name="reloadProceduresButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>3, 0</value>
</data>
<data name="reloadProceduresButton.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 51</value>
<value>35, 33</value>
</data>
<data name="reloadProceduresButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -376,13 +349,13 @@
<value>1</value>
</data>
<data name="splitContainer2.Size" type="System.Drawing.Size, System.Drawing">
<value>785, 25</value>
<value>386, 39</value>
</data>
<data name="splitContainer2.SplitterDistance" type="System.Int32, mscorlib">
<value>758</value>
<value>360</value>
</data>
<data name="splitContainer2.SplitterWidth" type="System.Int32, mscorlib">
<value>2</value>
<value>1</value>
</data>
<data name="splitContainer2.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -408,14 +381,11 @@
<data name="procedureGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="procedureGroupBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="procedureGroupBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>20, 5, 20, 5</value>
<value>13, 3, 13, 3</value>
</data>
<data name="procedureGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 65</value>
<value>412, 65</value>
</data>
<data name="procedureGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
@@ -451,13 +421,10 @@
<value>NoControl</value>
</data>
<data name="mainProgressBar.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 35</value>
</data>
<data name="mainProgressBar.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>6, 23</value>
</data>
<data name="mainProgressBar.Size" type="System.Drawing.Size, System.Drawing">
<value>356, 51</value>
<value>237, 33</value>
</data>
<data name="mainProgressBar.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -483,14 +450,8 @@
<data name="progressGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="progressGroupBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="progressGroupBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="progressGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>252, 65</value>
<value>254, 65</value>
</data>
<data name="progressGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
@@ -523,13 +484,10 @@
<value>1</value>
</data>
<data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 65</value>
<value>670, 65</value>
</data>
<data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>825</value>
</data>
<data name="splitContainer1.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
<value>412</value>
</data>
<data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -565,13 +523,10 @@
<value>NoControl</value>
</data>
<data name="descriptionLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 23</value>
</data>
<data name="descriptionLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
<value>8, 15</value>
</data>
<data name="descriptionLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 20</value>
<value>0, 13</value>
</data>
<data name="descriptionLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -594,14 +549,8 @@
<data name="descriptionGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="descriptionGroupBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="descriptionGroupBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="descriptionGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 41</value>
<value>670, 46</value>
</data>
<data name="descriptionGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@@ -631,14 +580,11 @@
<value>1</value>
</data>
<data name="topHorizontalSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 112</value>
<value>670, 115</value>
</data>
<data name="topHorizontalSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>65</value>
</data>
<data name="topHorizontalSplitContainer.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="topHorizontalSplitContainer.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
@@ -655,7 +601,7 @@
<value>0</value>
</data>
<data name="topVerticalSplitContainer.Panel2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 0, 0</value>
<value>5, 5, 0, 0</value>
</data>
<data name="&gt;&gt;topVerticalSplitContainer.Panel2.Name" xml:space="preserve">
<value>topVerticalSplitContainer.Panel2</value>
@@ -670,13 +616,10 @@
<value>1</value>
</data>
<data name="topVerticalSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1645, 120</value>
<value>1018, 120</value>
</data>
<data name="topVerticalSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>548</value>
</data>
<data name="topVerticalSplitContainer.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
<value>339</value>
</data>
<data name="topVerticalSplitContainer.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@@ -700,10 +643,7 @@
<value>True</value>
</data>
<data name="verticalSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 35</value>
</data>
<data name="verticalSplitContainer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>0, 24</value>
</data>
<data name="horizontalSplitContainer.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -714,9 +654,6 @@
<data name="horizontalSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="horizontalSplitContainer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="horizontalSplitContainer.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
<value>Horizontal</value>
</data>
@@ -738,11 +675,8 @@
<data name="drawingCtrl.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="drawingCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="drawingCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1637, 979</value>
<value>1010, 511</value>
</data>
<data name="drawingCtrl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -762,11 +696,8 @@
<data name="homeTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="homeTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="homeTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1637, 979</value>
<value>1010, 511</value>
</data>
<data name="homeTabPage.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
@@ -796,10 +727,10 @@
<value>0, 0</value>
</data>
<data name="processTabPageCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
<value>4, 4, 4, 4</value>
</data>
<data name="processTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="processTabPageCtrl.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -808,7 +739,7 @@
<value>processTabPageCtrl</value>
</data>
<data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2139.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
<value>processTabPage</value>
@@ -819,11 +750,8 @@
<data name="processTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="processTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="processTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="processTabPage.TabIndex" type="System.Int32, mscorlib">
<value>30</value>
@@ -846,11 +774,8 @@
<data name="insertTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="insertTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="insertTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="insertTabPage.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
@@ -880,10 +805,10 @@
<value>0, 0</value>
</data>
<data name="resultsTabPageCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
<value>4, 4, 4, 4</value>
</data>
<data name="resultsTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="resultsTabPageCtrl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -892,7 +817,7 @@
<value>resultsTabPageCtrl</value>
</data>
<data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2139.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
<value>resultsTabPage</value>
@@ -903,11 +828,8 @@
<data name="resultsTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="resultsTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="resultsTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="resultsTabPage.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@@ -937,10 +859,10 @@
<value>0, 0</value>
</data>
<data name="graphsTabPageCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
<value>5, 5, 5, 5</value>
</data>
<data name="graphsTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="graphsTabPageCtrl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -949,7 +871,7 @@
<value>graphsTabPageCtrl</value>
</data>
<data name="&gt;&gt;graphsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2139.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;graphsTabPageCtrl.Parent" xml:space="preserve">
<value>graphsTabPage</value>
@@ -960,11 +882,8 @@
<data name="graphsTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="graphsTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="graphsTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="graphsTabPage.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
@@ -994,10 +913,10 @@
<value>0, 0</value>
</data>
<data name="eventLogsTabPageCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
<value>4, 4, 4, 4</value>
</data>
<data name="eventLogsTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="eventLogsTabPageCtrl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1006,7 +925,7 @@
<value>eventLogsTabPageCtrl</value>
</data>
<data name="&gt;&gt;eventLogsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2139.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;eventLogsTabPageCtrl.Parent" xml:space="preserve">
<value>eventLogsTabPage</value>
@@ -1017,11 +936,8 @@
<data name="eventLogsTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="eventLogsTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="eventLogsTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="eventLogsTabPage.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@@ -1051,10 +967,10 @@
<value>0, 0</value>
</data>
<data name="calendarTabPageCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
<value>5, 5, 5, 5</value>
</data>
<data name="calendarTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="calendarTabPageCtrl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1063,7 +979,7 @@
<value>calendarTabPageCtrl</value>
</data>
<data name="&gt;&gt;calendarTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2139.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;calendarTabPageCtrl.Parent" xml:space="preserve">
<value>calendarTabPage</value>
@@ -1074,11 +990,8 @@
<data name="calendarTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="calendarTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="calendarTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="calendarTabPage.TabIndex" type="System.Int32, mscorlib">
<value>33</value>
@@ -1108,10 +1021,10 @@
<value>0, 0</value>
</data>
<data name="picturesTabPageCtrl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
<value>5, 5, 5, 5</value>
</data>
<data name="picturesTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="picturesTabPageCtrl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1120,7 +1033,7 @@
<value>picturesTabPageCtrl</value>
</data>
<data name="&gt;&gt;picturesTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2139.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;picturesTabPageCtrl.Parent" xml:space="preserve">
<value>picturesTabPage</value>
@@ -1131,11 +1044,8 @@
<data name="picturesTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 5</value>
</data>
<data name="picturesTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="picturesTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1522, 900</value>
<value>1010, 511</value>
</data>
<data name="picturesTabPage.TabIndex" type="System.Int32, mscorlib">
<value>31</value>
@@ -1164,11 +1074,8 @@
<data name="mainTabControl.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="mainTabControl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="mainTabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>1645, 988</value>
<value>1018, 520</value>
</data>
<data name="mainTabControl.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -1198,14 +1105,11 @@
<value>1</value>
</data>
<data name="horizontalSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1645, 1114</value>
<value>1018, 644</value>
</data>
<data name="horizontalSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>120</value>
</data>
<data name="horizontalSplitContainer.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="horizontalSplitContainer.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
@@ -1239,9 +1143,6 @@
<data name="rightHorizSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="rightHorizSplitContainer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="rightHorizSplitContainer.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
<value>Horizontal</value>
</data>
@@ -1257,11 +1158,8 @@
<data name="progressFlowLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="progressFlowLayoutPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="progressFlowLayoutPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>230, 240</value>
<value>232, 240</value>
</data>
<data name="progressFlowLayoutPanel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -1306,14 +1204,11 @@
<value>1</value>
</data>
<data name="rightHorizSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>230, 1114</value>
<value>232, 644</value>
</data>
<data name="rightHorizSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>240</value>
</data>
<data name="rightHorizSplitContainer.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="rightHorizSplitContainer.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
@@ -1342,13 +1237,10 @@
<value>1</value>
</data>
<data name="verticalSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1881, 1114</value>
<value>1254, 644</value>
</data>
<data name="verticalSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>1645</value>
</data>
<data name="verticalSplitContainer.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
<value>1018</value>
</data>
<data name="verticalSplitContainer.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -1384,25 +1276,22 @@
<value>152, 17</value>
</metadata>
<data name="userInfoStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 15</value>
<value>0, 17</value>
</data>
<data name="statusPStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 15</value>
<value>0, 17</value>
</data>
<data name="routeStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 15</value>
<value>0, 17</value>
</data>
<data name="activityStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 15</value>
<value>0, 17</value>
</data>
<data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 1149</value>
</data>
<data name="statusStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 0, 21, 0</value>
<value>0, 668</value>
</data>
<data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>1881, 22</value>
<value>1254, 22</value>
</data>
<data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -1423,148 +1312,151 @@
<value>1</value>
</data>
<data name="benchComponentsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="benchComponentsTSMenuItem.Text" xml:space="preserve">
<value>Components</value>
</data>
<data name="benchPathsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="benchPathsTSMenuItem.Text" xml:space="preserve">
<value>Paths</value>
</data>
<data name="benchTransitionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="benchTransitionsToolStripMenuItem.Text" xml:space="preserve">
<value>Transitions</value>
</data>
<data name="benchMetrologyTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="benchMetrologyTSMenuItem.Text" xml:space="preserve">
<value>Metrology</value>
</data>
<data name="benchUncertaintyTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="benchUncertaintyTSMItem.Text" xml:space="preserve">
<value>Uncertainty</value>
</data>
<data name="benchTestProfilesTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="benchTestProfilesTSMItem.Text" xml:space="preserve">
<value>Test profiles</value>
</data>
<data name="editSchDrawingTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="editSchDrawingTSMItem.Text" xml:space="preserve">
<value>Edit schematic drawing</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>293, 6</value>
<value>194, 6</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 34</value>
<value>197, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="benchTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 29</value>
<value>52, 22</value>
</data>
<data name="benchTSMenuItem.Text" xml:space="preserve">
<value>Bench</value>
</data>
<data name="homeTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 29</value>
<value>52, 22</value>
</data>
<data name="homeTSMenuItem.Text" xml:space="preserve">
<value>Home</value>
</data>
<data name="eventLogsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>110, 29</value>
<value>73, 22</value>
</data>
<data name="eventLogsTSMenuItem.Text" xml:space="preserve">
<value>Event logs</value>
</data>
<data name="appDiagnosticMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>150, 22</value>
</data>
<data name="usersTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="usersTSMenuItem.Text" xml:space="preserve">
<value>Users</value>
</data>
<data name="languageTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="languageTSMItem.Text" xml:space="preserve">
<value>Language</value>
</data>
<data name="databaseSettingsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="databaseSettingsTSMenuItem.Text" xml:space="preserve">
<value>Profiles</value>
</data>
<data name="backUpConfigTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>223, 34</value>
<value>148, 22</value>
</data>
<data name="backUpConfigTSMItem.Text" xml:space="preserve">
<value>Configuration</value>
</data>
<data name="backUpResultsTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>223, 34</value>
<value>148, 22</value>
</data>
<data name="backUpResultsTSMItem.Text" xml:space="preserve">
<value>Test results</value>
</data>
<data name="backUpTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="backUpTSMItem.Text" xml:space="preserve">
<value>Back up</value>
</data>
<data name="passwdTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="passwdTSMItem.Text" xml:space="preserve">
<value>Password</value>
</data>
<data name="upgradeTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="upgradeTSMenuItem.Text" xml:space="preserve">
<value>Upgrade</value>
</data>
<data name="optoHeadsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="optoHeadsToolStripMenuItem.Text" xml:space="preserve">
<value>Optical heads</value>
</data>
<data name="clearCountersToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 34</value>
<value>150, 22</value>
</data>
<data name="clearCountersToolStripMenuItem.Text" xml:space="preserve">
<value>Clear counters</value>
</data>
<data name="settingsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>92, 29</value>
<value>61, 22</value>
</data>
<data name="settingsTSMenuItem.Text" xml:space="preserve">
<value>Settings</value>
</data>
<data name="aboutTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 34</value>
<value>107, 22</value>
</data>
<data name="aboutTSMenuItem.Text" xml:space="preserve">
<value>About</value>
</data>
<data name="helpTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 29</value>
<value>44, 22</value>
</data>
<data name="helpTSMenuItem.Text" xml:space="preserve">
<value>Help</value>
@@ -1573,31 +1465,31 @@
<value>17, 17</value>
</metadata>
<data name="proceduresToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 29</value>
<value>78, 22</value>
</data>
<data name="proceduresToolStripMenuItem.Text" xml:space="preserve">
<value>Procedures</value>
</data>
<data name="processToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 29</value>
<value>59, 22</value>
</data>
<data name="processToolStripMenuItem.Text" xml:space="preserve">
<value>Process</value>
</data>
<data name="resultsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 29</value>
<value>56, 22</value>
</data>
<data name="resultsToolStripMenuItem.Text" xml:space="preserve">
<value>Results</value>
</data>
<data name="graphsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 29</value>
<value>56, 22</value>
</data>
<data name="graphsToolStripMenuItem.Text" xml:space="preserve">
<value>Graphs</value>
</data>
<data name="calendarTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 29</value>
<value>66, 22</value>
</data>
<data name="calendarTSMenuItem.Text" xml:space="preserve">
<value>Calendar</value>
@@ -1605,8 +1497,11 @@
<data name="mainMenuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="mainMenuStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 1, 0, 1</value>
</data>
<data name="mainMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1881, 35</value>
<value>1254, 24</value>
</data>
<data name="mainMenuStrip.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1630,13 +1525,10 @@
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>9, 20</value>
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1881, 1171</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
<value>1254, 690</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Test Bench Framework</value>
@@ -1743,6 +1635,12 @@
<data name="&gt;&gt;settingsTSMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;appDiagnosticMenuItem.Name" xml:space="preserve">
<value>appDiagnosticMenuItem</value>
</data>
<data name="&gt;&gt;appDiagnosticMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;usersTSMenuItem.Name" xml:space="preserve">
<value>usersTSMenuItem</value>
</data>
TBF/UI/Procedures/ProcedureDlg.cs
+4 -4
View File
@@ -90,10 +90,10 @@ namespace TBF.UI.Procedures
//#if LANG_PL
sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority }
: new GID[] { GID.TestingSpecialists, GID.Metrologists, GID.WaterMeterAuthority };
// #else
// sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists }
// : new GID[] { GID.TestingSpecialists, GID.Metrologists };
// #endif
//#else
// sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists }
// : new GID[] { GID.TestingSpecialists, GID.Metrologists };
//#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
SharedButtons.Buttons.Remove |
SharedButtons.Buttons.Up |