diff --git a/q65w/widegraph.cpp b/q65w/widegraph.cpp
index 17897aa7f..f8a9d97c0 100644
--- a/q65w/widegraph.cpp
+++ b/q65w/widegraph.cpp
@@ -42,14 +42,6 @@ WideGraph::WideGraph (QString const& settings_filename, QWidget * parent)
ui->widePlot->setBinsPerPixel(nbpp);
m_waterfallAvg = settings.value("WaterfallAvg",10).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
- ui->freqOffsetSpinBox->setValue(settings.value("FreqOffset",0).toInt());
- m_bForceCenterFreq=settings.value("ForceCenterFreqBool",false).toBool();
- m_dForceCenterFreq=settings.value("ForceCenterFreqMHz",144.125).toDouble();
- ui->cbFcenter->setChecked(m_bForceCenterFreq);
- ui->cbLockTxRx->setChecked(m_bLockTxRx);
- ui->fCenterLineEdit->setText(QString::number(m_dForceCenterFreq));
- m_bLockTxRx=settings.value("LockTxRx",false).toBool();
- ui->cbLockTxRx->setChecked(m_bLockTxRx);
}
WideGraph::~WideGraph()
@@ -80,10 +72,6 @@ void WideGraph::saveSettings()
settings.setValue("PlotWidth",ui->widePlot->plotWidth());
settings.setValue("FreqSpan",ui->freqSpanSpinBox->value());
settings.setValue("WaterfallAvg",ui->waterfallAvgSpinBox->value());
- settings.setValue("FreqOffset",ui->widePlot->freqOffset());
- settings.setValue("ForceCenterFreqBool",m_bForceCenterFreq);
- settings.setValue("ForceCenterFreqMHz",m_dForceCenterFreq);
- settings.setValue("LockTxRx",m_bLockTxRx);
}
void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
@@ -122,7 +110,7 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
n=0;
int w=ui->widePlot->plotWidth();
- qint64 sf = nkhz + ui->widePlot->freqOffset() - 0.5*w*nbpp*df/1000.0;
+ qint64 sf = nkhz - 0.5*w*nbpp*df/1000.0;
if(sf != ui->widePlot->startFreq()) ui->widePlot->SetStartFreq(sf);
int i0=16384.0+(ui->widePlot->startFreq()-nkhz+1.27046+0.001*m_fCal) *
1000.0/df + 0.5;
@@ -154,22 +142,6 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
}
}
-void WideGraph::on_freqOffsetSpinBox_valueChanged(int f)
-{
- ui->widePlot->SetFreqOffset(f);
-}
-
-void WideGraph::on_freqSpanSpinBox_valueChanged(int n)
-{
- ui->widePlot->setNSpan(n);
- int w = ui->widePlot->plotWidth();
- int nbpp = n * 32768.0/(w*96.0) + 0.5;
- if(nbpp < 1) nbpp=1;
- if(w > 0) {
- ui->widePlot->setBinsPerPixel(nbpp);
- }
-}
-
void WideGraph::on_waterfallAvgSpinBox_valueChanged(int n)
{
m_waterfallAvg = n;
@@ -282,23 +254,6 @@ void WideGraph::setMode65(int n)
ui->widePlot->setMode65(n);
}
-void WideGraph::on_cbFcenter_stateChanged(int n)
-{
- m_bForceCenterFreq = (n!=0);
- if(m_bForceCenterFreq) {
- ui->fCenterLineEdit->setEnabled(true);
- ui->pbSetRxHardware->setEnabled(true);
- } else {
- ui->fCenterLineEdit->setDisabled(true);
- ui->pbSetRxHardware->setDisabled(true);
- }
-}
-
-void WideGraph::on_fCenterLineEdit_editingFinished()
-{
- m_dForceCenterFreq=ui->fCenterLineEdit->text().toDouble();
-}
-
void WideGraph::on_cbSpec2d_toggled(bool b)
{
ui->widePlot->set2Dspec(b);
@@ -314,20 +269,9 @@ void WideGraph::setPeriod(int n)
m_TRperiod=n;
}
-void WideGraph::on_cbLockTxRx_stateChanged(int n)
-{
- m_bLockTxRx = (n!=0);
- ui->widePlot->setLockTxRx(m_bLockTxRx);
-}
-
void WideGraph::updateFreqLabel()
{
auto rxFreq = QString {"%1"}.arg (ui->widePlot->rxFreq (), 10, 'f', 6);
rxFreq.insert (rxFreq.size () - 3, '.');
- ui->labFreq->setText (QString {"Rx: %1"}.arg (rxFreq));
-}
-
-void WideGraph::enableSetRxHardware(bool b)
-{
- ui->pbSetRxHardware->setEnabled(b);
+ ui->labFreq->setText (QString {"Center freq: %1"}.arg (rxFreq));
}
diff --git a/q65w/widegraph.h b/q65w/widegraph.h
index 29739beaa..f826fbeab 100644
--- a/q65w/widegraph.h
+++ b/q65w/widegraph.h
@@ -51,15 +51,10 @@ protected:
private slots:
void on_waterfallAvgSpinBox_valueChanged(int arg1);
- void on_freqSpanSpinBox_valueChanged(int arg1);
- void on_freqOffsetSpinBox_valueChanged(int arg1);
void on_zeroSpinBox_valueChanged(int arg1);
void on_gainSpinBox_valueChanged(int arg1);
void on_autoZeroPushButton_clicked();
- void on_cbFcenter_stateChanged(int arg1);
- void on_fCenterLineEdit_editingFinished();
void on_cbSpec2d_toggled(bool checked);
- void on_cbLockTxRx_stateChanged(int arg1);
private:
Ui::WideGraph * ui;
diff --git a/q65w/widegraph.ui b/q65w/widegraph.ui
index 675b92f92..4e7fc9d54 100644
--- a/q65w/widegraph.ui
+++ b/q65w/widegraph.ui
@@ -40,33 +40,6 @@
1
-
-
-
- 940
- 250
- 211
- 21
-
-
-
-
- 12
-
-
-
- QLabel {
- background-color: rgba(0, 0, 0, 0);
- color: yellow;
-}
-
-
- Rx: 1296.065.200
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
@@ -74,7 +47,7 @@
-
-
-
+
Qt::Horizontal
@@ -86,46 +59,6 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- 60
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
- kHz
-
-
- Offset
-
-
- -24
-
-
- 24
-
-
- 1
-
-
- 0
-
-
-
-
@@ -166,6 +99,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
-
@@ -197,6 +146,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
-
@@ -222,6 +187,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
-
@@ -247,6 +228,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
-
@@ -254,6 +251,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
-
@@ -261,6 +274,29 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+ <html><head/><body><p>Center freq: 1296.065.000</p></body></html>
+
+
+
-
@@ -274,52 +310,6 @@
- -
-
-
- Lock Tx=Rx Freq
-
-
-
- -
-
-
- Force Center Freq (MHz)
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 65
- 16777215
-
-
-
- 1296.065
-
-
-
- -
-
-
- false
-
-
- Set Rx Freq
-
-
-