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

TBF.UI.Bench.Uncertainties : Modifications, 3 tab pages completed, 2 in preparation.

Browse Source
This commit is contained in:
Milan Hanajik
2019-09-18 18:49:11 +02:00
parent 74f8c44783
commit 90b760075c
22 changed files with 2549 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+108 -105
View File
@@ -10,7 +10,6 @@ using Config.Entities;
using TBF.BenchControl;
using TBF.Resources;
using TBF.UI.Shared;
using TBF.UI.Bench.Metrology; /// TODO: Remove
namespace TBF.UI.Bench.Uncertainties
{
@@ -40,7 +39,7 @@ namespace TBF.UI.Bench.Uncertainties
sharedButtons.RemoveClicked += removeButton_Click;
}
private void MetrologyDlg_Load(object sender, EventArgs e)
private void UncertaintiesDlg_Load(object sender, EventArgs e)
{
LoadUISettings();
@@ -53,7 +52,6 @@ namespace TBF.UI.Bench.Uncertainties
int flowMetersCount = 0;
int pressMetersCount = 0;
int tempMetersCount = 0;
int platinumTempMetersCount = 0;
int evaporationsCount = 0;
session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
@@ -61,19 +59,38 @@ namespace TBF.UI.Bench.Uncertainties
.OrderBy(x => x. ItemNr).Asc
.List();
// Density tab-page
fixedCount++;
TabPage dstyTabPage = new TabPage(" " + Strings.Density + " ");
MetrologyDlgDensityTab uiCtl = new MetrologyDlgDensityTab();
uiCtl.Dock = DockStyle.Fill;
dstyTabPage.Tag = uiCtl;
dstyTabPage.Controls.Add(uiCtl);
metrologyTabControl.TabPages.Add(dstyTabPage);
foreach (var cmpnt in cmpntEntities)
{
BenchControl.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
/// Tab-page density
if (factory is BenchControl.DataContainers.Density.ComponentFactory)
{
fixedCount++;
TabPage tabPage = new TabPage(" " + Strings.Density + " ");
UncertntDlgDensityTab uiControl = new UncertntDlgDensityTab();
uiControl.MeterEntity = cmpnt;
uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainers.Density.ComponentCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
uncertaintiesTabControl.TabPages.Add(tabPage);
}
/// Tab-page buoyancy
if (factory is BenchControl.DataContainers.Buoyancy.ComponentFactory)
{
fixedCount++;
TabPage tabPage = new TabPage(" Buoyancy ");
UncertntDlgBuoyancyTab uiControl = new UncertntDlgBuoyancyTab();
uiControl.MeterEntity = cmpnt;
uiControl.BuoyancyCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainers.Buoyancy.ComponentCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
uncertaintiesTabControl.TabPages.Add(tabPage);
}
/// Tab-pages for scales
if (factory is BenchControl.MettlerToledo.Standard.BalanceFactory ||
factory is BenchControl.MettlerToledo.Standard.BalanceOldFactory ||
@@ -82,36 +99,36 @@ namespace TBF.UI.Bench.Uncertainties
{
balancesCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgBalanceTab uiControl = new MetrologyDlgBalanceTab();
UncertntDlgScaleTab uiControl = new UncertntDlgScaleTab();
uiControl.MeterEntity = cmpnt;
uiControl.BalanceCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.IScaleCfg;
uiControl.ScaleCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.IScaleCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
uncertaintiesTabControl.TabPages.Add(tabPage);
}
/// Tab-pages for flowmeters
if (factory is BenchControl.Elde.FlowMeter.FlowMeterFactory)
{
BenchControl.Elde.FlowMeter.FlowMeterCfg flowMeterCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.Elde.FlowMeter.FlowMeterCfg;
///// Tab-pages for flowmeters
//if (factory is BenchControl.Elde.FlowMeter.FlowMeterFactory)
//{
// BenchControl.Elde.FlowMeter.FlowMeterCfg flowMeterCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.Elde.FlowMeter.FlowMeterCfg;
for (int r = 0; r <= 5; r++)
{
if (flowMeterCfg.RangeEnabled(r))
{
flowMetersCount++;
TabPage tabPage = new TabPage(string.Format(((r == 0) ? " {0} " : " {0} r{1} "), cmpnt.Name, r));
MetrologyDlgFlowMeterTab uiControl = new MetrologyDlgFlowMeterTab(r);
uiControl.MeterEntity = cmpnt;
uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibRangesCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
}
}
}
// for (int r = 0; r <= 5; r++)
// {
// if (flowMeterCfg.RangeEnabled(r))
// {
// flowMetersCount++;
// TabPage tabPage = new TabPage(string.Format(((r == 0) ? " {0} " : " {0} r{1} "), cmpnt.Name, r));
// MetrologyDlgFlowMeterTab uiControl = new MetrologyDlgFlowMeterTab(r);
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibRangesCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
// metrologyTabControl.TabPages.Add(tabPage);
// }
// }
//}
/// Tab-pages for pressure meters
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory ||
@@ -120,91 +137,78 @@ namespace TBF.UI.Bench.Uncertainties
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgPressMeterTab uiControl = new MetrologyDlgPressMeterTab();
UncertntDlgPressMeterTab uiControl = new UncertntDlgPressMeterTab();
uiControl.MeterEntity = cmpnt;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
uncertaintiesTabControl.TabPages.Add(tabPage);
}
/// Tab-pages for temperature meters
/// Tab-pages for temperature meters (incl. platinum temp. meter with Keithley)
if (factory is BenchControl.Elde.TempMeter.TempMeterFactory ||
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory)
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory ||
factory is BenchControl.Keithley.TempMeter.Factory)
{
tempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgTempMeterTab uiControl = new MetrologyDlgTempMeterTab();
UncertntDlgTempMeterTab uiControl = new UncertntDlgTempMeterTab();
uiControl.MeterEntity = cmpnt;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
uncertaintiesTabControl.TabPages.Add(tabPage);
}
/// Tab-pages for platinum resistance temperature meters
if (factory is BenchControl.Keithley.TempMeter.Factory)
{
platinumTempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgPlatinumResistanceTMeterTab uiControl = new MetrologyDlgPlatinumResistanceTMeterTab();
uiControl.MeterEntity = cmpnt;
uiControl.TempMeterCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.Keithley.TempMeter.TempMeterCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
}
///// Tab-pages for diverters
//if (factory is BenchControl.Elde.Diverter.DiverterFactory)
//{
// divertersCount++;
// TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
// MetrologyDlgDiverterTab uiControl = new MetrologyDlgDiverterTab();
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
// metrologyTabControl.TabPages.Add(tabPage);
//}
/// Tab-pages for diverters
if (factory is BenchControl.Elde.Diverter.DiverterFactory)
{
divertersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgDiverterTab uiControl = new MetrologyDlgDiverterTab();
uiControl.MeterEntity = cmpnt;
uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
}
///// Tab-pages for level meters inside water tanks
//if (factory is BenchControl.Hart.Nivotrack.Factory)
//{
// levelMetersCount++;
// TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
// MetrologyDlgLevelMeterTab uiControl = new MetrologyDlgLevelMeterTab();
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
// metrologyTabControl.TabPages.Add(tabPage);
//}
/// Tab-pages for level meters inside water tanks
if (factory is BenchControl.Hart.Nivotrack.Factory)
{
levelMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgLevelMeterTab uiControl = new MetrologyDlgLevelMeterTab();
uiControl.MeterEntity = cmpnt;
uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
}
/// Tab-pages for water tank evaporation rates
if (factory is BenchControl.Various.Evaporation.Factory)
{
evaporationsCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgEvaporationTab uiControl = new MetrologyDlgEvaporationTab();
uiControl.MeterEntity = cmpnt;
uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
metrologyTabControl.TabPages.Add(tabPage);
}
///// Tab-pages for water tank evaporation rates
//if (factory is BenchControl.Various.Evaporation.Factory)
//{
// evaporationsCount++;
// TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
// MetrologyDlgEvaporationTab uiControl = new MetrologyDlgEvaporationTab();
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
// metrologyTabControl.TabPages.Add(tabPage);
//}
}
}
private void unlockButton_Click(object sender, EventArgs e)
{
foreach (TabPage tabPage in metrologyTabControl.TabPages)
foreach (TabPage tabPage in uncertaintiesTabControl.TabPages)
{
(tabPage.Tag as IMetrologyDlgTab).Unlock();
(tabPage.Tag as IUncetaintiesDlgTab).Unlock();
}
}
@@ -214,13 +218,12 @@ namespace TBF.UI.Bench.Uncertainties
{
try
{
foreach (TabPage tabPage in metrologyTabControl.TabPages)
foreach (TabPage tabPage in uncertaintiesTabControl.TabPages)
{
IMetrologyDlgTab tab = tabPage.Tag as IMetrologyDlgTab;
tab.OkBtnClicked();
if (!(tabPage.Tag is MetrologyDlgDensityTab))
IUncetaintiesDlgTab tab = tabPage.Tag as IUncetaintiesDlgTab;
if (tab != null)
{
tab.OkBtnClicked();
session.SaveOrUpdate(tab.MeterEntity);
foreach (var entity in tab.ToBeRemoved) session.Delete(entity);
}
@@ -243,9 +246,9 @@ namespace TBF.UI.Bench.Uncertainties
private void cancelButton_Click(object sender, EventArgs e)
{
foreach (TabPage tabPage in metrologyTabControl.TabPages)
foreach (TabPage tabPage in uncertaintiesTabControl.TabPages)
{
(tabPage.Tag as IMetrologyDlgTab).CancelBtnClicked();
(tabPage.Tag as IUncetaintiesDlgTab).CancelBtnClicked();
}
SaveUISettings();
@@ -292,12 +295,12 @@ namespace TBF.UI.Bench.Uncertainties
private void addButton_Click(object sender, EventArgs e)
{
(metrologyTabControl.SelectedTab.Tag as IMetrologyDlgTab).AddOne();
(uncertaintiesTabControl.SelectedTab.Tag as IUncetaintiesDlgTab).AddOne();
}
private void removeButton_Click(object sender, EventArgs e)
{
(metrologyTabControl.SelectedTab.Tag as IMetrologyDlgTab).RemoveSelected();
(uncertaintiesTabControl.SelectedTab.Tag as IUncetaintiesDlgTab).RemoveSelected();
}
public void UpdateButtonStates(SharedButtons.SelectedItemPos selectedItemPos)