From 4a7ab715f7115460892927b998b2c45828f275d6 Mon Sep 17 00:00:00 2001
From: Mike Fiore <mfiore@multitech.com>
Date: Tue, 1 Dec 2015 15:11:03 -0600
Subject: update progress and pass/fail for sweep

---
 Mode/ModeSingle.cpp | 6 ++++--
 Mode/ModeSweep.cpp  | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'Mode')

diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp
index 6150128..083b72d 100644
--- a/Mode/ModeSingle.cpp
+++ b/Mode/ModeSingle.cpp
@@ -80,7 +80,7 @@ bool ModeSingle::start() {
                                 break;
                             case failure:
                                 incrementRatePower();
-                                _failure.updateInfo(formatNewRatePower());
+                                _failure.updateInfo2(formatNewRatePower());
                                 logInfo("new data rate %u, power %lu", _data_rate, _power);
                                 break;
                         }
@@ -189,6 +189,8 @@ bool ModeSingle::start() {
                                 updateData(_data, single, false);
                                 appendDataFile(_data);
                                 _failure.updatePower(_power);
+                                _failure.updateSw1("   Power");
+                                _failure.updateSw2("Survey");
                                 logInfo("ping failed");
                                 break;
                             case success:
@@ -311,7 +313,7 @@ void ModeSingle::displaySuccess() {
     // display GPS latitude, longitude, and time
     // else
     // display "no lock"
-    _success.updateInfo("No GPS Lock");
+    _success.updateGpsLatitude("No GPS Lock");
 }
 
 std::string ModeSingle::formatNewRatePower() {
diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp
index a62d79c..938ec83 100644
--- a/Mode/ModeSweep.cpp
+++ b/Mode/ModeSweep.cpp
@@ -226,9 +226,11 @@ bool ModeSweep::start() {
                                 _failure.updateId(_index);
                                 // mDot::DataRateStr returns format SF_XX - we only want to display the XX part
                                 _failure.updateRate(_dot->DataRateStr(_data_rate).substr(3));
+                                _failure.updatePower(_power);
+                                _failure.updatePassFail(_survey_success, _survey_failure);
+                                _failure.updateSw1("  Cancel");
                                 updateData(_data, sweep, false);
                                 appendDataFile(_data);
-                                _failure.updatePower(_power);
                                 logInfo("ping failed");
                                 _display_timer.start();
                                 break;
@@ -383,7 +385,8 @@ void ModeSweep::displaySuccess() {
     // display GPS latitude, longitude, and time
     // else
     // display "no lock"
-    _success.updateInfo("No GPS Lock");
+    _success.updateGpsLatitude("No GPS Lock");
+    _success.updatePassFail(_survey_success, _survey_failure);
 }
 
 std::vector<point> ModeSweep::generatePoints() {
-- 
cgit v1.2.3