diff --git a/IOB-WIN-FANUC/AdapterFormNext.cs b/IOB-WIN-FANUC/AdapterFormNext.cs index 60e09003..b6ff574d 100644 --- a/IOB-WIN-FANUC/AdapterFormNext.cs +++ b/IOB-WIN-FANUC/AdapterFormNext.cs @@ -8,16 +8,22 @@ using System.Threading.Tasks; namespace IOB_WIN_FANUC { - public class AdapterFormNext: IOB_WIN_FORM.AdapterForm + public class AdapterFormNext : IOB_WIN_FORM.AdapterForm { + #region Public Constructors /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } + + #endregion Public Constructors + + #region Protected Methods + /// /// carica IOB richiesto /// @@ -27,7 +33,6 @@ namespace IOB_WIN_FANUC { switch (tipoScelto) { - case tipoAdapter.FANUC: iobObj = new Iob.Fanuc(this, IOBConf, IOBConfFull); btnStart.Enabled = true; @@ -40,17 +45,10 @@ namespace IOB_WIN_FANUC btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } + + #endregion Protected Methods } -} +} \ No newline at end of file diff --git a/IOB-WIN-MBUS/AdapterFormNext.cs b/IOB-WIN-MBUS/AdapterFormNext.cs index 7a19266f..c0a3181a 100644 --- a/IOB-WIN-MBUS/AdapterFormNext.cs +++ b/IOB-WIN-MBUS/AdapterFormNext.cs @@ -85,16 +85,7 @@ namespace IOB_WIN_MBUS btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } } diff --git a/IOB-WIN-MTC/AdapterFormNext.cs b/IOB-WIN-MTC/AdapterFormNext.cs index 126a2ae5..f8d9ccf7 100644 --- a/IOB-WIN-MTC/AdapterFormNext.cs +++ b/IOB-WIN-MTC/AdapterFormNext.cs @@ -39,16 +39,7 @@ namespace IOB_WIN_MTC btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } } diff --git a/IOB-WIN-OPC-UA/AdapterFormNext.cs b/IOB-WIN-OPC-UA/AdapterFormNext.cs index 3c383b0e..bd0d38d7 100644 --- a/IOB-WIN-OPC-UA/AdapterFormNext.cs +++ b/IOB-WIN-OPC-UA/AdapterFormNext.cs @@ -126,16 +126,7 @@ namespace IOB_WIN_OPC_UA btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } } diff --git a/IOB-WIN-SIEMENS/AdapterFormNext.cs b/IOB-WIN-SIEMENS/AdapterFormNext.cs index 938f2c0e..a88fd6f4 100644 --- a/IOB-WIN-SIEMENS/AdapterFormNext.cs +++ b/IOB-WIN-SIEMENS/AdapterFormNext.cs @@ -115,16 +115,7 @@ namespace IOB_WIN_SIEMENS btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } } diff --git a/IOB-WIN-SQL/AdapterFormNext.cs b/IOB-WIN-SQL/AdapterFormNext.cs index 93dbbaaa..b13b6aba 100644 --- a/IOB-WIN-SQL/AdapterFormNext.cs +++ b/IOB-WIN-SQL/AdapterFormNext.cs @@ -54,16 +54,7 @@ namespace IOB_WIN_SQL btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } } diff --git a/IOB-WIN-WPS/AdapterFormNext.cs b/IOB-WIN-WPS/AdapterFormNext.cs index dd771d3c..dcf44291 100644 --- a/IOB-WIN-WPS/AdapterFormNext.cs +++ b/IOB-WIN-WPS/AdapterFormNext.cs @@ -40,16 +40,7 @@ namespace IOB_WIN_WPS btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } } diff --git a/IOB-WIN-WS/AdapterFormNext.cs b/IOB-WIN-WS/AdapterFormNext.cs index 36f2fe1e..c2756241 100644 --- a/IOB-WIN-WS/AdapterFormNext.cs +++ b/IOB-WIN-WS/AdapterFormNext.cs @@ -55,16 +55,7 @@ namespace IOB_WIN_WS btnStart.Enabled = false; break; } - lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]"; - lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}"; - - // aggancio evento refresh - iobObj.eh_refreshed += IobObj_eh_refreshed; - - // carico i default values su interfaccia - setDefaults(); - - displayTaskAndLog($"Caricata conf per adapter {tipoScelto}"); + UpdateDisplTypeIobSel(); } } }