diff --git a/mainwindow.cpp b/mainwindow.cpp index 8b3a1641d..f2d763e7e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -198,7 +198,6 @@ MainWindow::MainWindow(QWidget *parent) : m_diskData=false; m_tol=500; g_pWideGraph->setTol(m_tol); - g_pWideGraph->setFsample(48000); // Create "m_worked", a dictionary of all calls in wsjt.log QFile f("wsjt.log"); @@ -758,7 +757,7 @@ void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls connect(g_pWideGraph, SIGNAL(f11f12(int)),this, SLOT(bumpDF(int))); } -// g_pWideGraph->show(); + g_pWideGraph->show(); } void MainWindow::on_actionOpen_triggered() //Open File diff --git a/widegraph.cpp b/widegraph.cpp index 30e53d278..c8567bb6c 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -36,11 +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_bForceCenterFreq=settings.value("ForceCenterFreqBool",false).toBool(); - m_dForceCenterFreq=settings.value("ForceCenterFreqMHz",144.125).toDouble(); - ui->cbFcenter->setChecked(m_bForceCenterFreq); - ui->fCenterLineEdit->setText(QString::number(m_dForceCenterFreq)); settings.endGroup(); } @@ -250,65 +245,6 @@ void WideGraph::setPalette(QString palette) { ui->widePlot->setPalette(palette); } -void WideGraph::setFsample(int n) -{ - m_fSample=n; - ui->widePlot->setFsample(n); -} - -void WideGraph::setMode65(int n) -{ - m_mode65=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_pbSetRxHardware_clicked() -{/* -#ifdef WIN32 - int iret=set570(m_mult570*(1.0+0.000001*m_cal570)*m_dForceCenterFreq); - if(iret != 0) { - QMessageBox mb; - if(iret==-1) mb.setText("Failed to open Si570."); - if(iret==-2) mb.setText("Frequency out of permitted range."); - mb.exec(); - } -#endif -*/ -} - -void WideGraph::initIQplus() -{ -/* -#ifdef WIN32 -// int iret=set570(288.0); - if(iret != 0) { - QMessageBox mb; - if(iret==-1) mb.setText("Failed to open Si570."); - if(iret==-2) mb.setText("Frequency out of permitted range."); - mb.exec(); - } else { - on_pbSetRxHardware_clicked(); - } -#endif -*/ -} void WideGraph::on_cbSpec2d_toggled(bool b) { diff --git a/widegraph.h b/widegraph.h index f78d7b455..d155dbdc1 100644 --- a/widegraph.h +++ b/widegraph.h @@ -32,7 +32,6 @@ public: void setTol(int n); void setFcal(int n); void setPalette(QString palette); - void setFsample(int n); void setMode65(int n); double fGreen(); @@ -44,7 +43,6 @@ signals: public slots: void wideFreezeDecode(int n); - void initIQplus(); protected: virtual void keyPressEvent( QKeyEvent *e ); @@ -56,9 +54,6 @@ private slots: 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_pbSetRxHardware_clicked(); void on_cbSpec2d_toggled(bool checked); private: diff --git a/widegraph.ui b/widegraph.ui index a7b46dda8..eb5a1dd8a 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -6,7 +6,7 @@ 0 0 - 1178 + 780 326 @@ -62,72 +62,6 @@ - - - - - 0 - 0 - - - - - 60 - 0 - - - - - 60 - 16777215 - - - - kHz - - - -24 - - - 24 - - - 1 - - - 0 - - - - - - - - 50 - 0 - - - - Freq Offset - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - @@ -363,45 +297,6 @@ - - - - Force Center Freq (MHz) - - - - - - - false - - - - 0 - 0 - - - - - 65 - 16777215 - - - - 1296.065 - - - - - - - false - - - Set Rx Freq - - -