From 77ab205bdeedfb1825a685380ecdf9e0509ddb03 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Mar 2013 15:27:30 -0600 Subject: [PATCH] Fix scope part offline mode --- clients/tde/src/part/scope/part.cpp | 133 ++++++++++++++++++++++++---- 1 file changed, 114 insertions(+), 19 deletions(-) diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index 62d3f0c..be54ed4 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -448,7 +448,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -481,7 +486,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -517,7 +527,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -553,7 +568,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -594,7 +614,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -646,7 +671,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -690,7 +720,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -738,7 +773,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -782,7 +822,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -825,7 +870,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -862,7 +912,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -904,7 +959,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -949,7 +1009,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -1013,7 +1078,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -1080,7 +1150,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -1133,7 +1208,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -1174,7 +1254,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -1217,7 +1302,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else { @@ -1266,7 +1356,12 @@ void ScopePart::mainEventLoop() { EXEC_NEXT_STATE_IMMEDIATELY } else { - COMMUNICATIONS_FAILED + if (stopTraceUpdate == false) { + COMMUNICATIONS_FAILED + } + else { + setTickerMessage(i18n("Data acquisition stopped")); + } } } else {