w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-04 14:17:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up behavior for Fox with compound callsign.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8363 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-22 17:25:16 +00:00
parent cc95d8ea98
commit f492a2560d
4 changed files with 17 additions and 11 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)

4
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 2)
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

3
lib/ft8/ft8sim.f90
View File

@ -92,7 +92,8 @@ program ft8sim
c0=0. c0=0.
if(nsig.eq.2) then if(nsig.eq.2) then
if(index(msg,'R-').gt.0) f0=500 if(index(msg,'R-').gt.0) f0=500
msg(9:9)=char(ichar('W')+isig) i1=index(msg,' ')
msg(i1+4:i1+4)=char(ichar('A')+isig-1)
if(isig.eq.2) then if(isig.eq.2) then
f0=f0+100 f0=f0+100
endif endif

19
mainwindow.cpp
View File

@ -902,7 +902,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
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") { m_config.my_callsign()=="K1ABC" or m_config.my_callsign()=="K1ABC/2" or
m_config.my_callsign()=="KH1/KH7Z") {
ui->actionWSPR_LF->setEnabled(true); ui->actionWSPR_LF->setEnabled(true);
} else { } else {
QString errorMsg; QString errorMsg;
@ -2853,11 +2854,15 @@ void MainWindow::readFromStdout() //readFromStdout
ui->cbVHFcontest->isChecked(), m_config.my_grid ()}; ui->cbVHFcontest->isChecked(), m_config.my_grid ()};
if(m_mode=="FT8" and m_config.bFox() and if(m_mode=="FT8" and m_config.bFox() and
decodedtext.string().contains(" " + m_config.my_callsign() + " ") and
(decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) { (decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
QString houndCall,houndGrid; auto for_us = decodedtext.string().contains(" " + m_config.my_callsign() + " ") or
decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid); decodedtext.string().contains(" "+m_baseCall) or
foxRxSequencer(decodedtext.string(),houndCall,houndGrid); decodedtext.string().contains(m_baseCall+" ");
if(for_us) {
QString houndCall,houndGrid;
decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid);
foxRxSequencer(decodedtext.string(),houndCall,houndGrid);
}
} }
//Left (Band activity) window //Left (Band activity) window
@ -7189,7 +7194,7 @@ QString MainWindow::sortHoundCalls(QString t, int isort, int max_dB)
nlines=lines.length()-1; nlines=lines.length()-1;
for(i=0; i<nlines; i++) { for(i=0; i<nlines; i++) {
msg=lines.at(i); //key = callsign msg=lines.at(i); //key = callsign
if(msg.mid(13,1)==" ") msg=msg.mid(0,16) + "_" + msg.mid(17); if(msg.mid(13,1)==" ") msg=msg.mid(0,13) + "...." + msg.mid(17);
houndCall=msg.split(" ").at(0); //value = "call grid snr freq dist age" houndCall=msg.split(" ").at(0); //value = "call grid snr freq dist age"
map[houndCall]=msg; map[houndCall]=msg;
} }
@ -7413,7 +7418,7 @@ void MainWindow::foxTxSequencer()
<< m_rptRcvd << m_lastBand; << m_rptRcvd << m_lastBand;
QDateTime logTime {QDateTime::currentDateTimeUtc ()}; QDateTime logTime {QDateTime::currentDateTimeUtc ()};
QString logLine=logTime.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall + QString logLine=logTime.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall +
" " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand; " " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand;
if(m_msgAvgWidget != NULL and m_msgAvgWidget->isVisible()) { if(m_msgAvgWidget != NULL and m_msgAvgWidget->isVisible()) {
m_msgAvgWidget->foxAddLog(logLine); m_msgAvgWidget->foxAddLog(logLine);
} }