Commit 14acce6c authored by LM's avatar LM

Fixed generator to output proper console information

parent a2f8d1e8
......@@ -59,6 +59,11 @@ public slots:
/** @brief Handle process errors */
void processError(QProcess::ProcessError err);
/** @brief Redirect standard output */
void readStdOut();
/** @brief Redirect standard error output */
void readStdErr();
signals:
/** @brief Status message on the parsing */
void parseState(QString message);
......
......@@ -72,9 +72,12 @@ void XMLCommProtocolWidget::setXML(const QString& xml)
m_ui->xmlTextView->setText(xml);
QDomDocument doc;
if (doc.setContent(xml)) {
if (doc.setContent(xml))
{
m_ui->validXMLLabel->setText(tr("<font color=\"green\">Valid XML file</font>"));
} else {
}
else
{
m_ui->validXMLLabel->setText(tr("<font color=\"red\">File is NOT valid XML, please fix in editor</font>"));
}
}
......@@ -89,11 +92,13 @@ void XMLCommProtocolWidget::selectOutputDirectory()
dialog.setFileMode(QFileDialog::Directory);
dialog.setViewMode(QFileDialog::Detail);
QStringList fileNames;
if (dialog.exec()) {
if (dialog.exec())
{
fileNames = dialog.selectedFiles();
}
if (fileNames.size() > 0) {
if (fileNames.size() > 0)
{
m_ui->outputDirNameLabel->setText(fileNames.first());
// Store directory for next time
settings.setValue(mavlinkOutputDir, QFileInfo(fileNames.first()).absoluteFilePath());
......@@ -105,13 +110,15 @@ void XMLCommProtocolWidget::selectOutputDirectory()
void XMLCommProtocolWidget::generate()
{
// Check if input file is present
if (!QFileInfo(m_ui->fileNameLabel->text().trimmed()).isFile()) {
if (!QFileInfo(m_ui->fileNameLabel->text().trimmed()).isFile())
{
QMessageBox::critical(this, tr("Please select an XML input file first"), tr("You have to select an input XML file before generating C files."), QMessageBox::Ok);
return;
}
// Check if output dir is selected
if (!QFileInfo(m_ui->outputDirNameLabel->text().trimmed()).isDir()) {
if (!QFileInfo(m_ui->outputDirNameLabel->text().trimmed()).isDir())
{
QMessageBox::critical(this, tr("Please select output directory first"), tr("You have to select an output directory before generating C files."), QMessageBox::Ok);
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment