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

Refactorization: TBF.UI namespace, no change of function, ver. 2.18.1314

Browse Source
This commit is contained in:
Milan Hanajik 2019-09-16 10:51:25 +02:00
parent 7f8a5c83ed
commit 994568799d
258 changed files with 2791 additions and 4149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DeviceTest/DeviceTestDlg.cs
View File

@ -425,7 +425,7 @@ namespace DeviceTest
cfgControl.Config = parentCfg;
cfgControl.Config.ItemNr = 0;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
cfgForm.TbfComponents = new List<Config.Entities.Component>();
cfgForm.ComponentCfgCtrl = cfgControl;
@ -454,7 +454,7 @@ namespace DeviceTest
cfgControl.Config = component1Cfg;
cfgControl.Config.ItemNr = 1;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@ -488,7 +488,7 @@ namespace DeviceTest
cfgControl.Config = component2Cfg;
cfgControl.Config.ItemNr = 1;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@ -523,7 +523,7 @@ namespace DeviceTest
cfgControl.Config = component3Cfg;
cfgControl.Config.ItemNr = 1;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());

2
ResultsBrowser/Forms/PrinterConfigDlg.cs
View File

@ -91,7 +91,7 @@ namespace ResultsBrowser.Forms
cfgControl.Config = printerCfg;
cfgControl.Config.ItemNr = 0;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
TBF.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg();
cfgForm.TbfComponents = new List<Component>();
cfgForm.ComponentCfgCtrl = cfgControl;

176
TBF/AttachedTextBoxes.cs
View File

@ -1,176 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
namespace TBF
{
/// <summary>
/// Data types and orientation of the table layout panel attached data.
/// </summary>
public enum Arrangement
{
RowOfIntegers,
RowOfDoubles,
RowOfStrings,
ColumnOfIntegers,
ColumnOfDoubles,
ColumnOfStrings,
}
/// <summary>
/// This class represents TextBox controls and data modified by them
/// that are attached to (=displayed inside) a TableLayoutPanel control.
/// </summary>
public class AttachedTextBoxes
{
///
/// Private fields
///
int count; /// Number of attached TextBoxes / cells
Arrangement arngmnt; /// Type of attachemnt (see above)
bool isRow; /// true if it is a row
TextBox[] textBoxes; /// TextBox controls to be aded to TableLayoutPanel
int[] intData; /// integer data |
double[] doubleData; /// double data |-> one of these three arrays is used
string[] stringData; /// string data |
/// <summary>
/// Constructor, which creates TextBox controls and adds them to the table layout panel.
/// </summary>
public AttachedTextBoxes(TableLayoutPanel tblLtPnl, Arrangement arngmnt, int firstColumn, int firstRow, int size)
{
this.count = size;
this.arngmnt = arngmnt;
isRow = (arngmnt == Arrangement.RowOfIntegers || arngmnt == Arrangement.RowOfDoubles || arngmnt == Arrangement.RowOfStrings);
textBoxes = new TextBox[count];
intData = new int[count];
doubleData = new double[count];
stringData = new string[count];
for (int i = 0; i < count; i++)
{
textBoxes[i] = new TextBox(); /// Crete a new TextBox control
if (isRow)
{
tblLtPnl.Controls.Add(textBoxes[i], firstColumn + i, firstRow);
}
else
{
tblLtPnl.Controls.Add(textBoxes[i], firstColumn, firstRow + i);
}
}
}
/// <summary>
/// Attached data array size
/// </summary>
public int Count { get { return count; } }
/// <summary>
/// Indexer returning a TextBox
/// </summary>
/// <param name="index">Index</param>
/// <returns>TextBox object reference</returns>
public TextBox this[int index]
{
get
{
if (index < 0 || index >= count)
{
return null;
}
else
{
return textBoxes[index];
}
}
}
/// <summary>
/// Retrieves data from the controls or detects a format error.
/// Wrong format in a cell interrupts data retrieving, so when the first control
/// contains data with wrong format, no data are retrieved at all.
/// </summary>
/// <returns>true if all data have correct format</returns>
public bool ValidateData()
{
switch (arngmnt)
{
case Arrangement.RowOfIntegers:
case Arrangement.ColumnOfIntegers:
for (int i = 0; i < count; i++)
{
if (!Int32.TryParse(textBoxes[i].Text, out intData[i])) return false;
}
return true;
case Arrangement.RowOfDoubles:
case Arrangement.ColumnOfDoubles:
for (int i = 0; i < count; i++)
{
if (!Double.TryParse(textBoxes[i].Text, out doubleData[i])) return false;
}
return true;
case Arrangement.RowOfStrings:
case Arrangement.ColumnOfStrings:
default:
return true;
}
}
/// <summary>
/// The following three methods provide initialization of controls with original data.
/// </summary>
public void SetData(int index, int value)
{
if (index < 0 || index >= count) return;
intData[index] = value;
textBoxes[index].Text = value.ToString();
}
public void SetData(int index, double value)
{
if (index < 0 || index >= count) return;
doubleData[index] = value;
textBoxes[index].Text = value.ToString();
}
public void SetData(int index, string value)
{
if (index < 0 || index >= count) return;
stringData[index] = value;
textBoxes[index].Text = value;
}
/// <summary>
/// The following three methods provide retrieving data from controls.
/// ValidateData() must be called first. The return value must be true.
/// </summary>
public int GetIntData(int index)
{
if (index < 0 || index >= count) return 0;
return intData[index];
}
public double GetDoubleData(int index)
{
if (index < 0 || index >= count) return 0;
return doubleData[index];
}
public string GetStringData(int index)
{
if (index < 0 || index >= count) return null;
return textBoxes[index].Text;
}
}
}

75
TBF/BarGraph.cs
View File

@ -1,75 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Drawing;
using System.Windows.Forms;
namespace TBF
{
public class BarGraph
{
int originX; /// Left coordinate of the bar
int originY; /// Top coordinate of the bar
int barWidth; /// Bar width, the bar is actualy 1 pixel wider
int barHeight; /// Bar height the bat is actualy 1 pixel higher
Color barColor; /// Bar color
Color backColor; /// Background color (above the bar)
/// Bar border is always black, 1 pixel wide
int barValue; /// The actual bar size (the bar is drawn from bottom)
System.Windows.Forms.Control control;
Rectangle rect;
/// Use this setter to update the bar size
public float FValue
{
get { return (float)barValue/(float)barHeight; }
set
{
Value = (int)(value * (float)barHeight);
control.Invalidate();
}
}
/// Use this setter to update the bar size
public int Value
{
get { return barValue; }
set
{
if (value < 0) barValue = 0;
else if (value >= barHeight) barValue = barHeight;
else barValue = value;
control.Invalidate();
}
}
/// <summary>
/// Constructor
/// </summary>
public BarGraph(System.Windows.Forms.Control control, int originX, int originY, int barWidth, int barHeight, Color barColor, Color backColor)
{
this.control = control;
this.originX = originX;
this.originY = originY;
this.barWidth = barWidth;
this.barHeight = barHeight;
this.barColor = barColor;
this.backColor = backColor;
rect = new Rectangle(originX, originY, barWidth + 1, barHeight + 1);
barValue = 0;
}
/// <summary>
/// Call this function in Form1_Paint(..), pass the arguments without any modifications
/// </summary>
public void Paint(Graphics g)
{
g.FillRectangle(new SolidBrush(backColor), originX + 1, originY + 1, barWidth, barHeight - barValue);
g.FillRectangle(new SolidBrush(barColor), originX + 1, originY + barHeight + 1 - barValue, barWidth, barValue);
g.DrawRectangle(new Pen(Color.Black, 2.0F), originX, originY, barWidth + 1, barHeight + 1);
}
}
}

