From 04b0563d196acd9db03aff44f472ad8717e91aef Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 27 Sep 2017 12:39:50 +0000 Subject: [PATCH] Experimental new behavior for "Lock Tx=Rx" and for clicking on waterfall and decoded text. 1. Checkbox "Lock Tx=Rx" is now labeled "Lock Tx Freq", and its meaning is quite different. If checked, the audio Tx frequency cannot be changed. It's like the "Lock" function on some transceivers. 2. Clicking on the Wide Graph waterfall and on lines of decoded text now behave as follows: Click on Action --------------------------------------------------------------------- Waterfall: Click to set Rx frequency Shift-click to set Tx frequency Ctrl-click to set Rx and Tx frequencies If Lock Tx Freq is checked, Tx freq does not move Double-click to set Rx frequency and decode there Decoded Text: Double-click to copy transmitting callsign to DX Call and locator to DX Grid; change Rx frequency to decoded signal's frequency; generate standard messages. Tx frequency is not changed unless Ctrl is held down and Lock Tx Freq not checked. If this experimental behavior is adopted, some descriptions in the User Guide and Special Mouse Commands will need to be updated. 3. Starting to implement a new function on the Tools menu, "Solve for calibration parameters". This is not yet finished; DO NOT USE in its present form. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8125 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 1 + mainwindow.cpp | 68 ++++++++++++++++++++++++-------------------------- mainwindow.h | 1 + mainwindow.ui | 8 +++++- plotter.cpp | 10 +++----- widegraph.cpp | 2 +- 6 files changed, 46 insertions(+), 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed9aaff05..fa914b889 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,6 +374,7 @@ set (wsjt_FSRCS lib/fsk4hf/bpdecode174.f90 lib/fsk4hf/bpdecode300.f90 lib/baddata.f90 + lib/calibrate.f90 lib/ccf2.f90 lib/ccf65.f90 lib/fsk4hf/chkcrc10.f90 diff --git a/mainwindow.cpp b/mainwindow.cpp index b141d8665..bc14a953e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -131,6 +131,8 @@ extern "C" { char line[], int len); void fix_contest_msg_(char* MyGrid, char* msg, int len1, int len2); + + void calibrate_(char exe_dir[],char data_dir[], int len1, int len2); } int volatile itone[NUM_ISCAT_SYMBOLS]; //Audio tones for all Tx symbols @@ -847,6 +849,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, ui->TxPowerComboBox->setCurrentIndex(int(0.3*(m_dBm + 30.0)+0.2)); ui->cbUploadWSPR_Spots->setChecked(m_uploadSpots); ui->cbTxLock->setChecked(m_lockTxFreq); + ui->TxFreqSpinBox->setEnabled(!m_lockTxFreq); if((m_ndepth&7)==1) ui->actionQuickDecode->setChecked(true); if((m_ndepth&7)==2) ui->actionMediumDecode->setChecked(true); if((m_ndepth&7)==3) ui->actionDeepestDecode->setChecked(true); @@ -1731,9 +1734,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e) } on_actionOpen_next_in_directory_triggered(); return; - case Qt::Key_F10: - if(e->modifiers() & Qt::ControlModifier) freqCalStep(); - break; case Qt::Key_F11: n=11; if(e->modifiers() & Qt::ControlModifier) n+=100; @@ -1829,10 +1829,9 @@ void MainWindow::bumpFqso(int n) //bumpFqso() i=ui->RxFreqSpinBox->value (); if(n==11) i--; if(n==12) i++; - if (ui->RxFreqSpinBox->isEnabled ()) - { - ui->RxFreqSpinBox->setValue (i); - } + if (ui->RxFreqSpinBox->isEnabled ()) { + ui->RxFreqSpinBox->setValue (i); + } if(ctrl and m_mode.startsWith ("WSPR")) { ui->WSPRfreqSpinBox->setValue(i); } else { @@ -2120,6 +2119,20 @@ void MainWindow::on_actionFast_Graph_triggered() m_fastGraph->show(); } +void MainWindow::on_actionSolve_FreqCal_triggered() +{ + QString apath{QDir::toNativeSeparators(m_appDir) + "\\"}; + char app_dir[512]; + int len1=apath.length(); + strncpy(app_dir,apath.toLatin1(),len1); + QString dpath{QDir::toNativeSeparators(m_config.writeable_data_dir().absolutePath()) + "\\"}; + char data_dir[512]; + int len2=dpath.length(); + strncpy(data_dir,dpath.toLatin1(),len2); + qDebug() << "AA" << len1 << len2 << dpath; + calibrate_(app_dir,data_dir,len1,len2); +} + // This allows the window to shrink by removing certain things // and reducing space used by controls void MainWindow::hideMenus(bool checked) @@ -3826,22 +3839,13 @@ void MainWindow::processMessage(DecodedText const& message, bool ctrl, bool alt) return; } - QString firstcall = message.call(); if(!m_bFastMode and (!m_config.enable_VHF_features() or m_mode=="FT8")) { - // Don't change Tx freq if in a fast mode, or VHF features enabled; also not if a - // station is calling me, unless m_lockTxFreq is true or CTRL is held down. - if ((Radio::is_callsign (firstcall) - && firstcall != m_config.my_callsign () && firstcall != m_baseCall - && firstcall != "DE") - || "CQ" == firstcall || "QRZ" == firstcall - || m_lockTxFreq || ctrl) { - if (ui->TxFreqSpinBox->isEnabled ()) { - if(!m_bFastMode && !alt) ui->TxFreqSpinBox->setValue(frequency); - } else if(m_mode != "JT4" && m_mode != "JT65" && !m_mode.startsWith ("JT9") && - m_mode != "QRA64") { - return; - } + if (ui->TxFreqSpinBox->isEnabled()) { + if(ctrl) ui->TxFreqSpinBox->setValue(frequency); + } else if(m_mode != "JT4" && m_mode != "JT65" && !m_mode.startsWith ("JT9") && + m_mode != "QRA64" && m_mode!="FT8") { + return; } } @@ -4013,7 +4017,6 @@ void MainWindow::processMessage(DecodedText const& message, bool ctrl, bool alt) // if we get here then we are reacting to the message if (m_bAutoReply) m_bCallingCQ = CALLING == m_QSOProgress; - if (ui->RxFreqSpinBox->isEnabled () and m_mode != "MSK144") { ui->RxFreqSpinBox->setValue (frequency); //Set Rx freq } @@ -5173,7 +5176,7 @@ void MainWindow::fast_config(bool b) void MainWindow::on_TxFreqSpinBox_valueChanged(int n) { m_wideGraph->setTxFreq(n); - if(m_lockTxFreq) ui->RxFreqSpinBox->setValue(n); +// if(m_lockTxFreq) ui->RxFreqSpinBox->setValue(n); if(m_mode!="MSK144") { Q_EMIT transmitFrequency (n - m_XIT); } @@ -5184,18 +5187,10 @@ void MainWindow::on_RxFreqSpinBox_valueChanged(int n) { m_wideGraph->setRxFreq(n); if (m_mode == "FreqCal" - && m_frequency_list_fcal_iter != m_config.frequencies ()->end ()) - { - setRig (m_frequency_list_fcal_iter->frequency_ - n); - } - if (m_lockTxFreq && ui->TxFreqSpinBox->isEnabled ()) - { - ui->TxFreqSpinBox->setValue (n); - } - else - { - statusUpdate (); - } + && m_frequency_list_fcal_iter != m_config.frequencies ()->end ()) { + setRig (m_frequency_list_fcal_iter->frequency_ - n); + } + statusUpdate (); } void MainWindow::on_actionQuickDecode_toggled (bool checked) @@ -5655,7 +5650,8 @@ void MainWindow::on_cbTxLock_clicked(bool checked) { m_lockTxFreq=checked; m_wideGraph->setLockTxFreq(m_lockTxFreq); - if(m_lockTxFreq) on_pbR2T_clicked(); + ui->TxFreqSpinBox->setEnabled(!m_lockTxFreq); +// if(m_lockTxFreq) on_pbR2T_clicked(); } void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const& s) diff --git a/mainwindow.h b/mainwindow.h index 7aea34d2d..51ce65447 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -149,6 +149,7 @@ private slots: void on_actionSave_all_triggered(); void on_actionKeyboard_shortcuts_triggered(); void on_actionSpecial_mouse_commands_triggered(); + void on_actionSolve_FreqCal_triggered(); void on_DecodeButton_clicked (bool); void decode(); void decodeBusy(bool b); diff --git a/mainwindow.ui b/mainwindow.ui index 09e9a2578..6ca3a469b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -803,7 +803,7 @@ QLabel[oob="true"] { <html><head/><body><p>Tx frequency tracks Rx frequency. </p><p>Not recommended for general use!</p></body></html> - Lock Tx=Rx + Lock Tx Freq @@ -2398,6 +2398,7 @@ QPushButton[state="ok"] { + @@ -2943,6 +2944,11 @@ QPushButton[state="ok"] { Enable AP + + + Solve for calibration parameters + + diff --git a/plotter.cpp b/plotter.cpp index 550bdda5f..ca501ca61 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -638,13 +638,11 @@ void CPlotter::mousePressEvent(QMouseEvent *event) //mousePressEvent int oldTxFreq = m_txFreq; int oldRxFreq = m_rxFreq; - if (ctrl or m_lockTxFreq) { + if (ctrl and !m_lockTxFreq) { emit setFreq1 (newFreq, newFreq); - } - else if (shift) { - emit setFreq1 (oldRxFreq, newFreq); - } - else { + } else if (shift) { + if(!m_lockTxFreq) emit setFreq1 (oldRxFreq, newFreq); + } else { emit setFreq1(newFreq,oldTxFreq); } diff --git a/widegraph.cpp b/widegraph.cpp index 6b11b1e98..6b62ebb05 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -230,7 +230,7 @@ void WideGraph::setRxFreq(int n) //set { ui->widePlot->setRxFreq(n); ui->widePlot->draw(swide,false,false); - if(m_lockTxFreq) setTxFreq(n); +// if(m_lockTxFreq) setTxFreq(n); } int WideGraph::rxFreq() //rxFreq