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

Take advantage of the new KVASD v1.12

Browse Source 
Pass the  temporary directory to  jt9 and use  it to give  the correct
paths  to  temporary files.  Also  jt9  passes  the absolute  path  to
kvasd.dat in the temporary directory to kvasd.

Clear out all the annoying cruft that has accumulated due to having to
run with $CWD as the temporary directory.

Use QStandardPaths  to find the  writable data directory  where needed
rather than passing it around  between objects. This now works because
the $CWD hasn't been changed.

Do away with the CMake option WSJT_STANDARD_FILE_LOCATIONS as it is no
longer needed.

Fix astro status file azel.dat formatting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4732 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2014-12-03 00:06:54 +00:00
parent 9ba26ce902
commit 935bacd2df
22 changed files with 535 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logqso.cpp
+9 -10
View File
@@ -2,21 +2,20 @@
#include <QString>
#include <QSettings>
#include <QStandardPaths>
#include <QDir>
#include <QDebug>
#include "Configuration.hpp"
#include "logbook/adif.h"
#include "ui_logqso.h"
#include "moc_logqso.cpp"
LogQSO::LogQSO(QString const& programTitle, QSettings * settings, Configuration const * configuration, QWidget *parent) :
QDialog(parent),
ui(new Ui::LogQSO),
m_settings (settings),
m_configuration (configuration)
LogQSO::LogQSO(QString const& programTitle, QSettings * settings, QWidget *parent)
: QDialog(parent)
, ui(new Ui::LogQSO)
, m_settings (settings)
{
ui->setupUi(this);
setWindowTitle(programTitle + " - Log QSO");
@@ -109,7 +108,7 @@ void LogQSO::accept()
//Log this QSO to ADIF file "wsjtx_log.adi"
QString filename = "wsjtx_log.adi"; // TODO allow user to set
ADIF adifile;
auto adifilePath = m_configuration->data_path ().absoluteFilePath (filename);
auto adifilePath = QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("wsjtx_log.adi");
adifile.init(adifilePath);
if (!adifile.addQSOToFile(hisCall,hisGrid,mode,rptSent,rptRcvd,date,time,band,comments,name,strDialFreq,m_myCall,m_myGrid,m_txPower))
{
@@ -119,7 +118,7 @@ void LogQSO::accept()
}
//Log this QSO to file "wsjtx.log"
QFile f(m_configuration->data_path ().absoluteFilePath ("wsjtx.log"));
static QFile f {QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("wsjtx.log")};
if(!f.open(QIODevice::Text | QIODevice::Append)) {
QMessageBox m;
m.setText("Cannot open file \"" + f.fileName () + "\".");
@@ -138,13 +137,13 @@ void LogQSO::accept()
}
//Clean up and finish logging
emit(acceptQSO(true));
Q_EMIT acceptQSO(true);
QDialog::accept();
}
void LogQSO::reject()
{
emit(acceptQSO(false));
Q_EMIT acceptQSO(false);
QDialog::reject();
}