8
TBF/ComponentParametersDlg.Designer.cs → TBF/BenchControl/ComponentParametersDlg.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
namespace TBF
namespace TBF.BenchControl
{
partial class ComponentParametersDlg
{
@ -32,7 +32,7 @@ namespace TBF
private void InitializeComponent()
{
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel2.SuspendLayout();
this.splitContainer.SuspendLayout();
@ -84,6 +84,6 @@ namespace TBF
#endregion
private System.Windows.Forms.SplitContainer splitContainer;
private UiControls.SharedButtons sharedButtons;
private TBF.UI.Shared.SharedButtons sharedButtons;
}
}

6
TBF/ComponentParametersDlg.cs → TBF/BenchControl/ComponentParametersDlg.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -7,10 +7,10 @@ using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.Generic;
using TBF.UiControls;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF
namespace TBF.BenchControl
{
public partial class ComponentParametersDlg : Form
{

0
TBF/ComponentParametersDlg.resx → TBF/BenchControl/ComponentParametersDlg.resx
View File

2
TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs
View File

@ -134,7 +134,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
private void batchRemarkButton_Click(object sender, EventArgs e)
{
TBF.Forms.RemarkDlg dlg = new TBF.Forms.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) };
TBF.UI.Shared.RemarkDlg dlg = new TBF.UI.Shared.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) };
if (dlg.ShowDialog() == DialogResult.OK)
{
BatchRemark = dlg.Remark;

8
TBF/BenchControl/Dummy/Balance/Component.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2016-2017 Sensus Metering Systems
/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -40,19 +40,19 @@ namespace TBF.BenchControl.Dummy.Balance
public float BuoyancyPress { get { return 1.013f; } }
public float BuoyancyHumi { get { return 50.0f; } }
public IOperation TaringOp(ref TBF.Boxes.DoubleBox tara)
public IOperation TaringOp(ref Boxes.DoubleBox tara)
{
tara.Val = 0;
return this;
}
public IOperation ReadMassOp(ref TBF.Boxes.DoubleBox mass)
public IOperation ReadMassOp(ref Boxes.DoubleBox mass)
{
mass.Val = 0;
return this;
}
public IOperation ReadStableMassOp(ref TBF.Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
public IOperation ReadStableMassOp(ref Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
{
mass.Val = 0;
return this;

2
TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs
View File

@ -2,11 +2,11 @@
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Dummy.FlowMeter
{
public partial class FlowMeterCfgCtrl : UserControl, IComponentCfgCtrl

2
TBF/BenchControl/Elde/ControlBoardDev.cs
View File

@ -501,7 +501,7 @@ namespace TBF.BenchControl.Elde
///
void ShowEmergencyStopForm()
{
(new TBF.Forms.EmergencyStopForm()).Show();
(new TBF.UI.Shared.EmergencyStopForm()).Show();
}

2
TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
View File

@ -2,8 +2,6 @@
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Configs;
using TBF.BenchControl.Generic;

2
TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs
View File

@ -2,8 +2,6 @@
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Configs;
using TBF.BenchControl.Generic;

1
TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs
View File

@ -2,7 +2,6 @@
/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;

9
TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using log4net;
using TBF.BenchControl;
using TBF.Boxes;
namespace TBF.BenchControl.Elde.FlowMeterTwins
@ -15,8 +16,8 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
readonly FlowMeterCfg flowMeterCfg;
readonly ControlBoardDev controlBoard;
public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter1;
public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter2;
public readonly Elde.FlowMeter.FlowMeter FlowMeter1;
public readonly Elde.FlowMeter.FlowMeter FlowMeter2;
public int Idx1 { get { return 0; } }
public double NominalFlow { get { return flowMeterCfg.NominalFlow; } }
@ -44,10 +45,10 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
controlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components);
if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
FlowMeter1 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components);
FlowMeter1 = TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components) as Elde.FlowMeter.FlowMeter;
if (FlowMeter1 == null) throw new Exception("Cannot find FlowMeter1 component");
FlowMeter2 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components);
FlowMeter2 = TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components) as Elde.FlowMeter.FlowMeter;
if (FlowMeter2 == null) throw new Exception("Cannot find FlowMeter2 component");
controlBoard.EtCalib[Idx1] = (float)flowMeterCfg.NominalFlow; /// Idx1==0 for FlowMeterTwins

1
TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs
View File

@ -2,7 +2,6 @@
/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;

1
TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs
View File

@ -2,7 +2,6 @@
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;

1
TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs
View File

@ -2,7 +2,6 @@
/// Copyright (c) 2015 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;

2
TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs
View File

@ -9,7 +9,7 @@ namespace TBF.BenchControl.Network.Camera
/// </summary>
public class JpegFrame : RtpFrame
{
static readonly ILog log = LogManager.GetLogger(typeof(MainWnd));
static readonly ILog log = LogManager.GetLogger(typeof(TBF.UI.MainWnd));
#region Statics

1
TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs
View File

@ -2,7 +2,6 @@
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;

1
TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs
View File

@ -2,7 +2,6 @@
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;

5
TBF/Telegram.cs → TBF/BenchControl/Telegram.cs
View File

@ -1,11 +1,10 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2019 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Text;
namespace TBF
namespace TBF.BenchControl
{
public class Telegram
{

61
TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs
View File

@ -7,10 +7,11 @@ using System.Windows.Forms;
using log4net;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.BenchControl.TestMethods.Endurance
{
public partial class CycleDlg : Form, TBF.UiControls.IParentOfListViewEx
public partial class CycleDlg : Form, IParentOfListViewEx
{
static readonly ILog log = LogManager.GetLogger(typeof(CycleDlg));
@ -30,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
public IList<IValve> Valves;
TBF.UiControls.ITabWithListViewEx seqStepsCtrl;
ITabWithListViewEx seqStepsCtrl;
public CycleDlg()
@ -47,10 +48,10 @@ namespace TBF.BenchControl.TestMethods.Endurance
/// SharedDlgButtons configuration
sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.Metrologists };
sharedButtons.OptionalButtons = TBF.UiControls.SharedButtons.Buttons.Add |
TBF.UiControls.SharedButtons.Buttons.Remove |
TBF.UiControls.SharedButtons.Buttons.Up |
TBF.UiControls.SharedButtons.Buttons.Down;
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
SharedButtons.Buttons.Remove |
SharedButtons.Buttons.Up |
SharedButtons.Buttons.Down;
sharedButtons.Unlocked += Unlocked;
sharedButtons.OKClicked += okButton_Click;
sharedButtons.CancelClicked += cancelButton_Click;
@ -59,7 +60,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
sharedButtons.UpClicked += upButton_Click;
sharedButtons.DownClicked += downButton_Click;
seqStepsCtrl = new CycleStepsCtrl();
seqStepsCtrl = new CycleStepsCtrl() as ITabWithListViewEx;
/// Prepare a list of valves for the endurance test
TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config));
@ -98,7 +99,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
{
Localize();
TBF.LocalSettings ls = Program.LocalSettings;
LocalSettings ls = Program.LocalSettings;
Width = (ls.EnduranceDlgWidth > 0) ? ls.EnduranceDlgWidth : 1050;
Height = (ls.EnduranceDlgHeight > 0) ? ls.EnduranceDlgHeight : 360;
Left = (ls.EnduranceDlgLeft != 0) ? ls.EnduranceDlgLeft : 150;
@ -177,8 +178,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
seqStepsCtrl.OkBtnClicked();
}
slctdTab = tabControl.SelectedIndex;
sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Add);
sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Remove);
sharedButtons.EnableButtons(SharedButtons.Buttons.Add);
sharedButtons.DisableButtons(SharedButtons.Buttons.Remove);
RefreshAllTabs();
}
@ -202,32 +203,32 @@ namespace TBF.BenchControl.TestMethods.Endurance
if (seqStepsCtrl != null) seqStepsCtrl.MoveDownSelected();
}
public void UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos selectedItemPos)
public void UpdateButtonStates(SharedButtons.SelectedItemPos selectedItemPos)
{
if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.None)
if (selectedItemPos == SharedButtons.SelectedItemPos.None)
{
sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Up |
TBF.UiControls.SharedButtons.Buttons.Down);
sharedButtons.DisableButtons(SharedButtons.Buttons.Up |
SharedButtons.Buttons.Down);
}
else if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.First)
else if (selectedItemPos == SharedButtons.SelectedItemPos.First)
{
sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Down);
sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Up);
sharedButtons.EnableButtons(SharedButtons.Buttons.Down);
sharedButtons.DisableButtons(SharedButtons.Buttons.Up);
}
else if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.Last)
else if (selectedItemPos == SharedButtons.SelectedItemPos.Last)
{
sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Up);
sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Down);
sharedButtons.EnableButtons(SharedButtons.Buttons.Up);
sharedButtons.DisableButtons(SharedButtons.Buttons.Down);
}
else if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.FirstAndLast)
else if (selectedItemPos == SharedButtons.SelectedItemPos.FirstAndLast)
{
sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Up |
TBF.UiControls.SharedButtons.Buttons.Down);
sharedButtons.DisableButtons(SharedButtons.Buttons.Up |
SharedButtons.Buttons.Down);
}
else
{
sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Up |
TBF.UiControls.SharedButtons.Buttons.Down);
sharedButtons.EnableButtons(SharedButtons.Buttons.Up |
SharedButtons.Buttons.Down);
}
}
@ -240,23 +241,23 @@ namespace TBF.BenchControl.TestMethods.Endurance
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.None);
UpdateButtonStates(SharedButtons.SelectedItemPos.None);
}
else if (listViewEx.Items.Count == 1)
{
UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.FirstAndLast);
UpdateButtonStates(SharedButtons.SelectedItemPos.FirstAndLast);
}
else if (listViewEx.SelectedIndices[0] == 0)
{
UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.First);
UpdateButtonStates(SharedButtons.SelectedItemPos.First);
}
else if (listViewEx.SelectedIndices[0] == (listViewEx.Items.Count - 1))
{
UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.Last);
UpdateButtonStates(SharedButtons.SelectedItemPos.Last);
}
else
{
UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.Middle);
UpdateButtonStates(SharedButtons.SelectedItemPos.Middle);
}
}
}

4
TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs generated
View File

@ -34,7 +34,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleDlg));
this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl = new System.Windows.Forms.TabControl();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
this.mainSplitContainer.Panel2.SuspendLayout();
@ -86,6 +86,6 @@ namespace TBF.BenchControl.TestMethods.Endurance
private System.Windows.Forms.SplitContainer mainSplitContainer;
private System.Windows.Forms.TabControl tabControl;
private UiControls.SharedButtons sharedButtons;
private TBF.UI.Shared.SharedButtons sharedButtons;
}
}

11
TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs
View File

