diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 9b9df3262bfd79149ab7a380bca40b1344e0574c..6891f209535aa7bd9a5ea9b9170326fbc7682fe5 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -2485,36 +2485,39 @@ QString UAS::getShortModeTextFor(int id)
{
mode += "AUTO";
}
- if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_GUIDED)
+ else if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_GUIDED)
{
- mode += "|GUID";
+ mode += "|STABILIZED";
}
- if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_STABILIZE)
+// if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_STABILIZE)
+// {
+// mode += "|STAB";
+// }
+ else if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_TEST)
{
- mode += "|STAB";
+ mode += "|TEST";
}
- if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_TEST)
+ else if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_MANUAL)
{
- mode += "|TEST";
+ mode += "|MANUAL";
}
- if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_MANUAL)
+ else if (modeid == 0)
{
- mode += "|MAN";
+ mode = "|PREFLIGHT";
}
-
- if (modeid == 0)
+ else
{
- mode = "PREFLIGHT";
+ mode = "|UNKNOWN";
}
// ARMED STATE DECODING
if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_SAFETY)
{
- mode.prepend("A/");
+ mode.prepend("A");
}
else
{
- mode.prepend("D/");
+ mode.prepend("D");
}
// HARDWARE IN THE LOOP DECODING
diff --git a/src/ui/Linechart.ui b/src/ui/Linechart.ui
index 58449dac50fdf8328e382939ce4a97f93da0f256..0e6b0fd74fd5060af9d355592e604eed7b7c09c6 100644
--- a/src/ui/Linechart.ui
+++ b/src/ui/Linechart.ui
@@ -6,7 +6,7 @@
0
0
- 833
+ 1337
585
@@ -28,208 +28,177 @@
-
- -
-
-
-
- 1
- 0
-
+
+
+ 6
+
+
-
+
+
+ QFrame::NoFrame
-
-
- 90
- 200
-
+
+ 1
-
-
- 370
- 16777215
-
+
+ Qt::Horizontal
-
-
+
+ 10
-
- Curve Selection
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- 2
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 60
- 150
-
-
-
-
- 60
- 150
-
-
-
- false
-
-
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Sunken
-
-
- true
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
- 0
- 0
- 368
- 488
-
+
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 3
+
+
-
+
+
+
+ 0
+ 0
+
-
-
-
- -
-
-
- 2
-
-
-
-
-
-
-
- All MAVs
-
-
-
-
- -
-
-
- 0
+
+
+ 60
+ 150
+
+
+
+
+ 60
+ 150
+
+
+
+ false
+
+
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Sunken
+
+
+ true
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+
+ 0
+ 0
+ 202
+ 488
+
-
-
-
-
- 0
+
+
+
+ -
+
+
+ 2
+
+
-
+
+
-
+
+ All MAVs
-
-
-
-
- Display only variable names in curve list
-
-
- Short names
-
-
-
- -
-
-
- Display variable units in curve list
-
-
- Display variable units in curve list
-
-
- Show units
-
-
- true
-
-
-
-
-
- -
-
-
-
-
-
- Rotate color scheme for all curves
-
-
- Recolor
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Minimum
-
-
-
- 20
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 200
- 200
-
-
-
-
- 800
- 300
-
-
-
-
-
-
- Diagram
-
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ 0
+
+
-
+
+
+ Display only variable names in curve list
+
+
+ Short names
+
+
+
+ -
+
+
+ Display variable units in curve list
+
+
+ Display variable units in curve list
+
+
+ Show units
+
+
+ true
+
+
+
+
+
+ -
+
+
-
+
+
+ Rotate color scheme for all curves
+
+
+ Recolor
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Minimum
+
+
+
+ 20
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ui/ParameterInterface.ui b/src/ui/ParameterInterface.ui
index 167f006418a0435594d69ad9d51a249b97d661d0..d911a49d8bb063152318a433d6bf7de9adc4e95e 100644
--- a/src/ui/ParameterInterface.ui
+++ b/src/ui/ParameterInterface.ui
@@ -6,43 +6,25 @@
0
0
- 335
- 300
+ 707
+ 572
Form
-
-
- 5
-
-
- 2
-
+
- 6
+ 0
- -
-
-
- Onboard Parameters
+
-
+
+
+ -1
-
-
- 3
-
-
-
-
-
- -1
-
-
-
-
- -
+
-
-1
diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc
index 185383cfab3e20af1af1c9fd70f9ccb23f204e13..eecae3ba1d6040cb09b957680d809e0d819bfb30 100644
--- a/src/ui/QGCParamWidget.cc
+++ b/src/ui/QGCParamWidget.cc
@@ -58,7 +58,7 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) :
tree = new QTreeWidget(this);
statusLabel = new QLabel();
statusLabel->setAutoFillBackground(true);
- tree->setColumnWidth(0, 175);
+ tree->setColumnWidth(70, 30);
// Set tree widget as widget onto this component
QGridLayout* horizontalLayout;
@@ -67,8 +67,8 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) :
horizontalLayout->setHorizontalSpacing(6);
horizontalLayout->setVerticalSpacing(6);
horizontalLayout->setMargin(0);
- //horizontalLayout->setSizeConstraint(QLayout::SetMinimumSize);
- horizontalLayout->setSizeConstraint( QLayout::SetFixedSize );
+ horizontalLayout->setSizeConstraint(QLayout::SetMinimumSize);
+ //horizontalLayout->setSizeConstraint( QLayout::SetFixedSize );
// Parameter tree
horizontalLayout->addWidget(tree, 0, 0, 1, 3);