diff --git a/plotter.cpp b/plotter.cpp index a5caebfa8..ee7e24ecd 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -373,13 +373,6 @@ int CPlotter::getPlotGain() //getPlotGain() void CPlotter::SetCenterFreq(int f) //setCenterFreq() { - /* -// f is the integer kHz portion of cfreq, from Linrad packets - if(f<0) f=m_nkhz; - int ns = (f+m_FreqOffset-0.5*m_fSpan)/5.0 + 0.5; - double fs = 5*ns; - m_CenterFreq = fs + 0.5*m_fSpan; - */ } qint64 CPlotter::centerFreq() //centerFreq() @@ -399,13 +392,6 @@ qint64 CPlotter::startFreq() //startFreq() return m_StartFreq; } -void CPlotter::SetFreqOffset(quint64 f) //SetFreqOffset() -{ - m_FreqOffset=f; - DrawOverlay(); -} - -qint64 CPlotter::freqOffset() {return m_FreqOffset;} //freqOffset() int CPlotter::plotWidth(){return m_WaterfallPixmap.width();} void CPlotter::UpdateOverlay() {DrawOverlay();} void CPlotter::setDataFromDisk(bool b) {m_dataFromDisk=b;} diff --git a/plotter.h b/plotter.h index 609975507..70e105b8f 100644 --- a/plotter.h +++ b/plotter.h @@ -47,8 +47,6 @@ public: qint64 centerFreq(); void SetStartFreq(quint64 f); qint64 startFreq(); - void SetFreqOffset(quint64 f); - qint64 freqOffset(); int plotWidth(); void setNSpan(int n); void UpdateOverlay(); @@ -103,7 +101,6 @@ private: double m_fGreen; qint64 m_StartFreq; qint64 m_ZoomStartFreq; - qint64 m_FreqOffset; qint32 m_dBStepSize; qint32 m_FreqUnits; qint32 m_hdivs; diff --git a/widegraph.cpp b/widegraph.cpp index 018bab7c4..6296fdc7c 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -36,7 +36,6 @@ WideGraph::WideGraph(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_dForceCenterFreq=settings.value("ForceCenterFreqMHz",473.000).toDouble(); // ui->cbFcenter->setChecked(m_bForceCenterFreq); ui->fCenterLineEdit->setText(QString::number(m_dForceCenterFreq)); @@ -63,7 +62,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("ForceCenterFreqMHz",m_dForceCenterFreq); settings.endGroup(); } @@ -105,7 +103,6 @@ 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; // 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; @@ -150,11 +147,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); diff --git a/widegraph.h b/widegraph.h index 741e9845d..733047d31 100644 --- a/widegraph.h +++ b/widegraph.h @@ -50,7 +50,6 @@ 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(); diff --git a/widegraph.ui b/widegraph.ui index 7b29d5dc0..f04c0bdc2 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -46,72 +46,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - - 60 - 16777215 - - - - Hz - - - -500 - - - 500 - - - 1 - - - 0 - - - - - - - - 50 - 0 - - - - Freq Offset - - -