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

DB 3.6 -> 3.7, PulsesPerLtrAux added to WaterMeterData and to Results items, MainSeqUtils and ProcedureDlg changes, ver. 3.7.2088

Browse Source
This commit is contained in:
Milan Hanajik
2023-08-17 19:57:58 +02:00
parent bc0de96ad9
commit eaf60f3292
10 changed files with 133 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Procedures/ProcedureParamsCtrl.cs
+17 -18
View File
@@ -22,9 +22,9 @@ namespace TBF.UI.Procedures
public partial class ProcedureParamsCtrl : UserControl, IProcParamsCtrl
{
ProcedureDlg parent;
bool showSensorsColumn;
int nrFixedColumns;
IList<IComponent> selectedCmpnts;
IList<string> names;
IList<IParamsProvider> cmpntsParams;
public IList<IParamsProvider> CmpntsParams { get { return cmpntsParams; } }
@@ -40,13 +40,13 @@ namespace TBF.UI.Procedures
cmpntsParams = new List<IParamsProvider>();
}
public ProcedureParamsCtrl(ProcedureDlg parent, IList<IComponent> selectedCmpnts, bool showSensorsColumn)
public ProcedureParamsCtrl(ProcedureDlg parent, IList<IComponent> selectedCmpnts, IList<string> names)
: this()
{
this.parent = parent;
this.selectedCmpnts = selectedCmpnts;
this.showSensorsColumn = showSensorsColumn;
nrFixedColumns = (showSensorsColumn ? 2 : 1);
this.names = names;
nrFixedColumns = 2;
unlocked = false;
this.SuspendLayout();
@@ -88,8 +88,8 @@ namespace TBF.UI.Procedures
if (sampleToCreateHeader != null)
{
if (showSensorsColumn) listViewEx.Columns.Add(Strings.Sensor, 60);
listViewEx.Columns.Add(Strings.Component, 80);
listViewEx.Columns.Add(string.Empty, 35);
listViewEx.Columns.Add(Strings.Component, 70);
paramsCount = sampleToCreateHeader.ParamsCount();
editors = new Control[paramsCount];
@@ -178,10 +178,16 @@ namespace TBF.UI.Procedures
public void RedrawAll()
{
listViewEx.Items.Clear();
foreach (var item in cmpntsParams) DrawOne(item);
if (names.Count >= cmpntsParams.Count)
{
for (int i = 0; i < cmpntsParams.Count; i++)
{
DrawOne(cmpntsParams[i], names[i]);
}
}
}
void DrawOne(IParamsProvider item)
void DrawOne(IParamsProvider item, string name)
{
if (item == null)
{
@@ -189,16 +195,9 @@ namespace TBF.UI.Procedures
return;
}
ListViewItem lvi;
if (showSensorsColumn)
{
lvi = new ListViewItem((listViewEx.Items.Count + 1).ToString());
lvi.SubItems.Add(selectedCmpnts[listViewEx.Items.Count].Cfg.Name);
}
else
{
lvi = new ListViewItem(selectedCmpnts[listViewEx.Items.Count].Cfg.Name);
}
ListViewItem lvi = new ListViewItem(name);
lvi.SubItems.Add(selectedCmpnts[listViewEx.Items.Count].Cfg.Name);
for (int i = 0; i < paramsCount; i++) lvi.SubItems.Add(item.ToString(i));
lvi.Tag = item;
listViewEx.Items.Add(lvi);