@ -7,10 +7,11 @@ using System.Windows.Forms;
using log4net;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.BenchControl.TestMethods.Endurance
{
public partial class CycleStepsCtrl : TBF.UiControls.BaseWithListViewEx<CycleStep>, TBF.UiControls.ITabWithListViewEx
public partial class CycleStepsCtrl : BaseWithListViewEx<CycleStep>, ITabWithListViewEx
{
static readonly ILog log = LogManager.GetLogger(typeof(CycleStepsCtrl));
@ -54,13 +55,13 @@ namespace TBF.BenchControl.TestMethods.Endurance
///
/// ListViewEx columns
///
Columns.Add(Strings.Duration_ms, 100 * parent.Dpi / PathsDlg.Dpi100pct);
//Columns.Add(Strings.Message, 100 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Duration_ms, 100 * parent.Dpi / UI.Constants.Dpi100pct);
//Columns.Add(Strings.Message, 100 * parent.Dpi / UI.Constants.Dpi100pct);
///
vCount = 0;
foreach (var vlv in parent.Valves)
{
Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / UI.Constants.Dpi100pct);
vCount++;
}
@ -256,7 +257,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
bool lastItemRemoved = base.RemoveSelected();
if (lastItemRemoved && parent != null)
{
parent.UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.None);
parent.UpdateButtonStates(SharedButtons.SelectedItemPos.None);
}
}

86
TBF/CustomStyle.cs
View File

@ -1,86 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace TBF
{
/// <summary>
/// This static class maintains a set of text box styles at one place, it is then sufficient
/// to use the static method CustomStyle.Apply(id, textBox(es)) to apply this style to text box(es).
/// </summary>
public static class CustomStyle
{
const int setsCount = 20; /// Number of styles / attribute sets
static DockStyle[] dockStyles; /// Docking style
static System.Drawing.Color[] backColors; /// Background color
static BorderStyle[] borderStyles; /// Border style
static bool[] readOnly; /// Read only
static System.Drawing.Font[] fonts; /// Font
static CustomStyle()
{
dockStyles = new DockStyle[setsCount];
backColors = new System.Drawing.Color[setsCount];
borderStyles = new BorderStyle[setsCount];
readOnly = new bool[setsCount];
fonts = new System.Drawing.Font[setsCount];
}
/// <summary>
/// Set attributes of the set selected by 'set' parameter
/// </summary>
/// <param name="id">Attribute set ID</param>
/// <param name="dockStyle">Docking style</param>
/// <param name="backColor">Background color</param>
/// <param name="readOnly">true for read only (aka label)</param>
/// <param name="borderStyle">Border style</param>
public static void Set(int id, DockStyle dockStyle, System.Drawing.Color backColor, BorderStyle borderStyle, bool readOnly, System.Drawing.Font font)
{
if (id < 0 || id >= setsCount) return;
CustomStyle.dockStyles[id] = dockStyle;
CustomStyle.backColors[id] = backColor;
CustomStyle.borderStyles[id] = borderStyle;
CustomStyle.readOnly[id] = readOnly;
CustomStyle.fonts[id] = font;
}
/// <summary>
/// Apply one of the attribute sets to a TextBox instance
/// </summary>
public static void Apply(int id, TextBox textBox)
{
if (id < 0 || id >= setsCount) return;
textBox.Dock = dockStyles[id];
textBox.BackColor = backColors[id];
textBox.BorderStyle = borderStyles[id];
textBox.ReadOnly = readOnly[id];
textBox.Font = fonts[id];
}
/// <summary>
/// Apply one of the attribute sets to a AttachedTextBoxes text boxes
/// </summary>
public static void Apply(int id, AttachedTextBoxes textBoxes)
{
if (id < 0 || id >= setsCount) return;
for (int i = 0; i < textBoxes.Count; i++)
{
textBoxes[i].Dock = dockStyles[id];
textBoxes[i].BackColor = backColors[id];
textBoxes[i].BorderStyle = borderStyles[id];
textBoxes[i].ReadOnly = readOnly[id];
textBoxes[i].Font = fonts[id];
}
}
}
}

34
TBF/ErrorHandler.cs
View File

@ -1,34 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Windows.Forms;
using TBF.Forms;
using TBF.Resources;
namespace TBF.ErrorHandler {
public static class ErrorHandler
{
public static DialogResult HandleError(Exception e, string Message, string Origin)
{
//catch (FluentNHibernate.Cfg.FluentConfigurationException fe)
// {
// string message;
// if (fe.InnerException != null)
// {
// message = fe.InnerException.Message;
// }
// else
// {
// message = fe.Message;
// }
// MessageBox.Show( message, "RetVal", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
ErrorDlg dlg = new ErrorDlg(Strings.Unhandled_error_occured_in_ + Origin + Environment.NewLine + Message + Environment.NewLine + e.ToString() + Environment.NewLine + e.InnerException.ToString());
dlg.ShowDialog();
return dlg.returnvalue;
}
}
}

0
TBF/Forms/AboutDlg.pl.resx → TBF/KeepAsBackup/AboutDlg.pl.resx
View File

0
TBF/Forms/AboutDlg.ru.resx → TBF/KeepAsBackup/AboutDlg.ru.resx
View File

0
TBF/BenchesDlg.pl.resx → TBF/KeepAsBackup/BenchesDlg.pl.resx
View File

0
TBF/BenchesDlg.ru.resx → TBF/KeepAsBackup/BenchesDlg.ru.resx
View File

0
TBF/ComponentsManagerDlg.pl.resx → TBF/KeepAsBackup/ComponentsManagerDlg.pl.resx
View File

0
TBF/ComponentsManagerDlg.ru.resx → TBF/KeepAsBackup/ComponentsManagerDlg.ru.resx
View File

0
TBF/PathsDlg.pl.resx → TBF/KeepAsBackup/PathsDlg.pl.resx
View File

0
TBF/PathsDlg.ru.resx → TBF/KeepAsBackup/PathsDlg.ru.resx
View File

0
TBF/PreferencesDlg.pl.resx → TBF/KeepAsBackup/PreferencesDlg.pl.resx
View File

0
TBF/PreferencesDlg.ru.resx → TBF/KeepAsBackup/PreferencesDlg.ru.resx
View File

0
TBF/ProcedureDlg.pl.resx → TBF/KeepAsBackup/ProcedureDlg.pl.resx
View File

0
TBF/ProcedureDlg.ru.resx → TBF/KeepAsBackup/ProcedureDlg.ru.resx
View File

0
TBF/SelectComponentClassDlg.pl.resx → TBF/KeepAsBackup/SelectComponentClassDlg.pl.resx
View File

0
TBF/SelectComponentClassDlg.ru.resx → TBF/KeepAsBackup/SelectComponentClassDlg.ru.resx
View File

0
TBF/TransitionsDlg.pl.resx → TBF/KeepAsBackup/TransitionsDlg.pl.resx
View File

0
TBF/TransitionsDlg.ru.resx → TBF/KeepAsBackup/TransitionsDlg.ru.resx
View File

16
TBF/Program.cs
View File

