w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-01 13:42:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Call sftx_sub() rather than invoking external process sftx[.exe].

Browse Source
This commit is contained in:
Joe Taylor 2024-09-17 11:29:16 -04:00
parent dcb8c6ce6b
commit f0a329c4d2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -616,7 +616,7 @@ set (wsjt_FSRCS
lib/superfox/sfox_wave.f90 lib/superfox/sfox_wave.f90
lib/superfox/sfox_wave_gfsk.f90 lib/superfox/sfox_wave_gfsk.f90
lib/superfox/sfrx_sub.f90 lib/superfox/sfrx_sub.f90
lib/superfox/sftx.f90 lib/superfox/sftx_sub.f90
lib/superfox/twkfreq2.f90 lib/superfox/twkfreq2.f90
) )

12
widgets/mainwindow.cpp
View File

@ -182,6 +182,8 @@ extern "C" {
void sfox_wave_gfsk_(char const * fname, FCL len); void sfox_wave_gfsk_(char const * fname, FCL len);
void sftx_sub_(char const * fname, char const * foxcall, char const * otp_key, FCL len1, FCL len2, FCL len3);
void plotsave_(float swide[], int* m_w , int* m_h1, int* irow); void plotsave_(float swide[], int* m_w , int* m_h1, int* irow);
void chk_samples_(int* m_ihsym,int* k, int* m_hsymStop); void chk_samples_(int* m_ihsym,int* k, int* m_hsymStop);
@ -11454,11 +11456,13 @@ void MainWindow::sfox_tx() {
} }
} }
#endif #endif
// qDebug() << "aa" << QDir::toNativeSeparators(m_appDir)+QDir::separator()+"sftx";
// qDebug() << "bb" << args;
LOG_INFO(QString("%1 %2").arg(QDir::toNativeSeparators(m_appDir)+QDir::separator()+"sftx").arg(args.join(" ")).toStdString()); LOG_INFO(QString("%1 %2").arg(QDir::toNativeSeparators(m_appDir)+QDir::separator()+"sftx").arg(args.join(" ")).toStdString());
p2.start(QDir::toNativeSeparators(m_appDir)+QDir::separator()+"sftx", args); auto fname1 {QDir::toNativeSeparators(m_config.writeable_data_dir().absoluteFilePath("sfox_1.dat")).toLocal8Bit()};
p2.waitForFinished(); // qDebug() << "aa" << fname1;
// qDebug() << "bb" << args[0] << args[1] << args[2];
sftx_sub_(fname1.constData(), args[1].toLatin1().constData() , args[2].toLatin1().constData(), (FCL)fname1.size(),
(FCL)args[1].size(), (FCL)args[2].size());
auto fname2 {QDir::toNativeSeparators(m_config.writeable_data_dir().absoluteFilePath("sfox_2.dat")).toLocal8Bit()}; auto fname2 {QDir::toNativeSeparators(m_config.writeable_data_dir().absoluteFilePath("sfox_2.dat")).toLocal8Bit()};
sfox_wave_gfsk_(fname2.constData(), (FCL)fname2.size()); sfox_wave_gfsk_(fname2.constData(), (FCL)fname2.size());
} }