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

Revert "Prepare to send 'datadir' and 'tempdir' strings to m65."

Browse Source 
This reverts commit f8e61e05af2d817a3b96176b11ad3fda94a05f69.
This commit is contained in:
Joe Taylor 2021-04-20 12:45:18 -04:00
parent f8e61e05af
commit c20201e7f7
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
map65/mainwindow.cpp
View File

@ -116,10 +116,7 @@ MainWindow::MainWindow(QWidget *parent) :
QTimer *guiTimer = new QTimer(this); QTimer *guiTimer = new QTimer(this);
connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate())); connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate()));
guiTimer->start(100); //Don't change the 100 ms!
QTimer *m65Timer = new QTimer(this);
m65Timer->setSingleShot(true);
connect(m65Timer, SIGNAL(timeout()), this, SLOT(setup_m65()));
m_auto=false; m_auto=false;
m_waterfallAvg = 1; m_waterfallAvg = 1;
@ -296,10 +293,8 @@ MainWindow::MainWindow(QWidget *parent) :
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";
m65Timer->start(200);
guiTimer->start(100); //Don't change the 100 ms!
// End of MainWindow constructor // End of MainWindow constructor
} }
@ -324,14 +319,6 @@ MainWindow::~MainWindow()
delete ui; delete ui;
} }
void MainWindow::setup_m65()
{
m_dataDir = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
m_tempDir = QStandardPaths::writableLocation (QStandardPaths::TempLocation) + "/map65";
memcpy(datcom_.datadir, m_dataDir.toLatin1(),m_dataDir.length());
memcpy(datcom_.tempdir, m_tempDir.toLatin1(),m_tempDir.length());
}
//-------------------------------------------------------- writeSettings() //-------------------------------------------------------- writeSettings()
void MainWindow::writeSettings() void MainWindow::writeSettings()
{ {

2
map65/mainwindow.h
View File

@ -45,7 +45,6 @@ public slots:
void guiUpdate(); void guiUpdate();
void doubleClickOnCall(QString hiscall, bool ctrl); void doubleClickOnCall(QString hiscall, bool ctrl);
void doubleClickOnMessages(QString hiscall, QString t2); void doubleClickOnMessages(QString hiscall, QString t2);
void setup_m65();
protected: protected:
virtual void keyPressEvent( QKeyEvent *e ); virtual void keyPressEvent( QKeyEvent *e );
@ -265,6 +264,7 @@ private:
SignalMeter *xSignalMeter; SignalMeter *xSignalMeter;
SignalMeter *ySignalMeter; SignalMeter *ySignalMeter;
SoundInThread soundInThread; //Instantiate the audio threads SoundInThread soundInThread; //Instantiate the audio threads
SoundOutThread soundOutThread; SoundOutThread soundOutThread;