Refined split interface controls. Offset is KHz, automatic tracking mode

added.

repeatersetup.cpp

@@ -296,6 +296,37 @@ void repeaterSetup::handleDTCS(quint16 dcode, bool tinv, bool rinv)
     ui->rptDTCSInvertRx->setChecked(rinv);
 }
 
+void repeaterSetup::handleUpdateCurrentMainFrequency(freqt mainfreq)
+{
+
+    this->currentMainFrequency = mainfreq;
+    if(ui->autoTrackLiveBtn->isChecked() && !ui->splitOffsetEdit->text.isEmpty())
+    {
+        if(currentMainFrequency.Hz != mainfreq.Hz)
+        {
+            if(usedPlusSplit)
+            {
+                on_splitPlusButton_clicked();
+            } else {
+                on_splitMinusBtn_clicked();
+            }
+        }
+    }
+}
+
+void repeaterSetup::handleUpdateCurrentMainMode(mode_info m)
+{
+    // Used to set the secondary VFO to the same mode
+    // (generally FM)
+    this->currentMode = m;
+}
+
+void repeaterSetup::showEvent(QShowEvent *event)
+{
+    emit getSplitModeEnabled();
+    (void)event;
+}
+
 void repeaterSetup::on_rptSimplexBtn_clicked()
 {
     // Simplex
@@ -396,16 +427,6 @@ void repeaterSetup::on_debugBtn_clicked()
     emit getRptAccessMode();
 }
 
