Skip to content

Commit ed5d0c1

Browse files
committed
Updated tags, Improved node running display performance.
1 parent 93d739e commit ed5d0c1

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

Main/WebService/TraceLab_UI.aspx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<asp:ScriptManager ID="ScriptManager1" runat="server"></asp:ScriptManager>
5050

51-
<asp:Timer ID="runningTimer" runat="server" Interval="10" OnTick="running_refresh" Enabled ="False" />
51+
<asp:Timer ID="runningTimer" runat="server" Interval="5" OnTick="running_refresh" Enabled ="False" />
5252
<asp:LinkButton ID="Run" CssClass="btn btn-primary btn-lg" runat="server" OnClick="Run_Click"><span class="glyphicon glyphicon-play"></span></asp:LinkButton>
5353
<asp:LinkButton ID="Stop" CssClass="btn btn-primary btn-lg" runat="server" ><span class="glyphicon glyphicon-stop"></span></asp:LinkButton>
5454
<asp:LinkButton ID="ReloadLog" CssClass="btn btn-primary btn-lg" runat="server" OnClick="Log_Click"><span class="glyphicon glyphicon-refresh"></span></asp:LinkButton>

Main/WebService/TraceLab_UI.aspx.cs

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,34 +102,12 @@ public void running_refresh(object sender, EventArgs e)
102102
{
103103
try
104104
{
105-
var app = TraceLabApplicationWebConsole.Instance;
106-
Console.Text = app.GetLogUntouched();
107-
if (app.GetLogUntouched().ToUpper().Contains ("DONE"))
105+
Console.Text = TraceLabApplicationWebConsole.Instance.GetLogUntouched();
106+
if (TraceLabApplicationWebConsole.Instance.GetLogUntouched().ToUpper().Contains ("DONE"))
108107
{
109-
Console.Text = app.GetLogUntouched();
108+
Console.Text = TraceLabApplicationWebConsole.Instance.GetLogUntouched();
110109
runningTimer.Enabled = false;
111110
}
112-
//int i = 0;
113-
//while ((!app.IsExperimentRunning())&&(i<10000))
114-
//{
115-
// i++;
116-
// Thread.Sleep(50);
117-
// Console.Text = app.GetLogUntouched ();
118-
119-
//}
120-
//while (!app.GetLogUntouched().ToUpper().Contains ("DONE") && (i < 10000))
121-
//{
122-
// i++;
123-
// Thread.Sleep (50);
124-
// Console.Text = app.GetLogUntouched();
125-
//}
126-
//Console.Text = app.GetLogUntouched();
127-
128-
//if (i >=10000)
129-
//{
130-
// Console.Text = "timeout";
131-
//}
132-
133111
}
134112
catch(Exception ex)
135113
{

0 commit comments

Comments
 (0)