From c9692f63a6cb6dd0b07fabe04aa97378158ea5bc Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Fri, 16 Jul 2021 23:23:29 -0700
Subject: [PATCH] Fix error in scale of power meter

---
 meter.cpp  |  5 +++--
 wfmain.cpp | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/meter.cpp b/meter.cpp
index a3106bf..e3aeeb9 100644
--- a/meter.cpp
+++ b/meter.cpp
@@ -154,9 +154,10 @@ void meter::drawScalePo(QPainter *qp)
     // Now the lines:
     qp->setPen(lowLineColor);
 
-    qp->drawLine(mXstart,scaleLineYstart,213,scaleLineYstart);
+    // Line: X1, Y1 -->to--> X2, Y2
+    qp->drawLine(mXstart,scaleLineYstart,213+mXstart,scaleLineYstart);
     qp->setPen(Qt::red);
-    qp->drawLine(213,scaleLineYstart,255,scaleLineYstart);
+    qp->drawLine(213+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
 
     (void)qp;
 }
diff --git a/wfmain.cpp b/wfmain.cpp
index c6c03a6..656e5be 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -2360,6 +2360,12 @@ void wfmain::doCmd(commandtype cmddata)
         {
             bool pttrequest = (*std::static_pointer_cast<bool>(data));
             emit setPTT(pttrequest);
+            if(pttrequest)
+            {
+                ui->meterSPoWidget->setMeterType(meterPower);
+            } else {
+                ui->meterSPoWidget->setMeterType(meterS);
+            }
             break;
         }
         case cmdSetATU:
@@ -5108,7 +5114,19 @@ void wfmain::on_debugBtn_clicked()
     qInfo(logSystem()) << "Debug button pressed.";
     //trxadj->show();
     //setRadioTimeDatePrep();
-    wf->setInteraction(QCP::iRangeZoom, true);
-    wf->setInteraction(QCP::iRangeDrag, true);
+    //wf->setInteraction(QCP::iRangeZoom, true);
+    //wf->setInteraction(QCP::iRangeDrag, true);
+    bool ok = false;
+    unsigned char level = (unsigned char) QInputDialog::getInt(this, "wfview simulated radio level", "Raw level (0-255)", 128, 1, 255, 1, &ok );
+    if(ok)
+    {
+        int peak = level*1.5;
+        if(peak > 255)
+            peak = 255;
+        int average = peak / 2;
 
+        ui->meterSPoWidget->setMeterType(meterPower);
+        ui->meterSPoWidget->setLevels(level, peak, average);
+        ui->meterSPoWidget->update();
+    }
 }