@ -9,7 +9,7 @@ using log4net;
using Config.Entities;
using Users;
using TBF.Resources;
using TBF.Forms;
using TBF.UI.Shared;
namespace TBF
{
@ -54,7 +54,7 @@ namespace TBF
/// <summary>
/// Main window object.
/// </summary>
public static MainWnd MainWnd;
public static UI.MainWnd MainWnd;
/// <summary>
@ -207,9 +207,9 @@ namespace TBF
log.Warn("No test benches in the local configuration -> display an appropriate dialog.");
/// Ask what to do, ask for the password, open 'DatabaseSetingsDlg' and continue on OK
if ((new Forms.NoBenchOrDatabaseDlg { Message = Strings.NoBenchMsg }.ShowDialog() != DialogResult.OK) ||
if ((new NoBenchOrDatabaseDlg { Message = Strings.NoBenchMsg }.ShowDialog() != DialogResult.OK) ||
(new Users.Forms.LoginDlg(true).ShowDialog() == DialogResult.Cancel) ||
(new BenchesDlg().ShowDialog() == DialogResult.Cancel))
(new TBF.UI.Settings.BenchesDlg().ShowDialog() == DialogResult.Cancel))
{
return; /// Exit program
}
@ -391,7 +391,7 @@ namespace TBF
}
/// Ask what to do
switch ((new Forms.NoBenchOrDatabaseDlg { Message = Strings.NoDatabaseMsg, ShowRetry = true }).ShowDialog())
switch ((new NoBenchOrDatabaseDlg { Message = Strings.NoDatabaseMsg, ShowRetry = true }).ShowDialog())
{
case DialogResult.Abort:
return; /// Exit program
@ -400,13 +400,13 @@ namespace TBF
break; /// Retry connection to the database, stay inside the loop
case DialogResult.Yes:
new UpgradeSelectionDlg().ShowDialog();
new TBF.UI.Settings.UpgradeSelectionDlg().ShowDialog();
break; /// Stay inside the loop
default:
/// Open 'DatabaseSetingsDlg' and retry DB connect on OK
if (new Users.Forms.LoginDlg(true).ShowDialog() == DialogResult.Cancel ||
new BenchesDlg().ShowDialog() == DialogResult.Cancel)
new TBF.UI.Settings.BenchesDlg().ShowDialog() == DialogResult.Cancel)
{
return; /// Exit program
}
@ -444,7 +444,7 @@ namespace TBF
{
/// Open the main application window
log.Info("Creating the main window");
MainWnd = new MainWnd();
MainWnd = new UI.MainWnd();
log.Info("Opening the main window");
Application.Run(MainWnd);
log.Info("The main window was closed");

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1313.0")]
[assembly: AssemblyFileVersion("2.18.1313.0")]
[assembly: AssemblyVersion("2.18.1314.0")]
[assembly: AssemblyFileVersion("2.18.1314.0")]

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

@ -879,6 +879,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Conditions.
/// </summary>
internal static string Conditions {
get {
return ResourceManager.GetString("Conditions", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Configuration.
/// </summary>
@ -2832,6 +2841,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to No info available.
/// </summary>
internal static string No_info_available {
get {
return ResourceManager.GetString("No_info_available", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No results to print.
/// </summary>
@ -5481,6 +5499,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Uncertainty.
/// </summary>
internal static string Uncertainty {
get {
return ResourceManager.GetString("Uncertainty", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Uncertainty [%].
/// </summary>

9
TBF/Resources/Strings.resx
View File

@ -2053,4 +2053,13 @@
<data name="Program_must_be_closed" xml:space="preserve">
<value>Program must be closed.</value>
</data>
<data name="Conditions" xml:space="preserve">
<value>Conditions</value>
</data>
<data name="Uncertainty" xml:space="preserve">
<value>Uncertainty</value>
</data>
<data name="No_info_available" xml:space="preserve">
<value>No info available</value>
</data>
</root>

208
TBF/Screens/MeasurementTabPageCtrl.Designer.cs generated
View File

@ -1,208 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF.Screens
{
partial class MeasurementTabPageCtrl
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.measurementLabel5 = new System.Windows.Forms.Label();
this.measurementLabel4 = new System.Windows.Forms.Label();
this.measurementLabel3 = new System.Windows.Forms.Label();
this.measurementLabel2 = new System.Windows.Forms.Label();
this.measurementLabel = new System.Windows.Forms.Label();
this.measurementTableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.measurementTableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.measurementTableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.measurementTableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.SuspendLayout();
//
// measurementLabel5
//
this.measurementLabel5.AutoSize = true;
this.measurementLabel5.Font = new System.Drawing.Font("Verdana", 11.25F);
this.measurementLabel5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.measurementLabel5.Location = new System.Drawing.Point(471, 136);
this.measurementLabel5.Name = "measurementLabel5";
this.measurementLabel5.Size = new System.Drawing.Size(74, 18);
this.measurementLabel5.TabIndex = 17;
this.measurementLabel5.Text = "Time Bar";
//
// measurementLabel4
//
this.measurementLabel4.AutoSize = true;
this.measurementLabel4.Font = new System.Drawing.Font("Verdana", 11.25F);
this.measurementLabel4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.measurementLabel4.Location = new System.Drawing.Point(328, 136);
this.measurementLabel4.Name = "measurementLabel4";
this.measurementLabel4.Size = new System.Drawing.Size(74, 18);
this.measurementLabel4.TabIndex = 16;
this.measurementLabel4.Text = "Time Bar";
//
// measurementLabel3
//
this.measurementLabel3.AutoSize = true;
this.measurementLabel3.Font = new System.Drawing.Font("Verdana", 11.25F);
this.measurementLabel3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.measurementLabel3.Location = new System.Drawing.Point(484, 164);
this.measurementLabel3.Name = "measurementLabel3";
this.measurementLabel3.Size = new System.Drawing.Size(45, 18);
this.measurementLabel3.TabIndex = 15;
this.measurementLabel3.Text = "Total";
//
// measurementLabel2
//
this.measurementLabel2.AutoSize = true;
this.measurementLabel2.Font = new System.Drawing.Font("Verdana", 11.25F);
this.measurementLabel2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.measurementLabel2.Location = new System.Drawing.Point(323, 164);
this.measurementLabel2.Name = "measurementLabel2";
this.measurementLabel2.Size = new System.Drawing.Size(87, 18);
this.measurementLabel2.TabIndex = 14;
this.measurementLabel2.Text = "Actual test";
//
// measurementLabel
//
this.measurementLabel.AutoSize = true;
this.measurementLabel.Font = new System.Drawing.Font("Verdana", 11.25F);
this.measurementLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.measurementLabel.Location = new System.Drawing.Point(639, 514);
this.measurementLabel.Name = "measurementLabel";
this.measurementLabel.Size = new System.Drawing.Size(108, 18);
this.measurementLabel.TabIndex = 13;
this.measurementLabel.Text = "Target values";
//
// measurementTableLayoutPanel4
//
this.measurementTableLayoutPanel4.ColumnCount = 3;
this.measurementTableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.measurementTableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.measurementTableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.measurementTableLayoutPanel4.Location = new System.Drawing.Point(642, 544);
this.measurementTableLayoutPanel4.Name = "measurementTableLayoutPanel4";
this.measurementTableLayoutPanel4.RowCount = 4;
this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.measurementTableLayoutPanel4.Size = new System.Drawing.Size(216, 101);
this.measurementTableLayoutPanel4.TabIndex = 12;
//
// measurementTableLayoutPanel3
//
this.measurementTableLayoutPanel3.ColumnCount = 3;
this.measurementTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F));
this.measurementTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F));
this.measurementTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34F));
this.measurementTableLayoutPanel3.Location = new System.Drawing.Point(521, 11);
this.measurementTableLayoutPanel3.Name = "measurementTableLayoutPanel3";
this.measurementTableLayoutPanel3.RowCount = 2;
this.measurementTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.measurementTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.measurementTableLayoutPanel3.Size = new System.Drawing.Size(348, 55);
this.measurementTableLayoutPanel3.TabIndex = 11;
//
// measurementTableLayoutPanel2
//
this.measurementTableLayoutPanel2.ColumnCount = 2;
this.measurementTableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.measurementTableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.measurementTableLayoutPanel2.Location = new System.Drawing.Point(11, 245);
this.measurementTableLayoutPanel2.Name = "measurementTableLayoutPanel2";
this.measurementTableLayoutPanel2.RowCount = 12;
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel2.Size = new System.Drawing.Size(177, 303);
this.measurementTableLayoutPanel2.TabIndex = 10;
//
// measurementTableLayoutPanel1
//
this.measurementTableLayoutPanel1.ColumnCount = 3;
this.measurementTableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.measurementTableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.measurementTableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.measurementTableLayoutPanel1.Location = new System.Drawing.Point(11, 21);
this.measurementTableLayoutPanel1.Name = "measurementTableLayoutPanel1";
this.measurementTableLayoutPanel1.RowCount = 7;
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.measurementTableLayoutPanel1.Size = new System.Drawing.Size(283, 183);
this.measurementTableLayoutPanel1.TabIndex = 9;
//
// MeasurementTabPageCtrl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200)))));
this.Controls.Add(this.measurementLabel5);
this.Controls.Add(this.measurementLabel4);
this.Controls.Add(this.measurementLabel3);
this.Controls.Add(this.measurementLabel2);
this.Controls.Add(this.measurementLabel);
this.Controls.Add(this.measurementTableLayoutPanel4);
this.Controls.Add(this.measurementTableLayoutPanel3);
this.Controls.Add(this.measurementTableLayoutPanel2);
this.Controls.Add(this.measurementTableLayoutPanel1);
this.Font = new System.Drawing.Font("Verdana", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MeasurementTabPageCtrl";
this.Size = new System.Drawing.Size(900, 689);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.measurement_Paint);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label measurementLabel5;
private System.Windows.Forms.Label measurementLabel4;
private System.Windows.Forms.Label measurementLabel3;
private System.Windows.Forms.Label measurementLabel2;
private System.Windows.Forms.Label measurementLabel;
private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel4;
private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel3;
private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel2;
private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel1;
}
}

183
TBF/Screens/MeasurementTabPageCtrl.cs
View File

@ -1,183 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Drawing;
using System.Windows.Forms;
using log4net;
using TBF.UiBridge;
namespace TBF.Screens
{
public partial class MeasurementTabPageCtrl : UserControl
{
static readonly ILog log = LogManager.GetLogger(typeof(MeasurementTabPageCtrl));
AttachedTextBoxes measurementTbl1Row1; /// Table 1
AttachedTextBoxes measurementTbl1Col1;
AttachedTextBoxes measurementTbl1Col2;
AttachedTextBoxes measurementTbl1Col3;
AttachedTextBoxes measurementTbl2Row1; /// Table 2
AttachedTextBoxes measurementTbl2Col1;
AttachedTextBoxes measurementTbl2Col2;
AttachedTextBoxes measurementTbl3Row1; /// Table 3
AttachedTextBoxes measurementTbl3Row2;
AttachedTextBoxes measurementTbl4Col1;
AttachedTextBoxes measurementTbl4Col2;
AttachedTextBoxes measurementTbl4Col3;
BarGraph measurementBar1;
BarGraph measurementBar2;
public MeasurementTabPageCtrl()
{
InitializeComponent();
//Bridge.TestSelectedHandler += delegate(object sender, TestSelectedEventArgs args)
//{
// if (InvokeRequired)
// {
// Invoke(new EventHandler<TestSelectedEventArgs>(OnTestSelected), sender, args);
// }
// else OnTestSelected(sender, args);
//};
//Bridge.TestProgressHandler += delegate(object sender, TestProgressEventArgs args)
//{
// if (InvokeRequired)
// {
// Invoke(new EventHandler<TestProgressEventArgs>(OnTestProgress), sender, args);
// }
// else OnTestProgress(sender, args);
//};
//Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args)
//{
// if (InvokeRequired)
// {
// Invoke(new EventHandler<TestCompletedEventArgs>(OnTestCompleted), sender, args);
// }
// else OnTestCompleted(sender, args);
//};
Init();
}
private void Init()
{
measurementTbl1Row1 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.RowOfStrings, 1, 0, 2);
measurementTbl1Col1 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.ColumnOfStrings, 0, 1, 6);
measurementTbl1Col2 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.ColumnOfDoubles, 1, 1, 6);
measurementTbl1Col3 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.ColumnOfDoubles, 2, 1, 6);
measurementTbl2Row1 = new AttachedTextBoxes(measurementTableLayoutPanel2, Arrangement.RowOfStrings, 1, 0, 1);
measurementTbl2Col1 = new AttachedTextBoxes(measurementTableLayoutPanel2, Arrangement.ColumnOfStrings, 0, 1, 11);
measurementTbl2Col2 = new AttachedTextBoxes(measurementTableLayoutPanel2, Arrangement.ColumnOfDoubles, 1, 1, 11);
measurementTbl3Row1 = new AttachedTextBoxes(measurementTableLayoutPanel3, Arrangement.RowOfStrings, 0, 0, 3);
measurementTbl3Row2 = new AttachedTextBoxes(measurementTableLayoutPanel3, Arrangement.RowOfDoubles, 0, 1, 3);
measurementTbl4Col1 = new AttachedTextBoxes(measurementTableLayoutPanel4, Arrangement.ColumnOfStrings, 0, 0, 4);
measurementTbl4Col2 = new AttachedTextBoxes(measurementTableLayoutPanel4, Arrangement.ColumnOfDoubles, 1, 0, 4);
measurementTbl4Col3 = new AttachedTextBoxes(measurementTableLayoutPanel4, Arrangement.ColumnOfStrings, 2, 0, 4);
CustomStyle.Apply(1, measurementTbl1Row1);
CustomStyle.Apply(1, measurementTbl1Col1);
CustomStyle.Apply(1, measurementTbl1Col2);
CustomStyle.Apply(1, measurementTbl1Col3);
CustomStyle.Apply(1, measurementTbl2Row1);
CustomStyle.Apply(1, measurementTbl2Col1);
CustomStyle.Apply(1, measurementTbl2Col2);
CustomStyle.Apply(1, measurementTbl3Row1);
CustomStyle.Apply(1, measurementTbl3Row2);
CustomStyle.Apply(1, measurementTbl4Col1);
CustomStyle.Apply(1, measurementTbl4Col2);
CustomStyle.Apply(1, measurementTbl4Col3);
measurementTbl1Row1.SetData(0, "Vmer");
measurementTbl1Row1.SetData(1, "Emer");
for (int i = 0; i < Config.Data.WMsCount; i++) measurementTbl1Col1.SetData(i, "Meter" + (i + 1).ToString());
measurementTbl2Row1.SetData(0, "Ergebnise");
measurementTbl2Col1.SetData(0, "IMP");
measurementTbl2Col1.SetData(1, "Zeit");
measurementTbl2Col1.SetData(2, "V_etn");
measurementTbl2Col1.SetData(3, "Temp up");
measurementTbl2Col1.SetData(4, "Temp dn");
measurementTbl2Col1.SetData(5, "T Kl");
measurementTbl2Col1.SetData(6, "Druck up");
measurementTbl2Col1.SetData(7, "Druck dn");
measurementTbl2Col1.SetData(8, "Durchfl. act");
measurementTbl2Col1.SetData(9, "Zeit Kl in");
measurementTbl2Col1.SetData(10, "Zeit Kl out");
measurementTbl3Row1.SetData(0, "Temp. Luft");
measurementTbl3Row1.SetData(1, "Druck Luft");
measurementTbl3Row1.SetData(2, "Humi. Luft");
measurementTbl4Col1.SetData(0, "Durchfl. Tar Min");
measurementTbl4Col1.SetData(1, "Durchfl. Tar Max");
measurementTbl4Col1.SetData(2, "Volumen Tar");
measurementTbl4Col1.SetData(3, "Dauer");
//measurementTbl4Col2.SetData(0, 1.5);
//measurementTbl4Col2.SetData(1, 1.65);
//measurementTbl4Col2.SetData(2, 50);
//measurementTbl4Col2.SetData(3, 114.29);
measurementTbl4Col3.SetData(0, "m3/h");
measurementTbl4Col3.SetData(1, "m3/h");
measurementTbl4Col3.SetData(2, "l");
measurementTbl4Col3.SetData(3, "s");
measurementBar1 = new BarGraph(this, 320, 200, 100, 400, Color.DarkBlue, Color.WhiteSmoke);
measurementBar2 = new BarGraph(this, 470, 200, 100, 400, Color.DarkBlue, Color.WhiteSmoke);
}
private void measurement_Paint(object sender, PaintEventArgs e)
{
Graphics g = e.Graphics;
if (measurementBar1 != null) measurementBar1.Paint(g);
if (measurementBar2 != null) measurementBar2.Paint(g);
g.DrawRectangle(new Pen(Color.Black, 2.0F), 500, -2, 402, 80);
g.DrawRectangle(new Pen(Color.Black, 2.0F), 620, 500, 282, 250);
}
public void OnTestSelected(object sender, TestSelectedEventArgs data)
{
measurementTbl4Col2.SetData(0, data.Test.Qfrom.ToString("F2"));
measurementTbl4Col2.SetData(1, data.Test.Qto.ToString("F2"));
measurementTbl4Col2.SetData(2, data.Test.Volume.ToString("F1"));
measurementTbl4Col2.SetData(3, data.Test.TstTime.ToString("F1"));
}
public void OnTestProgress(object sender, TestProgressEventArgs data)
{
/// TODO: Reimplement
//if (data.TestResult != null)
//{
// int count = Math.Min(Config.Data.WMsCount, data.TestResult.Meters.Count);
// for (int i = 0; i < count; i++)
// {
// measurementTbl1Col2.SetData(i, data.TestResult.Meters[i].VolumeMeter.ToString("F1"));
// measurementTbl1Col3.SetData(i, data.TestResult.Meters[i].VolumeErrorPct.ToString("F1"));
// }
//}
//measurementTbl2Col2.SetData(0, data.RefPulses);
//measurementTbl2Col2.SetData(1, data.Time.ToString("F1"));
//measurementTbl2Col2.SetData(3, data.Tin.ToString());
//measurementTbl2Col2.SetData(4, data.Tout.ToString());
//measurementTbl2Col2.SetData(5, data.Tdiv.ToString());
//measurementTbl2Col2.SetData(6, data.Pin.ToString());
//measurementTbl2Col2.SetData(7, data.Pout.ToString());
//measurementTbl2Col2.SetData(8, data.Flow.ToString());
//measurementTbl3Row2.SetData(0, data.AmbientTemp.ToString());
//measurementTbl3Row2.SetData(1, data.AmbientPressure.ToString());
//measurementTbl3Row2.SetData(2, data.AmbientHumidity.ToString());
//measurementBar1.FValue = data.Progress;
}
public void OnTestCompleted(object sender, TestCompletedEventArgs data)
{
}
}
}

