w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 21:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Final(?) fix to allow use of compound callsign for Fox.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8370 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-23 22:01:05 +00:00
parent 8ecfb26643
commit 8755f0b460
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -949,7 +949,7 @@ if (Fortran_COMPILER_NAME MATCHES "gfortran.*")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}") set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
endif (CMAKE_OSX_SYSROOT) endif (CMAKE_OSX_SYSROOT)
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -funroll-all-loops -fno-f2c ${General_FFLAGS}") set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fbounds-check -funroll-all-loops -fno-f2c ${General_FFLAGS}")
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}") set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}")
elseif (Fortran_COMPILER_NAME MATCHES "ifort.*") elseif (Fortran_COMPILER_NAME MATCHES "ifort.*")
# ifort (untested) # ifort (untested)

2
Versions.cmake
View File

@ -1,6 +1,6 @@
# Version number components # Version number components
set (WSJTX_VERSION_MAJOR 1) set (WSJTX_VERSION_MAJOR 1)
set (WSJTX_VERSION_MINOR 7) set (WSJTX_VERSION_MINOR 8)
set (WSJTX_VERSION_PATCH 1) set (WSJTX_VERSION_PATCH 1)
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

19
mainwindow.cpp
View File

@ -899,7 +899,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true); splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000); splashTimer.start (20 * 1000);
if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ" or m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ" or
m_config.my_callsign()=="K1ABC" or m_config.my_callsign()=="K1ABC/2" or m_config.my_callsign()=="K1ABC" or m_config.my_callsign()=="K1ABC/2" or
@ -914,7 +913,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
Q_EMIT finished (); Q_EMIT finished ();
} }
if(!ui->cbMenus->isChecked()) { if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true); ui->cbMenus->setChecked(true);
ui->cbMenus->setChecked(false); ui->cbMenus->setChecked(false);
@ -2794,7 +2792,6 @@ void MainWindow::readFromStdout() //readFromStdout
QByteArray t=proc_jt9.readLine(); QByteArray t=proc_jt9.readLine();
if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) continue; if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) continue;
// qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0; // qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0;
// qDebug() << "A" << ms << t;
bool bAvgMsg=false; bool bAvgMsg=false;
int navg=0; int navg=0;
if(t.indexOf("<DecodeFinished>") >= 0) { if(t.indexOf("<DecodeFinished>") >= 0) {
@ -2864,7 +2861,6 @@ void MainWindow::readFromStdout() //readFromStdout
foxRxSequencer(decodedtext.string(),houndCall,houndGrid); foxRxSequencer(decodedtext.string(),houndCall,houndGrid);
} }
} }
//Left (Band activity) window //Left (Band activity) window
if(!bAvgMsg) { if(!bAvgMsg) {
if(m_mode=="FT8" and m_config.bFox()) { if(m_mode=="FT8" and m_config.bFox()) {
@ -2894,8 +2890,8 @@ void MainWindow::readFromStdout() //readFromStdout
auto for_us = parts[5].contains (m_baseCall) auto for_us = parts[5].contains (m_baseCall)
|| ("DE" == parts[5] && qAbs (ui->RxFreqSpinBox->value () - audioFreq) <= 10); || ("DE" == parts[5] && qAbs (ui->RxFreqSpinBox->value () - audioFreq) <= 10);
if(m_baseCall==m_config.my_callsign() and m_baseCall!=parts[5]) for_us=false; if(m_baseCall==m_config.my_callsign() and m_baseCall!=parts[5]) for_us=false;
if(m_bCallingCQ && !m_bAutoReply && for_us && ui->cbFirst->isChecked()) { if(m_bCallingCQ && !m_bAutoReply && for_us && ui->cbFirst->isChecked() and
// int snr=decodedtext.string().mid(6,4).toInt(); !m_config.bFox() and !m_config.bHound()) {
m_bDoubleClicked=true; m_bDoubleClicked=true;
m_bAutoReply = true; m_bAutoReply = true;
if(!m_config.bFox()) processMessage (decodedtext); if(!m_config.bFox()) processMessage (decodedtext);
@ -4872,15 +4868,6 @@ void MainWindow::displayWidgets(qint64 n)
void MainWindow::on_actionFT8_triggered() void MainWindow::on_actionFT8_triggered()
{ {
/*
if(m_config.my_callsign()!="K1JT" and m_config.my_callsign()!="K9AN" and
m_config.my_callsign()!="G4WJS" and m_config.my_callsign()!="G3PQA") {
MessageBox::warning_message (this, tr ("FT8 warning"),
"FT8 mode temporarily disabled.");
on_actionJT9_JT65_triggered();
return;
}
*/
m_mode="FT8"; m_mode="FT8";
bool bVHF=false; bool bVHF=false;
m_bFast9=false; m_bFast9=false;
@ -4924,6 +4911,8 @@ void MainWindow::on_actionFT8_triggered()
ui->txb4->setEnabled(true); ui->txb4->setEnabled(true);
ui->txb5->setEnabled(true); ui->txb5->setEnabled(true);
ui->txb6->setEnabled(true); ui->txb6->setEnabled(true);
ui->txFirstCheckBox->setEnabled(true);
ui->cbAutoSeq->setEnabled(true);
if(m_config.bFox()) { if(m_config.bFox()) {
ui->txFirstCheckBox->setChecked(true); ui->txFirstCheckBox->setChecked(true);
ui->txFirstCheckBox->setEnabled(false); ui->txFirstCheckBox->setEnabled(false);