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

Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration

Browse Source
This commit is contained in:
Joe Taylor
2021-05-07 11:41:58 -04:00
parent 0ce4e8d92e 98d4f771c2
commit e271696da9
2 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
map65/mainwindow.cpp
+35 -17
View File
@@ -1,6 +1,7 @@
//------------------------------------------------------------------ MainWindow
#include "mainwindow.h"
#include "revision_utils.hpp"
#include "widgets/MessageBox.hpp"
#include "ui_mainwindow.h"
#include "devsetup.h"
#include "plotter.h"
@@ -101,14 +102,15 @@ MainWindow::MainWindow(QWidget *parent) :
SLOT(showStatusMessage(QString)));
createStatusBar();
connect(&proc_m65, SIGNAL(readyReadStandardOutput()),
this, SLOT(readFromStdout()));
connect(&proc_m65, SIGNAL(error(QProcess::ProcessError)),
this, SLOT(m65_error()));
connect(&proc_m65, SIGNAL(readyReadStandardError()),
this, SLOT(readFromStderr()));
connect(&proc_m65, SIGNAL(readyReadStandardOutput()), this, SLOT(readFromStdout()));
connect(&proc_m65, &QProcess::errorOccurred, this, &MainWindow::m65_error);
connect(&proc_m65, static_cast<void (QProcess::*) (int, QProcess::ExitStatus)> (&QProcess::finished),
[this] (int exitCode, QProcess::ExitStatus status) {
if (subProcessFailed (&proc_m65, exitCode, status))
{
QTimer::singleShot (0, this, SLOT (close ()));
}
});
connect(&proc_editor, SIGNAL(error(QProcess::ProcessError)),
this, SLOT(editor_error()));
@@ -1341,11 +1343,33 @@ void MainWindow::decode() //decode()
decodeBusy(true);
}
void MainWindow::m65_error() //m65_error
bool MainWindow::subProcessFailed (QProcess * process, int exit_code, QProcess::ExitStatus status)
{
if (exit_code || QProcess::NormalExit != status)
{
QStringList arguments;
for (auto argument: process->arguments ())
{
if (argument.contains (' ')) argument = '"' + argument + '"';
arguments << argument;
}
MessageBox::critical_message (this, tr ("Subprocess Error")
, tr ("Subprocess failed with exit code %1")
.arg (exit_code)
, tr ("Running: %1\n%2")
.arg (process->program () + ' ' + arguments.join (' '))
.arg (QString {process->readAllStandardError()}));
return true;
}
return false;
}
void MainWindow::m65_error (QProcess::ProcessError)
{
if(!m_killAll) {
msgBox("Error starting or running\n" + m_appDir + "/m65 -s");
exit(1);
msgBox("Error starting or running\n" + m_appDir + "/m65 -s\n\n"
+ proc_m65.errorString ());
QTimer::singleShot (0, this, SLOT (close ()));
}
}
@@ -1356,12 +1380,6 @@ void MainWindow::editor_error() //editor_error
}
}
void MainWindow::readFromStderr() //readFromStderr
{
QByteArray t=proc_m65.readAllStandardError();
msgBox(t);
}
void MainWindow::readFromStdout() //readFromStdout
{
while(proc_m65.canReadLine())