120
TBF/Screens/MeasurementTabPageCtrl.resx
View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

1144
TBF/TBF.csproj
View File

File diff suppressed because it is too large Load Diff

BIN
TBF/TBF_TemporaryKey.pfx
View File

Binary file not shown.

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

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF
namespace TBF.UI.Bench.Components
{
partial class ComponentsManagerDlg
{
@ -33,8 +33,8 @@ namespace TBF
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ComponentsManagerDlg));
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.listViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.listViewEx = new global::Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout();
this.splitContainer.Panel2.SuspendLayout();
@ -68,7 +68,7 @@ namespace TBF
this.listViewEx.Name = "listViewEx";
this.listViewEx.UseCompatibleStateImageBehavior = false;
this.listViewEx.View = System.Windows.Forms.View.Details;
this.listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked);
this.listViewEx.SubItemRightClicked += new global::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,8 +96,8 @@ namespace TBF
#endregion
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.SplitContainer splitContainer;
private UiControls.SharedButtons sharedButtons;
private TBF.UI.Shared.SharedButtons sharedButtons;
}
}

22
TBF/ComponentsManagerDlg.cs → TBF/UI/Bench/Components/ComponentsManagerDlg.cs
View File

@ -13,9 +13,9 @@ using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.Generic;
using TBF.Resources;
using TBF.UiControls;
using TBF.UI.Shared;
namespace TBF
namespace TBF.UI.Bench.Components
{
public partial class ComponentsManagerDlg : Form, IParentOfListViewEx
{
@ -97,7 +97,7 @@ namespace TBF
LoadFormPosition();
Text = Strings.Test_Bench_Components_Configuration;
TBF.LocalSettings ls = Program.LocalSettings;
LocalSettings ls = Program.LocalSettings;
listViewEx.Columns.Add(Strings.Nr, (ls.ComponentsColumnCount > 0) ? ls.ComponentsColumnWidths[0] : 40);
listViewEx.Columns.Add(Strings.Name, (ls.ComponentsColumnCount > 1) ? ls.ComponentsColumnWidths[1] : 80);
listViewEx.Columns.Add(Strings.Type, (ls.ComponentsColumnCount > 2) ? ls.ComponentsColumnWidths[2] : 120);
@ -115,10 +115,10 @@ namespace TBF
for (LogLevel level = 0; level < LogLevel.Count; level++) logCB.Items.Add(level.ToDescription());
splitContainer.Panel1.Controls.Add(logCB);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
sharedButtons.DisableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit);
sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit);
session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
cmpntEntities = session.QueryOver<Component>()
@ -128,7 +128,7 @@ namespace TBF
RedrawAll();
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == (int)Column.DebugMode)
{
@ -192,7 +192,7 @@ namespace TBF
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
Component cmpnt = (Component)e.Item.Tag;
@ -302,7 +302,7 @@ namespace TBF
private void LoadFormPosition()
{
TBF.LocalSettings ls = Program.LocalSettings;
LocalSettings ls = Program.LocalSettings;
Width = (ls.ComponentsDlgWidth > 0) ? ls.ComponentsDlgWidth : 850;
Height = (ls.ComponentsDlgHeight > 0) ? ls.ComponentsDlgHeight : 500;
Left = (ls.ComponentsDlgLeft != 0) ? ls.ComponentsDlgLeft : 200;
@ -639,11 +639,11 @@ namespace TBF
{
if (listViewEx.SelectedIndices.Count == 1)
{
sharedButtons.EnableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit);
sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit);
}
else
{
sharedButtons.DisableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit);
sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit);
}
}

