Added v0.9 and v1.0 parser options, working towards V1.0 MAVLink release candidate

src/apps/mavlinkgen/generator/MAVLinkXMLParserV10.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of class MAVLinkXMLParserV10
+ *   @author Lorenz Meier <mail@qgroundcontrol.org>
+ */
+
+#ifndef MAVLINKXMLPARSERV10_H
+#define MAVLINKXMLPARSERV10_H
+
+#include <QObject>
+#include <QDomDocument>
+#include <QString>
+
+/**
+ * @brief MAVLink micro air vehicle protocol generator
+ *
+ * MAVLink is a generic communication protocol for micro air vehicles.
+ * for more information, please see the official website.
+ * @ref http://pixhawk.ethz.ch/software/mavlink/
+ **/
+class MAVLinkXMLParserV10 : public QObject
+{
+    Q_OBJECT
+public:
+    MAVLinkXMLParserV10(QDomDocument* document, QString outputDirectory, QObject* parent=0);
+    MAVLinkXMLParserV10(QString document, QString outputDirectory, QObject* parent=0);
+    ~MAVLinkXMLParserV10();
+
+public slots:
+    /** @brief Parse XML and generate C files */
+    bool generate();
+
+signals:
+    /** @brief Status message on the parsing */
+    void parseState(QString message);
+
+protected:
+    QDomDocument* doc;
+    QString outputDirName;
+    QString fileName;
+};
+
+#endif // MAVLINKXMLPARSERV10_H

src/apps/mavlinkgen/mavlinkgen.pri

@@ -29,6 +29,7 @@ FORMS += ui/XMLCommProtocolWidget.ui
 HEADERS += \
     ui/XMLCommProtocolWidget.h \
     generator/MAVLinkXMLParser.h \
+    generator/MAVLinkXMLParserV10.h \
     ui/DomItem.h \
     ui/DomModel.h \
     ui/QGCMAVLinkTextEdit.h
@@ -37,6 +38,7 @@ SOURCES += \
     ui/DomItem.cc \
     ui/DomModel.cc \
     generator/MAVLinkXMLParser.cc \
+    generator/MAVLinkXMLParserV10.cc \
     ui/QGCMAVLinkTextEdit.cc
 
 RESOURCES += mavlinkgen.qrc

src/apps/mavlinkgen/ui/XMLCommProtocolWidget.cc

@@ -6,6 +6,7 @@
 #include "XMLCommProtocolWidget.h"
 #include "ui_XMLCommProtocolWidget.h"
 #include "MAVLinkXMLParser.h"
+#include "MAVLinkXMLParserV10.h"
 
 #include <QDebug>
 #include <iostream>
@@ -131,18 +132,37 @@ void XMLCommProtocolWidget::generate()
         // Syntax check already gives output
         return;
     }
-	
-    MAVLinkXMLParser* parser = new MAVLinkXMLParser(m_ui->fileNameLabel->text().trimmed(), m_ui->outputDirNameLabel->text().trimmed());
-    connect(parser, SIGNAL(parseState(QString)), m_ui->compileLog, SLOT(appendHtml(QString)));
-    bool result = parser->generate();
-    if (result) {
+
+    MAVLinkXMLParser* parser = NULL;
+    MAVLinkXMLParserV10* parserV10 = NULL;
+
+    bool result = false;
+
+    if (m_ui->versionComboBox->currentIndex() == 0)
+    {
+        MAVLinkXMLParser* parser = new MAVLinkXMLParser(m_ui->fileNameLabel->text().trimmed(), m_ui->outputDirNameLabel->text().trimmed());
+        connect(parser, SIGNAL(parseState(QString)), m_ui->compileLog, SLOT(appendHtml(QString)));
+        result = parser->generate();
+    }
+    else if (m_ui->versionComboBox->currentIndex() == 1)
+    {
+        MAVLinkXMLParserV10* parserV10 = new MAVLinkXMLParserV10(m_ui->fileNameLabel->text().trimmed(), m_ui->outputDirNameLabel->text().trimmed());
+        connect(parserV10, SIGNAL(parseState(QString)), m_ui->compileLog, SLOT(appendHtml(QString)));
+        result = parserV10->generate();
+    }
+
+    if (result)
+    {
         QMessageBox msgBox;
         msgBox.setText(QString("The C code / headers have been generated in folder\n%1").arg(m_ui->outputDirNameLabel->text().trimmed()));
         msgBox.exec();
-    } else {
+    }
+    else
+    {
         QMessageBox::critical(this, tr("C code generation failed, please see the compile log for further information"), QString("The C code / headers could not be written to folder\n%1").arg(m_ui->outputDirNameLabel->text().trimmed()), QMessageBox::Ok);
     }
-    delete parser;
+    if (parser) delete parser;
+    if (parserV10) delete parserV10;
 }
 
 void XMLCommProtocolWidget::save()

src/apps/mavlinkgen/ui/XMLCommProtocolWidget.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowstretch="1,1,100,1,1,1" columnstretch="1,1,1,100">
+  <layout class="QGridLayout" name="gridLayout" rowstretch="1,1,100,1,1,1,0" columnstretch="1,1,1,100">
    <property name="topMargin">
     <number>6</number>
    </property>
@@ -51,12 +51,12 @@
       <string>Select input file</string>
      </property>
      <property name="icon">
-      <iconset resource="../mavlinkgen.qrc">
+      <iconset resource="../../../../qgroundcontrol.qrc">
        <normaloff>:/images/status/folder-open.svg</normaloff>:/images/status/folder-open.svg</iconset>
      </property>
     </widget>
    </item>
-   <item row="0" column="3" rowspan="6">
+   <item row="0" column="3" rowspan="7">
     <widget class="QGCMAVLinkTextEdit" name="xmlTextView">
      <property name="minimumSize">
       <size>
@@ -97,49 +97,70 @@
       <string>Select directory</string>
      </property>
      <property name="icon">
-      <iconset resource="../mavlinkgen.qrc">
+      <iconset resource="../../../../qgroundcontrol.qrc">
        <normaloff>:/images/status/folder-open.svg</normaloff>:/images/status/folder-open.svg</iconset>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3">
+   <item row="3" column="0" colspan="3">
     <widget class="QTreeView" name="xmlTreeView"/>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="4" column="0" colspan="2">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Compile Output</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="3">
+   <item row="5" column="0" colspan="3">
     <widget class="QPlainTextEdit" name="compileLog"/>
    </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="validXMLLabel">
      <property name="text">
       <string>No file loaded</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="6" column="1">
     <widget class="QPushButton" name="saveButton">
      <property name="text">
       <string>Save file</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="2">
+   <item row="6" column="2">
     <widget class="QPushButton" name="generateButton">
      <property name="text">
       <string>Save and generate</string>
      </property>
      <property name="icon">
-      <iconset resource="../mavlinkgen.qrc">
+      <iconset resource="../../../../qgroundcontrol.qrc">
        <normaloff>:/images/categories/applications-system.svg</normaloff>:/images/categories/applications-system.svg</iconset>
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Select MAVLink Version</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QComboBox" name="versionComboBox">
+     <item>
+      <property name="text">
+       <string>MAVLink v0.9 (-Aug'10)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>MAVLink v1.0 (Sept'10+)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -150,7 +171,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../mavlinkgen.qrc"/>
+  <include location="../../../../qgroundcontrol.qrc"/>
  </resources>
  <connections/>
 </ui>