-quint64 repeaterSetup::calcTransmitFreq(quint64 fOffset, bool isPlus)
-{
-    quint64 txfcalc = 0;
-    if(isPlus)
-        txfcalc = currentMainFrequency + fOffset;
-    else
-        txfcalc = currentMainFrequency - fOffset;
-    return txfcalc;
-}
-
 void repeaterSetup::on_splitOffsetSetBtn_clicked()
 {
     freqt txFreq;
@@ -417,26 +438,116 @@ void repeaterSetup::on_splitOffsetSetBtn_clicked()
 void repeaterSetup::on_splitEnableChk_clicked(bool enabled)
 {
     emit setSplitModeEnabled(enabled);
+    ui->autoTrackLiveBtn->setChecked(!enabled);
+}
+
+quint64 repeaterSetup::getFreqHzFromKHzString(QString khz)
+{
+    // This function takes a string containing a number in KHz,
+    // and creates an accurate quint64 in Hz.
+    quint64 fhz = 0;
+    bool hasDecimalPt = false;
+    bool ok = true;
+    if(khz.isEmpty())
+    {
+        qWarning() << "KHz offset was empty!";
+        return fhz;
+    }
+    if(khz.contains("."))
+    {
+        hasDecimalPt = true;
+        // "600.245" becomes "600"
+        khz.chop(khz.indexOf("."));
+    }
+    fhz = 1E3 * khz.toUInt(&ok);
+    if(!ok)
+    {
+        qWarning() << "Could not understand user KHz text";
+    }
+    return fhz;
+}
+
+quint64 repeaterSetup::getFreqHzFromMHzString(QString MHz)
+{
+    // This function takes a string containing a number in KHz,
+    // and creates an accurate quint64 in Hz.
+    quint64 fhz = 0;
+    bool hasDecimalPt = false;
+    bool ok = true;
+    if(MHz.isEmpty())
+    {
+        qWarning() << "MHz string was empty!";
+        return fhz;
+    }
+    if(MHz.contains("."))
+    {
+        hasDecimalPt = true;
+        int decimalPtIndex = MHz.indexOf(".");
+        // "29.623"
+        // indexOf(".") = 2
+        // length = 6
+        // We want the right 4xx 3 characters.
+        QString KHz = MHz.right(MHz.length() - decimalPtIndex - 1);
+        MHz.chop(decimalPtIndex);
+
+        fhz = MHz.toUInt(&ok) * 1E6; if(!ok) goto handleError;
+        fhz += KHz.toUInt(&ok) * 1E3; if(!ok) goto handleError;
+
+    } else {
+        // Frequency was already MHz (unlikely but what can we do?)
+        fhz = MHz.toUInt(&ok) * 1E6; if(!ok) goto handleError;
+    }
+    return fhz;
+
+handleError:
+    qWarning() << "Could not understand user MHz text " << MHz;
+    return 0;
 }
 
 void repeaterSetup::on_splitPlusButton_clicked()
 {
-    bool ok = true;
-    quint64 fOffset = ui->splitOffsetEdit->text().toDouble(&ok) * 1E6;
-    quint64 f;
-    if(ok)
+    quint64 hzOffset = getFreqHzFromKHzString(ui->splitOffsetEdit->text());
+    quint64 txfreqhz;
+    freqt f;
+    QString txString;
+    if(hzOffset)
     {
-        f = calcTransmitFreq(fOffset, true);
-        ui->splitTransmitFreqEdit->setText(QString("%1").arg(QString::number(f/(double)1E6, 'f', 2)));
+        txfreqhz = currentMainFrequency.Hz + hzOffset;
+        f.Hz = txfreqhz;
+        txString = QString::number(f.Hz / double(1E6), 'f', 3);
+        ui->splitTransmitFreqEdit->setText(txString);
+        usedPlusSplit = true;
+        emit setTransmitFrequency(f);
+        emit setTransmitMode(currentMode);
     }
 }
 
+
 void repeaterSetup::on_splitMinusBtn_clicked()
 {
-
+    quint64 hzOffset = getFreqHzFromKHzString(ui->splitOffsetEdit->text());
+    quint64 txfreqhz;
+    freqt f;
+    QString txString;
+    if(hzOffset)
+    {
+        txfreqhz = currentMainFrequency.Hz - hzOffset;
+        f.Hz = txfreqhz;
+        txString = QString::number(f.Hz / double(1E6), 'f', 3);
+        usedPlusSplit = false;
+        emit setTransmitFrequency(f);
+        emit setTransmitMode(currentMode);
+    }
 }
 
 void repeaterSetup::on_splitTxFreqSetBtn_clicked()
 {
-
+    quint64 fHz = getFreqHzFromMHzString(ui->splitTransmitFreqEdit->text());
+    freqt f;
+    if(fHz)
+    {
+        f.Hz = fHz;
+        emit setTransmitFrequency(f);
+        emit setTransmitMode(currentMode);
+    }
 }

repeatersetup.h

@@ -31,10 +31,12 @@ signals:
     void getDTCS();
     void setRptAccessMode(rptAccessTxRx tmode);
     void getRptAccessMode();
+    // Split:
     void getSplitModeEnabled();
     void getTransmitFrequency();
     void setSplitModeEnabled(bool splitEnabled);
     void setTransmitFrequency(freqt transmitFreq);
+    void setTransmitMode(mode_info m);
 
 public slots:
     void receiveDuplexMode(duplexMode dm);
@@ -45,8 +47,10 @@ public slots:
     void handleSplitMode(bool splitEnabled);
     void handleSplitFrequency(freqt transmitFreq);
     void handleUpdateCurrentMainFrequency(freqt mainfreq);
+    void handleUpdateCurrentMainMode(mode_info m);
 
 private slots:
+    void showEvent(QShowEvent *event);
     void on_rptSimplexBtn_clicked();
     void on_rptDupPlusBtn_clicked();
     void on_rptDupMinusBtn_clicked();
@@ -71,10 +75,14 @@ private:
     freqt currentMainFrequency;
     void populateTones();
     void populateDTCS();
-    quint64 calcTransmitFreq(quint64 fOffset, bool isPlus);
+    quint64 getFreqHzFromKHzString(QString khz);
+    quint64 getFreqHzFromMHzString(QString MHz);
+
     rigCapabilities rig;
     bool haveRig = false;
     duplexMode currentdm;
+    mode_info currentMode;
+    bool usedPlusSplit = false;
 };
 
 #endif // REPEATERSETUP_H

repeatersetup.ui

@@ -126,18 +126,29 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
          <item>
-          <widget class="QCheckBox" name="splitEnableChk">
-           <property name="text">
-            <string>Split Enable</string>
-           </property>
-          </widget>
+          <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <item>
+            <widget class="QCheckBox" name="splitEnableChk">
+             <property name="text">
+              <string>Split Enable</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="autoTrackLiveBtn">
+             <property name="text">
+              <string>Auto Track Live</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_6">
            <item>
             <widget class="QLabel" name="label_3">
              <property name="text">
-              <string>Offset (MHz):</string>
+              <string>Offset (KHz):</string>
              </property>
             </widget>
            </item>