diff --git a/Main/WebService/TraceLab_UI.aspx b/Main/WebService/TraceLab_UI.aspx index 10ea1a4..669e697 100644 --- a/Main/WebService/TraceLab_UI.aspx +++ b/Main/WebService/TraceLab_UI.aspx @@ -48,7 +48,7 @@ - + diff --git a/Main/WebService/TraceLab_UI.aspx.cs b/Main/WebService/TraceLab_UI.aspx.cs index b87ac54..e9b799d 100644 --- a/Main/WebService/TraceLab_UI.aspx.cs +++ b/Main/WebService/TraceLab_UI.aspx.cs @@ -102,34 +102,12 @@ public void running_refresh(object sender, EventArgs e) { try { - var app = TraceLabApplicationWebConsole.Instance; - Console.Text = app.GetLogUntouched(); - if (app.GetLogUntouched().ToUpper().Contains ("DONE")) + Console.Text = TraceLabApplicationWebConsole.Instance.GetLogUntouched(); + if (TraceLabApplicationWebConsole.Instance.GetLogUntouched().ToUpper().Contains ("DONE")) { - Console.Text = app.GetLogUntouched(); + Console.Text = TraceLabApplicationWebConsole.Instance.GetLogUntouched(); runningTimer.Enabled = false; } - //int i = 0; - //while ((!app.IsExperimentRunning())&&(i<10000)) - //{ - // i++; - // Thread.Sleep(50); - // Console.Text = app.GetLogUntouched (); - - //} - //while (!app.GetLogUntouched().ToUpper().Contains ("DONE") && (i < 10000)) - //{ - // i++; - // Thread.Sleep (50); - // Console.Text = app.GetLogUntouched(); - //} - //Console.Text = app.GetLogUntouched(); - - //if (i >=10000) - //{ - // Console.Text = "timeout"; - //} - } catch(Exception ex) {