From ac0dda3d916ea81dc159b1d138f9aa7100e706a5 Mon Sep 17 00:00:00 2001
From: EspoTek <admin@espotek.com>
Date: Sun, 9 Apr 2017 15:38:39 +1000
Subject: [PATCH] Fixed Multimeter not displaying

---
 Desktop_Interface/bin/Labrador.exe            | Bin 715776 -> 715776 bytes
 Desktop_Interface/isodriver.cpp               |   1 +
 Desktop_Interface/isodriver.h                 |   2 +-
 Desktop_Interface/release/buffercontrol.obj   | Bin 77411 -> 77411 bytes
 Desktop_Interface/release/isobuffer.obj       | Bin 75556 -> 75556 bytes
 Desktop_Interface/release/isodriver.obj       | Bin 156604 -> 156604 bytes
 Desktop_Interface/release/main.obj            | Bin 43965 -> 43965 bytes
 Desktop_Interface/release/mainwindow.obj      | Bin 725286 -> 725286 bytes
 Desktop_Interface/release/moc_isodriver.obj   | Bin 71860 -> 71860 bytes
 Desktop_Interface/release/moc_mainwindow.obj  | Bin 57323 -> 57323 bytes
 .../ui_elements/buffercontrol.cpp             |   1 +
 11 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Desktop_Interface/bin/Labrador.exe b/Desktop_Interface/bin/Labrador.exe
index 65a1a8ca8149fd0867a4c9971e220cc31ee71d84..304b92892704af3291d9e9e7f5ae1ee3b63f22bb 100644
GIT binary patch
delta 65
zcmZp;q1|vpdxHQY)8Z4&LX7P~j3CSe#LU};7+KuZfc!{x79eH?Vm2UV2VxE&=G-2s
I&b9mq09r8-*Z=?k

delta 65
zcmZp;q1|vpdxHQYlf|)SA;xwgMi6EKV&?5aj4W<yj129O>MTIa3dC$c%nrmHK+L&4
JQk`r05dcD|5o!Pc

diff --git a/Desktop_Interface/isodriver.cpp b/Desktop_Interface/isodriver.cpp
index a0234e23..75e68bfb 100644
--- a/Desktop_Interface/isodriver.cpp
+++ b/Desktop_Interface/isodriver.cpp
@@ -845,6 +845,7 @@ void isoDriver::setSeriesResistance(double resistance){
 }
 
 void isoDriver::multimeterStats(){
+    //qDebug() << "Entering isoDriver::multimeterStats()";
     if (!multimeterShow) return;
 
     QTimer::singleShot(MULTIMETER_PERIOD, this, SLOT(enableMM()));
diff --git a/Desktop_Interface/isodriver.h b/Desktop_Interface/isodriver.h
index 9485a3d7..db533e64 100644
--- a/Desktop_Interface/isodriver.h
+++ b/Desktop_Interface/isodriver.h
@@ -47,7 +47,7 @@ private:
     bool placingHoriAxes = false, placingVertAxes = false, horiCursorEnabled = false, vertCursorEnabled = false;
     bool triggerSeeking = true;
     bool triggerEnabled = false;
-    bool multimeterShow = false;
+    bool multimeterShow = true;
     bool autoMultimeterV = true;
     bool autoMultimeterI = true;
     bool forceMillivolts = false;
diff --git a/Desktop_Interface/release/buffercontrol.obj b/Desktop_Interface/release/buffercontrol.obj
index 18e25e85c31cf8cbd23e0a2b270248b13ccae8cb..9b5b23d2ae3526a1465b9c0d0180372983c9713b 100644
GIT binary patch
delta 19
acmaEShvo4d7S@zDf5whR)~&3Jae4q&H3u62

delta 19
acmaEShvo4d7S@zDe@2T&)~&3Jae4q#wFb)o

diff --git a/Desktop_Interface/release/isobuffer.obj b/Desktop_Interface/release/isobuffer.obj
index 7f03fd12694805e46acda454fe8675daad2ba889..d996a0a6f1f38f09e3c38b21bd8bf80b5f9e7f3b 100644
GIT binary patch
delta 20
ccmZ2-j%CR?7Pgc&7sdrA8rin8G0Ld}09LLC5&!@I

delta 20
ccmZ2-j%CR?7Pgc&7sihp8rin8G0Ld}09eNdO8@`>

