From 7fe1c809ce2559f1a35f9323f8ae7e0dc633d48f Mon Sep 17 00:00:00 2001
From: LM <lm@student.ethz.ch>
Date: Tue, 10 Jan 2012 18:28:09 +0100
Subject: [PATCH] Made Doxygen verbose, made sure the initialization of control
 widget is correct

---
 doc/Doxyfile                   | 11 ++++++-----
 src/ui/uas/UASControlWidget.cc | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/doc/Doxyfile b/doc/Doxyfile
index 28d0c331e..0d28fe85a 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -515,7 +515,7 @@ LAYOUT_FILE            =
 # The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
-QUIET                  = YES
+QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated by doxygen. Possible values are YES and NO. If left blank
@@ -599,7 +599,8 @@ RECURSIVE              = YES
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
 EXCLUDE                = ../src/lib/ \
-                         lib/
+                         lib/ \
+			../src/libs/
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -985,7 +986,7 @@ SEARCHENGINE           = YES
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1033,13 +1034,13 @@ LATEX_HEADER           =
 # contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
-PDF_HYPERLINKS         = YES
+PDF_HYPERLINKS         = NO
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
 # plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
-USE_PDFLATEX           = YES
+USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
 # command to the generated LaTeX files. This will instruct LaTeX to keep
diff --git a/src/ui/uas/UASControlWidget.cc b/src/ui/uas/UASControlWidget.cc
index 5c13e5222..06161d291 100644
--- a/src/ui/uas/UASControlWidget.cc
+++ b/src/ui/uas/UASControlWidget.cc
@@ -44,6 +44,7 @@ This file is part of the PIXHAWK project
 
 UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
     uas(0),
+    uasMode(0),
     engineOn(false)
 {
     ui.setupUi(this);
@@ -59,6 +60,8 @@ UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
     connect(ui.modeComboBox, SIGNAL(activated(int)), this, SLOT(setMode(int)));
     connect(ui.setModeButton, SIGNAL(clicked()), this, SLOT(transmitMode()));
 
+    uasMode = ui.modeComboBox->itemData(ui.modeComboBox->currentIndex()).toInt();
+
     ui.modeComboBox->setCurrentIndex(0);
 
     ui.gridLayout->setAlignment(Qt::AlignTop);
@@ -67,7 +70,8 @@ UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
 
 void UASControlWidget::setUAS(UASInterface* uas)
 {
-    if (this->uas != 0) {
+    if (this->uas != 0)
+    {
         UASInterface* oldUAS = UASManager::instance()->getUASForId(this->uas);
         disconnect(ui.controlButton, SIGNAL(clicked()), oldUAS, SLOT(armSystem()));
         disconnect(ui.liftoffButton, SIGNAL(clicked()), oldUAS, SLOT(launch()));
@@ -101,9 +105,12 @@ UASControlWidget::~UASControlWidget()
 void UASControlWidget::updateStatemachine()
 {
 
-    if (engineOn) {
+    if (engineOn)
+    {
         ui.controlButton->setText(tr("DISARM SYSTEM"));
-    } else {
+    }
+    else
+    {
         ui.controlButton->setText(tr("ARM SYSTEM"));
     }
 }
@@ -139,7 +146,8 @@ void UASControlWidget::updateMode(int uas,QString mode,QString description)
 
 void UASControlWidget::updateState(int state)
 {
-    switch (state) {
+    switch (state)
+    {
     case (int)MAV_STATE_ACTIVE:
         engineOn = true;
         ui.controlButton->setText(tr("DISARM SYSTEM"));
-- 
2.22.0