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

Revert "Send a suitable 'datadir' and 'tempdir' to m65."

Browse Source 
This reverts commit fb17e42f25cab62e06cb87c35e5f4f1ed5378eb9.
This commit is contained in:
Joe Taylor 2021-04-20 12:46:44 -04:00
parent 6cf3a74ad8
commit fbf288e271
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
map65/commons.h
View File

@ -38,8 +38,6 @@ extern struct { //This is "common/datcom/..." in Fortran
char hiscall[12]; char hiscall[12];
char hisgrid[6]; char hisgrid[6];
char datetime[20]; char datetime[20];
char datadir[200];
char tempdir[200];
} datcom_; } datcom_;
} }

10
map65/mainwindow.cpp
View File

@ -292,10 +292,6 @@ MainWindow::MainWindow(QWidget *parent) :
if(ui->actionCuteSDR->isChecked()) on_actionCuteSDR_triggered(); if(ui->actionCuteSDR->isChecked()) on_actionCuteSDR_triggered();
if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered(); if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
if(ui->actionBlue->isChecked()) on_actionBlue_triggered(); if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
m_dataDir = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
m_tempDir = QStandardPaths::writableLocation (QStandardPaths::TempLocation) + "/map65";
// End of MainWindow constructor // End of MainWindow constructor
} }
@ -955,6 +951,7 @@ void MainWindow::OnExit()
{ {
g_pWideGraph->saveSettings(); g_pWideGraph->saveSettings();
m_killAll=true; m_killAll=true;
mem_m65.detach();
QFile quitFile(m_appDir + "/.quit"); QFile quitFile(m_appDir + "/.quit");
quitFile.open(QIODevice::ReadWrite); quitFile.open(QIODevice::ReadWrite);
QFile lockFile(m_appDir + "/.lock"); QFile lockFile(m_appDir + "/.lock");
@ -962,7 +959,6 @@ void MainWindow::OnExit()
bool b=proc_m65.waitForFinished(1000); bool b=proc_m65.waitForFinished(1000);
if(!b) proc_m65.kill(); if(!b) proc_m65.kill();
quitFile.remove(); quitFile.remove();
mem_m65.detach();
qApp->exit(0); // Exit the event loop qApp->exit(0); // Exit the event loop
} }
@ -1318,8 +1314,7 @@ void MainWindow::decode() //decode()
memcpy(datcom_.hiscall, hcall.toLatin1(), 12); memcpy(datcom_.hiscall, hcall.toLatin1(), 12);
memcpy(datcom_.hisgrid, hgrid.toLatin1(), 6); memcpy(datcom_.hisgrid, hgrid.toLatin1(), 6);
memcpy(datcom_.datetime, m_dateTime.toLatin1(), 20); memcpy(datcom_.datetime, m_dateTime.toLatin1(), 20);
memcpy(datcom_.datadir, m_dataDir.toLatin1(),m_dataDir.length());
memcpy(datcom_.tempdir, m_tempDir.toLatin1(),m_tempDir.length());
//newdat=1 ==> this is new data, must do the big FFT //newdat=1 ==> this is new data, must do the big FFT
//nagain=1 ==> decode only at fQSO +/- Tol //nagain=1 ==> decode only at fQSO +/- Tol
@ -1332,7 +1327,6 @@ void MainWindow::decode() //decode()
from += noffset; from += noffset;
size -= noffset; size -= noffset;
} }
memcpy(to, from, qMin(mem_m65.size(), size)); memcpy(to, from, qMin(mem_m65.size(), size));
datcom_.nagain=0; datcom_.nagain=0;
datcom_.ndiskdat=0; datcom_.ndiskdat=0;

2
map65/mainwindow.h
View File

@ -256,8 +256,6 @@ private:
QString m_colors; QString m_colors;
QString m_editorCommand; QString m_editorCommand;
QString m_modeTx; QString m_modeTx;
QString m_dataDir;
QString m_tempDir;
QHash<QString,bool> m_worked; QHash<QString,bool> m_worked;