diff --git a/Desktop_Interface/release/isodriver.obj b/Desktop_Interface/release/isodriver.obj
index 28853d70cd3b4a67a04e0eb776f37f431eabfb70..c1bdac3b84c083eba8df109acc642f7d9fb9e080 100644
GIT binary patch
delta 39
xcmV+?0NDS$#|ga02?k__UIL)Vu?9G00Rgi=WrWNGuhY^BhsQAix5qI8^)X505QhK&

delta 39
vcmdmUoO91{PPUY`I41Uk8`&&U85uU)r?#A7;b%@=*M8iPar<#YrmuzoCiV`k

diff --git a/Desktop_Interface/release/main.obj b/Desktop_Interface/release/main.obj
index d42d75999a36b6cd3d66f36416338665bad29baf..1858c64802e9edc5c3ca44299102ef2a1773b2db 100644
GIT binary patch
delta 17
ZcmdmcooVlNCbpEeGYkt(Y-HQM8URaN2x<TT

delta 17
ZcmdmcooVlNCbpEeGYp?MY-HQM8URez2&Di3

diff --git a/Desktop_Interface/release/mainwindow.obj b/Desktop_Interface/release/mainwindow.obj
index 4a34188ef922ff2785e5a510b1857ffcd06b605b..c7753a7e869ef4ff0e3895eaaa7812f5227b9bd2 100644
GIT binary patch
delta 50
zcmZ3sNN3q19k!IVYaEMCG_tj_F}AWXwX!j{vaz(Xv9_`SMc7-}I9k~_TiLj_vT-X2
F0sx#p4MYF{

delta 50
zcmZ3sNN3q19k!IVYaCxUG_tj_F}AWXwX!j{vaz(Xv9_`SMc7-}I9k~_TiLj_vT-X2
F0sy5{4SxUt

diff --git a/Desktop_Interface/release/moc_isodriver.obj b/Desktop_Interface/release/moc_isodriver.obj
index d97d52b5cc0d277d0ce2f3a8f41312195b8c1ddb..f4352ef02ed3c144f79b94382141380f1e827dbb 100644
GIT binary patch
delta 20
ccmdn8k!8z97Pgc&X~sn-8rin8F|LyU090oOQUCw|

delta 20
ccmdn8k!8z97Pgc&X~wS`8rin8F|LyU09KL*jQ{`u

diff --git a/Desktop_Interface/release/moc_mainwindow.obj b/Desktop_Interface/release/moc_mainwindow.obj
index cf96d8e92de4812d18654fb1f66c3650f6fc4b85..b47cbe921b8f0c527a918d26d3ad653a19cc7e7e 100644
GIT binary patch
delta 17
ZcmaF8pZWEEX10{J3k-`+Y-D?S9{^7c2><{9

delta 17
ZcmaF8pZWEEX10{J3k+X3Y-D?S9{^B?2|EA)

diff --git a/Desktop_Interface/ui_elements/buffercontrol.cpp b/Desktop_Interface/ui_elements/buffercontrol.cpp
index e37cdb33..188b4088 100644
--- a/Desktop_Interface/ui_elements/buffercontrol.cpp
+++ b/Desktop_Interface/ui_elements/buffercontrol.cpp
@@ -37,6 +37,7 @@ void bufferControl::scopeIn_CH1(bool state){  //What about DSR!?
         scopeUncheck(0);
     }
 
+    //Turn off the DSR when CH1 is disabled.
     if(!state){
         scopeDsrUncheck(0);
     }