diff --git a/devsetup.ui b/devsetup.ui index bd400cc0d..e773fee7d 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -6,8 +6,8 @@ 0 0 - 503 - 463 + 548 + 521 diff --git a/mainwindow.cpp b/mainwindow.cpp index 4600db650..9953984a9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -165,9 +165,9 @@ MainWindow::MainWindow(QWidget *parent) : m_insertBlank=false; m_clearCallGrid=false; m_bMiles=false; - m_fMin=1000; + //m_fMin=1000; m_decodedText2=false; - ui->fMinSpinBox->setValue(m_fMin); + //ui->fMinSpinBox->setValue(m_fMin); decodeBusy(false); @@ -232,7 +232,7 @@ MainWindow::MainWindow(QWidget *parent) : if(m_mode=="JT9-5") on_actionJT9_5_triggered(); if(m_mode=="JT9-10") on_actionJT9_10_triggered(); if(m_mode=="JT9-30") on_actionJT9_30_triggered(); - g_pWideGraph->setRxRange(m_fMin,m_fMax); + //g_pWideGraph->setRxRange(m_fMin,m_fMax); future1 = new QFuture; watcher1 = new QFutureWatcher; connect(watcher1, SIGNAL(finished()),this,SLOT(diskDat())); @@ -582,6 +582,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog dlg.m_stopBitsIndex=m_stopBitsIndex; dlg.m_handshake=m_handshake; dlg.m_handshakeIndex=m_handshakeIndex; + dlg.initDlg(); if(dlg.exec() == QDialog::Accepted) { m_myCall=dlg.m_myCall; @@ -2027,8 +2028,9 @@ void MainWindow::on_actionJT9_1_triggered() lab4->setStyleSheet("QLabel{background-color: #ff6ec7}"); lab4->setText(m_mode); ui->actionJT9_1->setChecked(true); - m_fMax=2000; - ui->fMaxSpinBox->setValue(m_fMax); + //m_fMax=2000; + //ui->fMaxSpinBox->setValue(m_fMax); + g_pWideGraph->setfMax(2000); } void MainWindow::on_actionJT9_2_triggered() @@ -2044,8 +2046,9 @@ void MainWindow::on_actionJT9_2_triggered() lab4->setStyleSheet("QLabel{background-color: #ffff00}"); lab4->setText(m_mode); ui->actionJT9_2->setChecked(true); - m_fMax=2000; - ui->fMaxSpinBox->setValue(m_fMax); + //m_fMax=2000; + //ui->fMaxSpinBox->setValue(m_fMax); + g_pWideGraph->setfMax(2000); } void MainWindow::on_actionJT9_5_triggered() @@ -2061,8 +2064,9 @@ void MainWindow::on_actionJT9_5_triggered() lab4->setStyleSheet("QLabel{background-color: #ffa500}"); lab4->setText(m_mode); ui->actionJT9_5->setChecked(true); - m_fMax=1300; - ui->fMaxSpinBox->setValue(m_fMax); + //m_fMax=1300; + //ui->fMaxSpinBox->setValue(m_fMax); + g_pWideGraph->setfMax(1300); } void MainWindow::on_actionJT9_10_triggered() @@ -2078,8 +2082,9 @@ void MainWindow::on_actionJT9_10_triggered() lab4->setStyleSheet("QLabel{background-color: #7fff00}"); lab4->setText(m_mode); ui->actionJT9_10->setChecked(true); - m_fMax=1150; - ui->fMaxSpinBox->setValue(m_fMax); + //m_fMax=1150; + //ui->fMaxSpinBox->setValue(m_fMax); + g_pWideGraph->setfMax(1150); } void MainWindow::on_actionJT9_30_triggered() @@ -2095,8 +2100,9 @@ void MainWindow::on_actionJT9_30_triggered() lab4->setStyleSheet("QLabel{background-color: #97ffff}"); lab4->setText(m_mode); ui->actionJT9_30->setChecked(true); - m_fMax=1050; - ui->fMaxSpinBox->setValue(m_fMax); + //m_fMax=1050; + //ui->fMaxSpinBox->setValue(m_fMax); + g_pWideGraph->setfMax(1050); } void MainWindow::on_NBcheckBox_toggled(bool checked) @@ -2276,6 +2282,7 @@ void MainWindow::on_actionBlank_line_between_decoding_periods_triggered(bool che m_insertBlank=checked; } +/* void MainWindow::on_fMinSpinBox_valueChanged(int n) { m_fMin=n; @@ -2287,6 +2294,7 @@ void MainWindow::on_fMaxSpinBox_valueChanged(int n) m_fMax=n; g_pWideGraph->setRxRange(m_fMin,m_fMax); } +*/ void MainWindow::on_actionClear_DX_Call_and_Grid_after_logging_triggered(bool checked) { diff --git a/mainwindow.h b/mainwindow.h index 933e32871..c15c17f60 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -132,8 +132,8 @@ private slots: void on_bandComboBox_currentIndexChanged(int index); void on_actionPrompt_to_log_QSO_triggered(bool checked); void on_actionBlank_line_between_decoding_periods_triggered(bool checked); - void on_fMinSpinBox_valueChanged(int n); - void on_fMaxSpinBox_valueChanged(int n); + //void on_fMinSpinBox_valueChanged(int n); + //void on_fMaxSpinBox_valueChanged(int n); void on_actionClear_DX_Call_and_Grid_after_logging_triggered(bool checked); @@ -149,8 +149,8 @@ private: qint32 m_idInt; qint32 m_waterfallAvg; qint32 m_pttMethodIndex; - qint32 m_fMin; - qint32 m_fMax; + //qint32 m_fMin; + //qint32 m_fMax; qint32 m_QSOfreq0; qint32 m_ntx; qint32 m_pttPort; diff --git a/mainwindow.ui b/mainwindow.ui index 69de02fa0..1ba832f8c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -617,311 +617,6 @@ p, li { white-space: pre-wrap; } - - - - - 107 - 0 - - - - - 100 - 16777215 - - - - - - - - - 252 - 252 - 252 - - - - - - - 172 - 191 - 166 - - - - - - - - - 252 - 252 - 252 - - - - - - - 172 - 191 - 166 - - - - - - - - - 172 - 191 - 166 - - - - - - - 172 - 191 - 166 - - - - - - - - true - - - QFrame::StyledPanel - - - QFrame::Plain - - - 1 - - - - - 2 - 4 - 122 - 59 - - - - - - - - 0 - 0 - - - - - 30 - 22 - - - - - 100 - 18 - - - - Decode Range - Min Max - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 5 - - - - - - - - - - 0 - 0 - - - - 1000 - - - 2000 - - - 50 - - - - - - - - 0 - 0 - - - - 1000 - - - 2000 - - - 50 - - - 2000 - - - - - - - - - - - - - - 107 - 16777215 - - - - - - - - - 252 - 252 - 252 - - - - - - - 172 - 191 - 166 - - - - - - - - - 252 - 252 - 252 - - - - - - - 172 - 191 - 166 - - - - - - - - - 172 - 191 - 166 - - - - - - - 172 - 191 - 166 - - - - - - - - true - - - QFrame::StyledPanel - - - QFrame::Plain - - - - 0 - - - 0 - - - - - 6 - - - - - - 100 - 16777215 - - - - NB - - - - - - - - 100 - 16777215 - - - - Qt::Horizontal - - - - - - - - @@ -1858,6 +1553,130 @@ p, li { white-space: pre-wrap; } + + + + + 107 + 16777215 + + + + + + + + + 252 + 252 + 252 + + + + + + + 172 + 191 + 166 + + + + + + + + + 252 + 252 + 252 + + + + + + + 172 + 191 + 166 + + + + + + + + + 172 + 191 + 166 + + + + + + + 172 + 191 + 166 + + + + + + + + true + + + QFrame::StyledPanel + + + QFrame::Plain + + + + 0 + + + 0 + + + + + 6 + + + + + + 100 + 16777215 + + + + NB + + + + + + + + 100 + 16777215 + + + + Qt::Horizontal + + + + + + + + diff --git a/widegraph.cpp b/widegraph.cpp index ea7d7582f..6d2e27fe6 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -20,6 +20,9 @@ WideGraph::WideGraph(QWidget *parent) : connect(ui->widePlot, SIGNAL(freezeDecode1(int)),this, SLOT(wideFreezeDecode(int))); + m_fMin=1000; + ui->fMinSpinBox->setValue(m_fMin); + //Restore user's settings QString inifile(QApplication::applicationDirPath()); inifile += "/wsjtx.ini"; @@ -209,6 +212,12 @@ void WideGraph::setRxRange(int fMin, int fMax) ui->widePlot->update(); } +void WideGraph::setfMax(int n) +{ + m_fMax = n; + setRxRange(m_fMin,m_fMax); +} + void WideGraph::setFcal(int n) { m_fCal=n; @@ -246,3 +255,16 @@ void WideGraph::on_spec2dComboBox_currentIndexChanged(const QString &arg1) if(arg1=="Cumulative") ui->widePlot->m_bCumulative=true; if(arg1=="JT9 Sync") ui->widePlot->m_bJT9Sync=true; } + +void WideGraph::on_fMinSpinBox_valueChanged(int n) +{ + m_fMin=n; + setRxRange(m_fMin,m_fMax); +} + +void WideGraph::on_fMaxSpinBox_valueChanged(int n) +{ + m_fMax=n; + setRxRange(m_fMin,m_fMax); +} + diff --git a/widegraph.h b/widegraph.h index f2cd4fbf7..b65b48f56 100644 --- a/widegraph.h +++ b/widegraph.h @@ -23,6 +23,7 @@ public: float fSpan(); void saveSettings(); void setRxRange(int fMin, int fMax); + void setfMax(int n); void setFcal(int n); void setPalette(QString palette); void setFsample(int n); @@ -48,6 +49,8 @@ private slots: void on_zeroSpinBox_valueChanged(int arg1); void on_gainSpinBox_valueChanged(int arg1); void on_spec2dComboBox_currentIndexChanged(const QString &arg1); + void on_fMinSpinBox_valueChanged(int n); + void on_fMaxSpinBox_valueChanged(int n); private: qint32 m_waterfallAvg; @@ -56,6 +59,8 @@ private: qint32 m_TRperiod; qint32 m_nsps; qint32 m_ntr0; + qint32 m_fMin; + qint32 m_fMax; Ui::WideGraph *ui; }; diff --git a/widegraph.ui b/widegraph.ui index cebcbb349..f6718f836 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -52,14 +52,14 @@ + + 0 + Qt::Horizontal - - QSizePolicy::Preferred - 20 @@ -68,6 +68,25 @@ + + + + + 16777215 + 25 + + + + true + + + FFT B/P + + + 2 + + + @@ -105,29 +124,41 @@ - - - - FFT Bins / Pixel - - - Qt::Horizontal - QSizePolicy::Preferred + QSizePolicy::Minimum - 20 + 10 20 + + + + + 16777215 + 25 + + + + true + + + N Avg + + + 2 + + + @@ -156,29 +187,41 @@ - - - - N Avg - - - Qt::Horizontal - QSizePolicy::Preferred + QSizePolicy::Minimum - 20 + 10 20 + + + + + 16777215 + 25 + + + + true + + + Gain + + + 2 + + + @@ -195,29 +238,41 @@ - - - - Gain - - - Qt::Horizontal - QSizePolicy::Preferred + QSizePolicy::Minimum - 20 + 10 20 + + + + + 16777215 + 25 + + + + true + + + Zero + + + 2 + + + @@ -234,24 +289,128 @@ - - - - Zero - - - Qt::Horizontal - QSizePolicy::Preferred + QSizePolicy::Minimum - 20 + 10 + 20 + + + + + + + + + 16777215 + 25 + + + + true + + + fMin + + + 2 + + + + + + + + 0 + 0 + + + + 1000 + + + 2000 + + + 50 + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 10 + 20 + + + + + + + + + 16777215 + 25 + + + + true + + + fMax + + + 2 + + + + + + + + 0 + 0 + + + + 1000 + + + 2000 + + + 50 + + + 2000 + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 10 20 @@ -280,13 +439,10 @@ - + Qt::Horizontal - - QSizePolicy::Expanding - 20