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

Correct the real-time filename being sent to wspr_fsk8d.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7693 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-05-19 15:52:48 +00:00
parent bfa4b2895d
commit 9338cb52bb
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fsk4hf/wspr_fsk8d.f90
View File

@ -38,7 +38,7 @@ program wspr_fsk8d
nargs=iargc() nargs=iargc()
if(nargs.lt.7) then if(nargs.lt.7) then
print*,'Usage: wspr_fsk8d -d db -a data_dir -f fMHz file1 [file2 ...]' print*,'Usage: wspr_fsk8d -d db -f fMHz -a data_dir file1 [file2 ...]'
go to 999 go to 999
endif endif
call getarg(1,arg) call getarg(1,arg)

13
mainwindow.cpp
View File

@ -1276,20 +1276,27 @@ void MainWindow::dataSink(qint64 frames)
QString t2,cmnd; QString t2,cmnd;
double f0m1500=m_dialFreqRxWSPR/1000000.0; // + 0.000001*(m_BFO - 1500); double f0m1500=m_dialFreqRxWSPR/1000000.0; // + 0.000001*(m_BFO - 1500);
t2.sprintf(" -f %.6f ",f0m1500); t2.sprintf(" -f %.6f ",f0m1500);
QString degrade;
degrade.sprintf("-d %4.1f ",m_config.degrade());
if(m_diskData or m_mode=="WSPR-LF") { if(m_diskData) {
cmnd='"' + m_appDir + '"' + "/wsprd -a \"" + cmnd='"' + m_appDir + '"' + "/wsprd -a \"" +
QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" \"" + m_path + "\""; QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" \"" + m_path + "\"";
} else {
if(m_mode=="WSPR-LF") {
cmnd='"' + m_appDir + '"' + "/wspr_fsk8d " + degrade + t2 +" -a \"" +
QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " +
'"' + m_fnameWE + ".wav\"";
} else { } else {
cmnd='"' + m_appDir + '"' + "/wsprd -a \"" + cmnd='"' + m_appDir + '"' + "/wsprd -a \"" +
QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " + QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " +
t2 + '"' + m_fnameWE + ".wav\""; t2 + '"' + m_fnameWE + ".wav\"";
} }
}
QString t3=cmnd; QString t3=cmnd;
int i1=cmnd.indexOf("/wsprd "); int i1=cmnd.indexOf("/wsprd ");
cmnd=t3.mid(0,i1+7) + t3.mid(i1+7); cmnd=t3.mid(0,i1+7) + t3.mid(i1+7);
QString degrade;
degrade.sprintf("-d %4.1f ",m_config.degrade());
if(m_mode=="WSPR-LF") cmnd=cmnd.replace("/wsprd ","/wspr_fsk8d "+degrade+t2); if(m_mode=="WSPR-LF") cmnd=cmnd.replace("/wsprd ","/wspr_fsk8d "+degrade+t2);
if (ui) ui->DecodeButton->setChecked (true); if (ui) ui->DecodeButton->setChecked (true);
m_cmndP1=QDir::toNativeSeparators(cmnd); m_cmndP1=QDir::toNativeSeparators(cmnd);