0
TBF/ComponentsManagerDlg.resx → TBF/UI/Bench/Components/ComponentsManagerDlg.resx
View File

4
TBF/SelectComponentClassDlg.Designer.cs → TBF/UI/Bench/Components/SelectComponentClassDlg.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
namespace TBF
namespace TBF.UI.Bench.Components
{
partial class SelectComponentClassDlg
{

4
TBF/SelectComponentClassDlg.cs → TBF/UI/Bench/Components/SelectComponentClassDlg.cs
View File

@ -1,12 +1,12 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
using TBF.BenchControl.Generic;
using TBF.Resources;
namespace TBF
namespace TBF.UI.Bench.Components
{
public partial class SelectComponentClassDlg : Form
{

0
TBF/SelectComponentClassDlg.resx → TBF/UI/Bench/Components/SelectComponentClassDlg.resx
View File

11
TBF/UiControls/IMetrologyDlgTab.cs → TBF/UI/Bench/Metrology/IMetrologyDlgTab.cs
View File

@ -1,21 +1,22 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using Config.Entities;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
interface IMetrologyDlgTab : ITabWithListViewEx
interface IMetrologyDlgTab : TBF.UI.Shared.ITabWithListViewEx
{
/// <summary>
/// Component entity that has a list of 'measurement-correction' pairs
/// to be updated in the database on OK.
/// </summary>
Config.Entities.Component MeterEntity { get; set; }
Component MeterEntity { get; set; }
/// <summary>
/// A list of 'measurement-correction' pairs to be deleted from the database on OK.
/// </summary>
IList<Config.Entities.MeasurementCorrection> ToBeRemoved { get; set; }
IList<MeasurementCorrection> ToBeRemoved { get; set; }
}
}

6
TBF/MetrologyDlg.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlg.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlg
{
@ -33,7 +33,7 @@ namespace TBF
{
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.metrologyTabControl = new System.Windows.Forms.TabControl();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout();
this.splitContainer.Panel2.SuspendLayout();
@ -98,6 +98,6 @@ namespace TBF
private System.Windows.Forms.SplitContainer splitContainer;
private System.Windows.Forms.TabControl metrologyTabControl;
private UiControls.SharedButtons sharedButtons;
private TBF.UI.Shared.SharedButtons sharedButtons;
}
}

4
TBF/MetrologyDlg.cs → TBF/UI/Bench/Metrology/MetrologyDlg.cs
View File

@ -7,11 +7,11 @@ using System.Windows.Forms;
using NHibernate;
using log4net;
using Config.Entities;
using TBF.UiControls;
using TBF.BenchControl;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlg : Form, IParentOfListViewEx
{

0
TBF/MetrologyDlg.resx → TBF/UI/Bench/Metrology/MetrologyDlg.resx
View File

8
TBF/UiControls/MetrologyDlgBalanceTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgBalanceTab
{
@ -57,7 +57,7 @@ namespace TBF.UiControls
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -369,7 +369,7 @@ namespace TBF.UiControls
private System.Windows.Forms.Label cmpntNameLabel;
private System.Windows.Forms.SplitContainer splitContainer1;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.Label measuredLabel;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;

12
TBF/UiControls/MetrologyDlgBalanceTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgBalanceTab : UserControl, IMetrologyDlgTab
{
@ -72,8 +74,8 @@ namespace TBF.UiControls
this.Controls.Add(correctionTextBox = new TextBox());
this.Controls.Add(errorTextBox = new TextBox());
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [kg]", Strings.Mass), Width = 100 });
@ -143,7 +145,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -159,7 +161,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgBalanceTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.resx
View File

4
TBF/UiControls/MetrologyDlgDensityTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgDensityTab
{

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

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2017 Senus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -9,7 +9,7 @@ using log4net;
using Config.Entities;
using TBF.Resources;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgDensityTab : UserControl, IMetrologyDlgTab
{

0
TBF/UiControls/MetrologyDlgDensityTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.resx
View File

6
TBF/UiControls/MetrologyDlgDiverterTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgDiverterTab
{
@ -48,7 +48,7 @@ namespace TBF.UiControls
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

16
TBF/UiControls/MetrologyDlgDiverterTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgDiverterTab : UserControl, IMetrologyDlgTab
{
@ -75,9 +77,9 @@ namespace TBF.UiControls
this.Controls.Add(measurementTextBox);
this.Controls.Add(correctionTextBox);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [m3/h]", Strings.Flow), Width = 100 });
@ -126,7 +128,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -138,7 +140,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return;
@ -166,7 +168,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgDiverterTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.resx
View File

6
TBF/UiControls/MetrologyDlgEvaporationTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgEvaporationTab
{
@ -48,7 +48,7 @@ namespace TBF.UiControls
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

16
TBF/UiControls/MetrologyDlgEvaporationTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgEvaporationTab : UserControl, IMetrologyDlgTab
{
@ -75,9 +77,9 @@ namespace TBF.UiControls
this.Controls.Add(measurementTextBox);
this.Controls.Add(correctionTextBox);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [°C]", Strings.Temperature), Width = 100 });
@ -126,7 +128,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -138,7 +140,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return;
@ -166,7 +168,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgEvaporationTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.resx
View File

8
TBF/UiControls/MetrologyDlgFlowMeterTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgFlowMeterTab
{
@ -48,7 +48,7 @@ namespace TBF.UiControls
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

12
TBF/UiControls/MetrologyDlgFlowMeterTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgFlowMeterTab : UserControl, IMetrologyDlgTab
{
@ -89,8 +91,8 @@ namespace TBF.UiControls
this.Controls.Add(correctionTextBox = new TextBox());
this.Controls.Add(errorTextBox = new TextBox());
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [m3/h]", Strings.Flow), Width = 100 });
@ -151,7 +153,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -167,7 +169,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgFlowMeterTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.resx
View File

8
TBF/UiControls/MetrologyDlgLevelMeterTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2018 Sensus Metering Systems
/// Copyright (c) 2018 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgLevelMeterTab
{
@ -48,7 +48,7 @@ namespace TBF.UiControls
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -270,7 +270,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

16
TBF/UiControls/MetrologyDlgLevelMeterTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgLevelMeterTab : UserControl, IMetrologyDlgTab
{
@ -75,9 +77,9 @@ namespace TBF.UiControls
this.Controls.Add(measurementTextBox);
this.Controls.Add(correctionTextBox);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [mm]", Strings.Level), Width = 100 });
@ -126,7 +128,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -138,7 +140,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return;
@ -166,7 +168,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgLevelMeterTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.resx
View File

4
TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgPlatinumResistanceTMeterTab
{

4
TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
/// Copyright (c) 2016 Senus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -9,7 +9,7 @@ using log4net;
using Config.Entities;
using TBF.Resources;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgPlatinumResistanceTMeterTab : UserControl, IMetrologyDlgTab
{

0
TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.resx
View File

8
TBF/UiControls/MetrologyDlgPressMeterTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgPressMeterTab
{
@ -39,7 +39,7 @@ namespace TBF.UiControls
this.measuredLabel = new System.Windows.Forms.Label();
this.componentLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -172,7 +172,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label componentLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

12
TBF/UiControls/MetrologyDlgPressMeterTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgPressMeterTab : UserControl, IMetrologyDlgTab
{
@ -69,8 +71,8 @@ namespace TBF.UiControls
this.Controls.Add(correctionTextBox = new TextBox());
this.Controls.Add(errorTextBox = new TextBox());
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [bar]", Strings.Pressure), Width = 100 });
@ -107,7 +109,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -123,7 +125,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgPressMeterTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.resx
View File

8
TBF/UiControls/MetrologyDlgTempMeterTab.Designer.cs → TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
/// Copyright (c) 2017 Senus Slovensko a.s.
///
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
partial class MetrologyDlgTempMeterTab
{
@ -39,7 +39,7 @@ namespace TBF.UiControls
this.measuredLabel = new System.Windows.Forms.Label();
this.componentLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new Results.Forms.ListViewEx();
this.listViewEx = new global::Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -172,7 +172,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label componentLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private Results.Forms.ListViewEx listViewEx;
private global::Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

12
TBF/UiControls/MetrologyDlgTempMeterTab.cs → TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs
View File

@ -7,9 +7,11 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Metrology
{
public partial class MetrologyDlgTempMeterTab : UserControl, IMetrologyDlgTab
{
@ -69,8 +71,8 @@ namespace TBF.UiControls
this.Controls.Add(correctionTextBox = new TextBox());
this.Controls.Add(errorTextBox = new TextBox());
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 40 });
listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [°C]", Strings.Temperature), Width = 120 });
@ -107,7 +109,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -123,7 +125,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

0
TBF/UiControls/MetrologyDlgTempMeterTab.resx → TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.resx
View File

40
TBF/UiControls/PathsBenchCtrl.cs → TBF/UI/Bench/Paths/PathsBenchCtrl.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -7,12 +7,14 @@ using System.Drawing;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using NHibernate;
using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using NHibernate;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Paths
{
public class PathsBenchCtrl : BaseWithListViewEx<Config.Entities.BenchPath>, ITabWithListViewEx
{
@ -58,27 +60,27 @@ namespace TBF.UiControls
foreach (var path in MyItems) path.OriName = path.Name;
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.BenchColumnCount > 0) ? ls.BenchColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Q_from_m3h, (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Q_to_m3h, (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.T_in, (ls.BenchColumnCount > 3) ? ls.BenchColumnWidths[3] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.T_out, (ls.BenchColumnCount > 4) ? ls.BenchColumnWidths[4] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.P_in, (ls.BenchColumnCount > 5) ? ls.BenchColumnWidths[5] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.P_out, (ls.BenchColumnCount > 6) ? ls.BenchColumnWidths[6] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.P_delta, (ls.BenchColumnCount > 7) ? ls.BenchColumnWidths[7] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.StopBFValve_chdr, (ls.BenchColumnCount > 8) ? ls.BenchColumnWidths[8] : 70 * parent.Dpi / PathsDlg.Dpi100pct);
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(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);
Columns.Add(Strings.P_out, (ls.BenchColumnCount > 6) ? ls.BenchColumnWidths[6] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.P_delta, (ls.BenchColumnCount > 7) ? ls.BenchColumnWidths[7] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.StopBFValve_chdr, (ls.BenchColumnCount > 8) ? ls.BenchColumnWidths[8] : 70 * parent.Dpi / Constants.Dpi100pct);
int clmn = (int)Column.FixedColumnsCount;
foreach (var vlv in parent.Valves)
{
if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Bench)
{
Columns.Add(vlv.Cfg.Name, (ls.BenchColumnCount > clmn) ? ls.BenchColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(vlv.Cfg.Name, (ls.BenchColumnCount > clmn) ? ls.BenchColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++;
}
}
@ -140,7 +142,7 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is Config.Entities.IHasItemNr) &&
@ -152,7 +154,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -178,7 +180,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (e.SubItem >= fixedColumnsCount)
{

22
TBF/PathsDlg.Designer.cs → TBF/UI/Bench/Paths/PathsDlg.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF
namespace TBF.UI.Bench.Paths
{
partial class PathsDlg
{
@ -35,14 +35,14 @@ namespace TBF
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.pathsTabControl = new System.Windows.Forms.TabControl();
this.feedingTabPage = new System.Windows.Forms.TabPage();
this.pathsFeedingCtrl = new TBF.UiControls.PathsFeedingCtrl();
this.pathsFeedingCtrl = new TBF.UI.Bench.Paths.PathsFeedingCtrl();
this.benchTabPage = new System.Windows.Forms.TabPage();
this.pathsBenchCtrl = new TBF.UiControls.PathsBenchCtrl();
this.pathsBenchCtrl = new TBF.UI.Bench.Paths.PathsBenchCtrl();
this.outputTabPage = new System.Windows.Forms.TabPage();
this.pathsOutputCtrl = new TBF.UiControls.PathsOutputCtrl();
this.pathsOutputCtrl = new TBF.UI.Bench.Paths.PathsOutputCtrl();
this.metersTabPage = new System.Windows.Forms.TabPage();
this.pathsMetersCtrl = new TBF.UiControls.PathsMetersCtrl();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.pathsMetersCtrl = new TBF.UI.Bench.Paths.PathsMetersCtrl();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout();
this.splitContainer.Panel2.SuspendLayout();
@ -184,10 +184,10 @@ namespace TBF
private System.Windows.Forms.TabPage benchTabPage;
private System.Windows.Forms.TabPage outputTabPage;
private System.Windows.Forms.TabPage metersTabPage;
private UiControls.SharedButtons sharedButtons;
private UiControls.PathsFeedingCtrl pathsFeedingCtrl;
private UiControls.PathsBenchCtrl pathsBenchCtrl;
private UiControls.PathsOutputCtrl pathsOutputCtrl;
private UiControls.PathsMetersCtrl pathsMetersCtrl;
private TBF.UI.Shared.SharedButtons sharedButtons;
private PathsFeedingCtrl pathsFeedingCtrl;
private PathsBenchCtrl pathsBenchCtrl;
private PathsOutputCtrl pathsOutputCtrl;
private PathsMetersCtrl pathsMetersCtrl;
}
}

8
TBF/PathsDlg.cs → TBF/UI/Bench/Paths/PathsDlg.cs
View File

@ -8,11 +8,12 @@ using System.Windows.Forms;
using NHibernate;
using log4net;
using Config.Entities;
using TBF.UiControls;
using Results.Forms;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF
namespace TBF.UI.Bench.Paths
{
public partial class PathsDlg : Form, IParentOfListViewEx
{
@ -29,7 +30,6 @@ namespace TBF
/// Used when re-scaling the dialog: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi
public readonly int Dpi;
public const int Dpi100pct = 96;
public IList<BenchControl.Generic.IComponent> TbfComponents;
public IList<IValve> Valves;
@ -302,7 +302,7 @@ namespace TBF
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
ListViewEx listViewEx = sender as ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
/// No item selected

0
TBF/PathsDlg.resx → TBF/UI/Bench/Paths/PathsDlg.resx
View File

30
TBF/UiControls/PathsFeedingCtrl.cs → TBF/UI/Bench/Paths/PathsFeedingCtrl.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -8,10 +8,12 @@ using System.Globalization;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Paths
{
public class PathsFeedingCtrl : BaseWithListViewEx<Config.Entities.FeedingPath>, ITabWithListViewEx
{
@ -54,21 +56,21 @@ namespace TBF.UiControls
foreach (var path in MyItems) path.OriName = path.Name;
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.FeedingColumnCount > 0) ? ls.FeedingColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Q_from_m3h, (ls.FeedingColumnCount > 1) ? ls.FeedingColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Q_to_m3h, (ls.FeedingColumnCount > 2) ? ls.FeedingColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Pump, (ls.FeedingColumnCount > 3) ? ls.FeedingColumnWidths[3] : 60 * parent.Dpi / PathsDlg.Dpi100pct);
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(Strings.Pump, (ls.FeedingColumnCount > 3) ? ls.FeedingColumnWidths[3] : 60 * parent.Dpi / Constants.Dpi100pct);
int clmn = (int)Column.FixedColumnsCount;
foreach (var rv in parent.FeedingRegulValves)
{
Columns.Add(rv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(rv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++;
}
regvCount = clmn - (int)Column.FixedColumnsCount;
@ -77,7 +79,7 @@ namespace TBF.UiControls
{
if (vlv.Category == TBF.BenchControl.ValveCategory.All || vlv.Category == TBF.BenchControl.ValveCategory.Feeding)
{
Columns.Add(vlv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(vlv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++;
}
}
@ -128,7 +130,7 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is IHasItemNr) &&
@ -140,7 +142,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -166,7 +168,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (e.SubItem >= fixedColumnsCount + regvCount)
{

18
TBF/UiControls/PathsHeatMetersCtrl.cs → TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs
View File

@ -1,16 +1,18 @@
///
/// Copyright (c) 2016-2017 Sensus Metering Systems
/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Paths
{
public class PathsHeatMetersCtrl : BaseWithListViewEx<Config.Entities.HeatMetersPath>, ITabWithListViewEx
{
@ -60,9 +62,9 @@ namespace TBF.UiControls
foreach (var path in MyItems) path.OriName = path.Name;
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
IList<ITempMeter> tempMeters = new List<ITempMeter>();
foreach (var cmpnt in parent.TbfComponents)
@ -119,7 +121,7 @@ namespace TBF.UiControls
#endif
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is Config.Entities.IHasItemNr) &&
@ -131,7 +133,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -157,7 +159,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (e.SubItem >= (int)Column.TWarmFrom && e.SubItem <= (int)Column.TColdTo)
{

23
TBF/UiControls/PathsMetersCtrl.cs → TBF/UI/Bench/Paths/PathsMetersCtrl.cs
View File

@ -1,16 +1,19 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Bench.Paths;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Paths
{
public class PathsMetersCtrl : BaseWithListViewEx<Config.Entities.MetersPath>, ITabWithListViewEx
{
@ -47,9 +50,9 @@ namespace TBF.UiControls
foreach (var path in MyItems) path.OriName = path.Name;
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
IList<IRegisterReader> readers = new List<IRegisterReader>();
foreach (var cmpnt in parent.TbfComponents)
@ -59,11 +62,11 @@ namespace TBF.UiControls
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.MetersColumnCount > 0) ? ls.MetersColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Name, (ls.MetersColumnCount > 0) ? ls.MetersColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct);
int clmn = (int)Column.FixedColumnsCount;
for (int i = 0; i < Config.Data.WMsCount; i++)
{
Columns.Add(string.Format("{0} {1}", Strings.Sensor, i + 1), (ls.MetersColumnCount > clmn) ? ls.MetersColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("{0} {1}", Strings.Sensor, i + 1), (ls.MetersColumnCount > clmn) ? ls.MetersColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++;
}
@ -88,13 +91,13 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -120,7 +123,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
}

56
TBF/UiControls/PathsOutputCtrl.cs → TBF/UI/Bench/Paths/PathsOutputCtrl.cs
View File

@ -1,17 +1,19 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using System.Collections.Generic;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Paths
{
public class PathsOutputCtrl : BaseWithListViewEx<Config.Entities.OutputPath>, ITabWithListViewEx
{
@ -65,35 +67,35 @@ namespace TBF.UiControls
foreach (var path in MyItems) path.OriName = path.Name;
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
Columns.Add(Strings.Name, (ls.OutputColumnCount > 0) ? ls.OutputColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Q_from_m3h, (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Q_to_m3h, (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Flowmeter, (ls.OutputColumnCount > 3) ? ls.OutputColumnWidths[3] : 85 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Reg_valve, (ls.OutputColumnCount > 4) ? ls.OutputColumnWidths[4] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.PID, (ls.OutputColumnCount > 5) ? ls.OutputColumnWidths[5] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Diverter, (ls.OutputColumnCount > 6) ? ls.OutputColumnWidths[6] : 60 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.T_div, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 70 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Balance, (ls.OutputColumnCount > 8) ? ls.OutputColumnWidths[8] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("{0} 1", Strings.StartValve), (ls.OutputColumnCount > 9) ? ls.OutputColumnWidths[9] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("Inv. SV1"), (ls.OutputColumnCount > 10) ? ls.OutputColumnWidths[10] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("{0} 2", Strings.StartValve), (ls.OutputColumnCount > 11) ? ls.OutputColumnWidths[11] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("Inv.SV2"), (ls.OutputColumnCount > 12) ? ls.OutputColumnWidths[12] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("Lag SV2"), (ls.OutputColumnCount > 13) ? ls.OutputColumnWidths[13] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("{0} 3", Strings.StartValve), (ls.OutputColumnCount > 14) ? ls.OutputColumnWidths[14] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("Inv.SV3"), (ls.OutputColumnCount > 15) ? ls.OutputColumnWidths[15] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(string.Format("Lag SV3"), (ls.OutputColumnCount > 16) ? ls.OutputColumnWidths[16] : 80 * parent.Dpi / PathsDlg.Dpi100pct);
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(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);
Columns.Add(Strings.Diverter, (ls.OutputColumnCount > 6) ? ls.OutputColumnWidths[6] : 60 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.T_div, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 70 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Balance, (ls.OutputColumnCount > 8) ? ls.OutputColumnWidths[8] : 50 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} 1", Strings.StartValve), (ls.OutputColumnCount > 9) ? ls.OutputColumnWidths[9] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv. SV1"), (ls.OutputColumnCount > 10) ? ls.OutputColumnWidths[10] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} 2", Strings.StartValve), (ls.OutputColumnCount > 11) ? ls.OutputColumnWidths[11] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv.SV2"), (ls.OutputColumnCount > 12) ? ls.OutputColumnWidths[12] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Lag SV2"), (ls.OutputColumnCount > 13) ? ls.OutputColumnWidths[13] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("{0} 3", Strings.StartValve), (ls.OutputColumnCount > 14) ? ls.OutputColumnWidths[14] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Inv.SV3"), (ls.OutputColumnCount > 15) ? ls.OutputColumnWidths[15] : 80 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(string.Format("Lag SV3"), (ls.OutputColumnCount > 16) ? ls.OutputColumnWidths[16] : 80 * parent.Dpi / Constants.Dpi100pct);
int clmn = (int)Column.FixedColumnsCount;
foreach (var vlv in parent.Valves)
{
if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Output)
{
Columns.Add(vlv.Cfg.Name, (ls.OutputColumnCount > clmn) ? ls.OutputColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(vlv.Cfg.Name, (ls.OutputColumnCount > clmn) ? ls.OutputColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++;
}
}
@ -179,7 +181,7 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is IHasItemNr) &&
@ -191,7 +193,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -217,7 +219,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (e.SubItem >= fixedColumnsCount)
{

32
TBF/UiControls/TransitionStepsCtrl.cs → TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs
View File

@ -1,16 +1,18 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
namespace TBF.UiControls
namespace TBF.UI.Bench.Transitions
{
public partial class TransitionStepsCtrl : BaseWithListViewEx<TransitionStep>, ITabWithListViewEx
{
@ -51,7 +53,7 @@ namespace TBF.UiControls
conditionIDs = new List<int>();
}
public void Initialize(TransitionSequence sequence, TransitionsDlg parent, Control parentControl)
public void Initialize(TransitionSequence sequence, TBF.UI.Bench.Transitions.TransitionsDlg parent, Control parentControl)
{
this.sequence = sequence;
this.parent = parent;
@ -59,9 +61,9 @@ namespace TBF.UiControls
Name = sequence.Name;
MyItems = sequence.TransitionSteps;
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
vCount = 0;
fmPumpCount = 0;
@ -70,26 +72,26 @@ namespace TBF.UiControls
///
/// ListViewEx columns
///
Columns.Add(Strings.Duration_s, 70 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Message, 100 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.End_Condition, 80 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(Strings.Duration_s, 70 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.Message, 100 * parent.Dpi / Constants.Dpi100pct);
Columns.Add(Strings.End_Condition, 80 * parent.Dpi / Constants.Dpi100pct);
foreach (var vlv in parent.Valves)
{
if (vlv is BenchControl.GenericDevices.IPumpFM)
{
Columns.Add(vlv.Cfg.Name + " [%]", 45 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(vlv.Cfg.Name + " [%]", 45 * parent.Dpi / Constants.Dpi100pct);
fmPumpCount++;
}
}
foreach (var rvlv in parent.RegulValves)
{
Columns.Add(rvlv.Cfg.Name + " [%]", 55 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(rvlv.Cfg.Name + " [%]", 55 * parent.Dpi / Constants.Dpi100pct);
}
foreach (var vlv in parent.Valves)
{
if (!(vlv is BenchControl.GenericDevices.IPumpFM))
{
Columns.Add(vlv.Cfg.Name, 40 * parent.Dpi / PathsDlg.Dpi100pct);
Columns.Add(vlv.Cfg.Name, 40 * parent.Dpi / Constants.Dpi100pct);
vCount++;
}
}
@ -187,13 +189,13 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -219,7 +221,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
{
if (e.SubItem == (int)Column.Duration)
{

6
TBF/TransitionsDlg.Designer.cs → TBF/UI/Bench/Transitions/TransitionsDlg.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF
namespace TBF.UI.Bench.Transitions
{
partial class TransitionsDlg
{
@ -34,7 +34,7 @@ namespace TBF
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TransitionsDlg));
this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl = new System.Windows.Forms.TabControl();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
this.mainSplitContainer.Panel2.SuspendLayout();
@ -86,6 +86,6 @@ namespace TBF
private System.Windows.Forms.SplitContainer mainSplitContainer;
private System.Windows.Forms.TabControl tabControl;
private UiControls.SharedButtons sharedButtons;
private TBF.UI.Shared.SharedButtons sharedButtons;
}
}

17
TBF/TransitionsDlg.cs → TBF/UI/Bench/Transitions/TransitionsDlg.cs
View File

@ -3,18 +3,19 @@
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using log4net;
using NHibernate;
using Config.Entities;
using Results.Forms;
using TBF.BenchControl.Generic;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UiControls;
using System.IO;
using TBF.UI.Shared;
namespace TBF
namespace TBF.UI.Bench.Transitions
{
public partial class TransitionsDlg : Form, IParentOfListViewEx
{
@ -168,7 +169,7 @@ namespace TBF
void RefreshAllTabs()
{
foreach (var ctrl in seqStepsCtrls) (ctrl as Results.Forms.ListViewEx).Refresh();
foreach (var ctrl in seqStepsCtrls) (ctrl as ListViewEx).Refresh();
}
private void Unlocked(object sender, EventArgs e)
@ -179,7 +180,7 @@ namespace TBF
private void newTabButton_Click(object sender, EventArgs e)
{
Forms.TabNameDlg dlg;
TabNameDlg dlg;
bool nameUsed;
int tabId = TransitionSequences.Count + VirtualBenchSequences.Count;
@ -195,7 +196,7 @@ namespace TBF
if (!nameUsed) break;
}
dlg = new Forms.TabNameDlg();
dlg = new TabNameDlg();
dlg.TabNameLabel = Strings.New_transition_name;
dlg.TabName = newName;
@ -232,7 +233,7 @@ namespace TBF
TransitionSequence transitionSeq = tabPage.Tag as TransitionSequence;
VirtualBenchSequence virtualBenchSeq = tabPage.Tag as VirtualBenchSequence;
Forms.TabNameDlg dlg = new Forms.TabNameDlg(true);
TabNameDlg dlg = new TabNameDlg(true);
dlg.TabNameLabel = Strings.New_transition_name;
if (dlg.ShowDialog() == DialogResult.OK)
@ -622,7 +623,7 @@ namespace TBF
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
ListViewEx listViewEx = sender as ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
UpdateButtonStates(SharedButtons.SelectedItemPos.None);

Some files were not shown because too many files have changed in this diff Show More