diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs index 80c357c7d..7219dad07 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs @@ -89,39 +89,63 @@ namespace TBF.Screens Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcedureSelected), sndr, args); - else - OnProcedureSelected(sndr, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcedureSelected), sndr, args); + else + OnProcedureSelected(sndr, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage24.OnProcedureSelected() failed: {0}", e.Message); } }; + Bridge.TestSelectedHandler += delegate(object sender, TestSelectedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnTestSelected), sender, args); - else - OnTestSelected(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnTestSelected), sender, args); + else + OnTestSelected(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage24.OnTestSelected() failed: {0}", e.Message); } }; + Bridge.ProcessDataHandler += delegate(object sender, ProcessDataEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcessDataChanged), sender, args); - else - OnProcessDataChanged(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcessDataChanged), sender, args); + else + OnProcessDataChanged(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage24.OnProcessDataChanged() failed: {0}", e.Message); } }; + Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnTestCompleted), sender, args); - else - OnTestCompleted(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnTestCompleted), sender, args); + else + OnTestCompleted(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage24.OnTestCompleted() failed: {0}", e.Message); } }; + Bridge.ProcedureCompletedHandler += delegate(object sender, ProcedureCompletedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcedureCompleted), sender, args); - else - OnProcedureCompleted(sender, args); - }; + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcedureCompleted), sender, args); + else + OnProcedureCompleted(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage24.OnProcedureCompleted() failed: {0}", e.Message); } + }; } /// diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs index be7560fb3..21ca26bff 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs @@ -118,39 +118,63 @@ namespace TBF.Screens Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcedureSelected), sndr, args); - else - OnProcedureSelected(sndr, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcedureSelected), sndr, args); + else + OnProcedureSelected(sndr, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage48.OnProcedureSelected() failed: {0}", e.Message); } }; + Bridge.TestSelectedHandler += delegate(object sender, TestSelectedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnTestSelected), sender, args); - else - OnTestSelected(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnTestSelected), sender, args); + else + OnTestSelected(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage48.OnTestSelected() failed: {0}", e.Message); } }; + Bridge.ProcessDataHandler += delegate(object sender, ProcessDataEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcessDataChanged), sender, args); - else - OnProcessDataChanged(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcessDataChanged), sender, args); + else + OnProcessDataChanged(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage48.OnProcessDataChanged() failed: {0}", e.Message); } }; + Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnTestCompleted), sender, args); - else - OnTestCompleted(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnTestCompleted), sender, args); + else + OnTestCompleted(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage48.OnTestCompleted() failed: {0}", e.Message); } }; + Bridge.ProcedureCompletedHandler += delegate(object sender, ProcedureCompletedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcedureCompleted), sender, args); - else - OnProcedureCompleted(sender, args); - }; + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcedureCompleted), sender, args); + else + OnProcedureCompleted(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage48.OnProcedureCompleted() failed: {0}", e.Message); } + }; } /// diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs index dc13ea18e..3d7414dc8 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs @@ -51,39 +51,63 @@ namespace TBF.Screens Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcedureSelected), sndr, args); - else - OnProcedureSelected(sndr, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcedureSelected), sndr, args); + else + OnProcedureSelected(sndr, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage.OnProcedureSelected() failed: {0}", e.Message); } }; + Bridge.TestSelectedHandler += delegate(object sender, TestSelectedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnTestSelected), sender, args); - else - OnTestSelected(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnTestSelected), sender, args); + else + OnTestSelected(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage.OnTestSelected() failed: {0}", e.Message); } }; + Bridge.ProcessDataHandler += delegate(object sender, ProcessDataEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcessDataChanged), sender, args); - else - OnProcessDataChanged(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcessDataChanged), sender, args); + else + OnProcessDataChanged(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage.OnProcessDataChanged() failed: {0}", e.Message); } }; + Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnTestCompleted), sender, args); - else - OnTestCompleted(sender, args); + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnTestCompleted), sender, args); + else + OnTestCompleted(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage.OnTestCompleted() failed: {0}", e.Message); } }; + Bridge.ProcedureCompletedHandler += delegate(object sender, ProcedureCompletedEventArgs args) { - if (InvokeRequired) - Invoke(new EventHandler(OnProcedureCompleted), sender, args); - else - OnProcedureCompleted(sender, args); - }; + try + { + if (InvokeRequired) + Invoke(new EventHandler(OnProcedureCompleted), sender, args); + else + OnProcedureCompleted(sender, args); + } + catch (Exception e) { log.ErrorFormat("ProcessTabPage.OnProcedureCompleted() failed: {0}", e.Message); } + }; } private void ProcessTabPageCtrl_Load(object sender, EventArgs e)