Updated tags, Improved node running display performance.

CoEST · Apr 13, 2018 · ed5d0c1 · ed5d0c1
1 parent 93d739e
commit ed5d0c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/Main/WebService/TraceLab_UI.aspx b/Main/WebService/TraceLab_UI.aspx
@@ -48,7 +48,7 @@
 
                      <asp:ScriptManager ID="ScriptManager1" runat="server"></asp:ScriptManager>
 
-                    <asp:Timer ID="runningTimer" runat="server" Interval="10" OnTick="running_refresh" Enabled ="False" />
+                    <asp:Timer ID="runningTimer" runat="server" Interval="5" OnTick="running_refresh" Enabled ="False" />
                     <asp:LinkButton ID="Run" CssClass="btn btn-primary btn-lg" runat="server" OnClick="Run_Click"><span class="glyphicon glyphicon-play"></span></asp:LinkButton>
                     <asp:LinkButton ID="Stop" CssClass="btn btn-primary btn-lg" runat="server" ><span class="glyphicon glyphicon-stop"></span></asp:LinkButton>
                     <asp:LinkButton ID="ReloadLog" CssClass="btn btn-primary btn-lg" runat="server" OnClick="Log_Click"><span class="glyphicon glyphicon-refresh"></span></asp:LinkButton>

diff --git 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)
         {