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

(1) ComponentsManagerDlg displays all components that failed to load, (2) Diverter.divNrFromName fixed for Berlin (DivEx), ver. 2.18.966

Browse Source
This commit is contained in:
Milan Hanajik 2018-07-16 10:26:17 +02:00
parent de269b66b5
commit af68f35400
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TBF/BenchControl/Elde/Diverter/Diverter.cs
View File

@ -92,7 +92,11 @@ namespace TBF.BenchControl.Elde.Diverter
}
int divNrFromName = int.Parse(Name.Substring(3));
int divNrFromName;
if (!int.TryParse(Name.Substring(3), out divNrFromName))
{
divNrFromName = nextIdx;
}
#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_40 || FUZHOU150 || FUZHOU300
flowMtrNr4Cmd = divNrFromName + 1;
#elif BADGER_STREDNA_TRAT

5
TBF/BenchControl/TbfComponents.cs
View File

@ -170,7 +170,10 @@ namespace TBF.BenchControl
public static IComponentCfg CmpntCfgFromCmpntEntity(Component entity)
{
IComponentFactory cmpntFactory = CmpntFactoryFromClassName(entity.ClassName);
return (cmpntFactory != null) ? cmpntFactory.CmpntCfgFromCmpntEntity(entity) : null;
if (cmpntFactory == null) return null;
try { return cmpntFactory.CmpntCfgFromCmpntEntity(entity); }
catch { return null; }
}

27
TBF/ComponentsManagerDlg.cs
View File

@ -188,35 +188,28 @@ namespace TBF
void DrawOne(Component cmpnt)
{
IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt);
ListViewItem lvi = new ListViewItem(cmpnt.Name);
lvi.Tag = cmpnt;
lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName);
lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName);
if (cmpCfg != null)
IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt);
if (cmpCfg != null)
{
ListViewItem lvi = new ListViewItem(cmpCfg.Name);
lvi.SubItems.Add(cmpCfg.Factory.ClassName);
lvi.SubItems.Add(cmpCfg.ParentName);
lvi.SubItems.Add(cmpCfg.DebugLevel.ToDescription());
lvi.SubItems.Add(cmpCfg.DebugLevel.ToDescription());
lvi.SubItems.Add(cmpCfg.LogLevel.ToDescription());
lvi.SubItems.Add(cmpCfg.ToString(1));
lvi.Tag = cmpnt;
listViewEx.Items.Add(lvi);
}
else
{
ListViewItem lvi = new ListViewItem(cmpnt.Name);
lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName);
lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName);
lvi.SubItems.Add("---");
lvi.SubItems.Add("---");
lvi.SubItems.Add("Not a component");
lvi.Tag = cmpnt;
listViewEx.Items.Add(lvi);
}
}
listViewEx.Items.Add(lvi);
}
///
/// Save DB changes, return true when DB changes saved OK

4
TBF/Properties/AssemblyInfo.cs
View File

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