Skip to content

Q
qgroundcontrol
Commit c23ac709 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Visual cleanups in various places, fits now better small screens

parent 05cb3c23
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 239 deletions
src/uas/UAS.cc
View file @ c23ac709
...@@ -2485,36 +2485,39 @@ QString UAS::getShortModeTextFor(int id) ...@@ -2485,36 +2485,39 @@ QString UAS::getShortModeTextFor(int id)
{ {
mode += "AUTO"; 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";
} }
else
if (modeid == 0)
{ {
mode = "PREFLIGHT"; mode = "|UNKNOWN";
} }
// ARMED STATE DECODING // ARMED STATE DECODING
if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_SAFETY) if (modeid & (uint8_t)MAV_MODE_FLAG_DECODE_POSITION_SAFETY)
{ {
mode.prepend("A/"); mode.prepend("A");
} }
else else
{ {
mode.prepend("D/"); mode.prepend("D");
} }
// HARDWARE IN THE LOOP DECODING // HARDWARE IN THE LOOP DECODING
......
src/ui/Linechart.ui
View file @ c23ac709
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>833</width> <width>1337</width>
<height>585</height> <height>585</height>
</rect> </rect>
</property> </property>
...@@ -28,208 +28,177 @@ ...@@ -28,208 +28,177 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="5,0,0"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item row="0" column="0" rowspan="3"> <property name="margin">
<widget class="QGroupBox" name="curveGroupBox"> <number>6</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> <item>
<horstretch>1</horstretch> <widget class="QSplitter" name="splitter">
<verstretch>0</verstretch> <property name="frameShape">
</sizepolicy> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="minimumSize"> <property name="midLineWidth">
<size> <number>1</number>
<width>90</width>
<height>200</height>
</size>
</property> </property>
<property name="maximumSize"> <property name="orientation">
<size> <enum>Qt::Horizontal</enum>
<width>370</width>
<height>16777215</height>
</size>
</property> </property>
<property name="styleSheet"> <property name="handleWidth">
<string notr="true"/> <number>10</number>
</property> </property>
<property name="title"> <widget class="QWidget" name="curveGroupBox" native="true">
<string>Curve Selection</string> <layout class="QGridLayout" name="gridLayout" rowstretch="50,1">
</property> <property name="leftMargin">
<property name="alignment"> <number>6</number>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> </property>
</property> <property name="topMargin">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0"> <number>6</number>
<property name="spacing"> </property>
<number>2</number> <property name="rightMargin">
</property> <number>6</number>
<property name="margin"> </property>
<number>0</number> <property name="bottomMargin">
</property> <number>3</number>
<item> </property>
<widget class="QScrollArea" name="curveListWidget"> <item row="0" column="0">
<property name="sizePolicy"> <widget class="QScrollArea" name="curveListWidget">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding"> <property name="sizePolicy">
<horstretch>0</horstretch> <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<verstretch>0</verstretch> <horstretch>0</horstretch>
</sizepolicy> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="minimumSize">
<size>
<width>60</width>
<height>150</height>
</size>
</property>
<property name="baseSize">
<size>
<width>60</width>
<height>150</height>
</size>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>368</width>
<height>488</height>
</rect>
</property> </property>
</widget> <property name="minimumSize">
</widget> <size>
</item> <width>60</width>
<item> <height>150</height>
<layout class="QVBoxLayout" name="verticalLayout_2"> </size>
<property name="spacing"> </property>
<number>2</number> <property name="baseSize">
</property> <size>
<item> <width>60</width>
<widget class="QComboBox" name="uasSelectionBox"> <height>150</height>
<item> </size>
<property name="text"> </property>
<string>All MAVs</string> <property name="autoFillBackground">
</property> <bool>false</bool>
</item> </property>
</widget> <property name="styleSheet">
</item> <string notr="true"/>
<item> </property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0"> <property name="frameShape">
<property name="spacing"> <enum>QFrame::NoFrame</enum>
<number>0</number> </property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>202</width>
<height>488</height>
</rect>
</property> </property>
<item> </widget>
<layout class="QVBoxLayout" name="verticalLayout_3"> </widget>
<property name="spacing"> </item>
<number>0</number> <item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QComboBox" name="uasSelectionBox">
<item>
<property name="text">
<string>All MAVs</string>
</property> </property>
<item> </item>
<widget class="QCheckBox" name="shortNameCheckBox"> </widget>
<property name="toolTip"> </item>
<string>Display only variable names in curve list</string> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
<property name="text"> <property name="spacing">
<string>Short names</string> <number>0</number>
</property> </property>
</widget> <item>
</item> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <property name="spacing">
<widget class="QCheckBox" name="showUnitsCheckBox"> <number>0</number>
<property name="toolTip"> </property>
<string>Display variable units in curve list</string> <item>
</property> <widget class="QCheckBox" name="shortNameCheckBox">
<property name="whatsThis"> <property name="toolTip">
<string>Display variable units in curve list</string> <string>Display only variable names in curve list</string>
</property> </property>
<property name="text"> <property name="text">
<string>Show units</string> <string>Short names</string>
</property> </property>
<property name="checked"> </widget>
<bool>true</bool> </item>
</property> <item>
</widget> <widget class="QCheckBox" name="showUnitsCheckBox">
</item> <property name="toolTip">
</layout> <string>Display variable units in curve list</string>
</item> </property>
<item> <property name="whatsThis">
<layout class="QVBoxLayout" name="verticalLayout_4"> <string>Display variable units in curve list</string>
<item> </property>
<widget class="QPushButton" name="recolorButton"> <property name="text">
<property name="toolTip"> <string>Show units</string>
<string>Rotate color scheme for all curves</string> </property>
</property> <property name="checked">
<property name="text"> <bool>true</bool>
<string>Recolor</string> </property>
</property> </widget>
</widget> </item>
</item> </layout>
<item> </item>
<spacer name="verticalSpacer"> <item>
<property name="orientation"> <layout class="QVBoxLayout" name="verticalLayout_4">
<enum>Qt::Vertical</enum> <item>
</property> <widget class="QPushButton" name="recolorButton">
<property name="sizeType"> <property name="toolTip">
<enum>QSizePolicy::Minimum</enum> <string>Rotate color scheme for all curves</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Recolor</string>
<width>20</width> </property>
<height>0</height> </widget>
</size> </item>
</property> <item>
</spacer> <spacer name="verticalSpacer">
</item> <property name="orientation">
</layout> <enum>Qt::Vertical</enum>
</item> </property>
</layout> <property name="sizeType">
</item> <enum>QSizePolicy::Minimum</enum>
</layout> </property>
</item> <property name="sizeHint" stdset="0">
</layout> <size>
</widget> <width>20</width>
</item> <height>0</height>
<item row="0" column="2" rowspan="3"> </size>
<widget class="QGroupBox" name="diagramGroupBox"> </property>
<property name="sizePolicy"> </spacer>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> </item>
<horstretch>0</horstretch> </layout>
<verstretch>0</verstretch> </item>
</sizepolicy> </layout>
</property> </item>
<property name="minimumSize"> </layout>
<size> </item>
<width>200</width> </layout>
<height>200</height> </widget>
</size> <widget class="QWidget" name="diagramGroupBox" native="true"/>
</property>
<property name="baseSize">
<size>
<width>800</width>
<height>300</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="title">
<string>Diagram</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
......
src/ui/ParameterInterface.ui
View file @ c23ac709
...@@ -6,43 +6,25 @@ ...@@ -6,43 +6,25 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>335</width> <width>707</width>
<height>300</height> <height>572</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowstretch="2,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="100,1">
<property name="horizontalSpacing">
<number>5</number>
</property>
<property name="verticalSpacing">
<number>2</number>
</property>
<property name="margin"> <property name="margin">
<number>6</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QStackedWidget" name="stackedWidget">
<property name="title"> <property name="currentIndex">
<string>Onboard Parameters</string> <number>-1</number>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<number>3</number>
</property>
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item>
<widget class="QStackedWidget" name="sensorSettings"> <widget class="QStackedWidget" name="sensorSettings">
<property name="currentIndex"> <property name="currentIndex">
<number>-1</number> <number>-1</number>
......
src/ui/QGCParamWidget.cc
View file @ c23ac709
...@@ -58,7 +58,7 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) : ...@@ -58,7 +58,7 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) :
tree = new QTreeWidget(this); tree = new QTreeWidget(this);
statusLabel = new QLabel(); statusLabel = new QLabel();
statusLabel->setAutoFillBackground(true); statusLabel->setAutoFillBackground(true);
tree->setColumnWidth(0, 175); tree->setColumnWidth(70, 30);
// Set tree widget as widget onto this component // Set tree widget as widget onto this component
QGridLayout* horizontalLayout; QGridLayout* horizontalLayout;
...@@ -67,8 +67,8 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) : ...@@ -67,8 +67,8 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) :
horizontalLayout->setHorizontalSpacing(6); horizontalLayout->setHorizontalSpacing(6);
horizontalLayout->setVerticalSpacing(6); horizontalLayout->setVerticalSpacing(6);
horizontalLayout->setMargin(0); horizontalLayout->setMargin(0);
//horizontalLayout->setSizeConstraint(QLayout::SetMinimumSize); horizontalLayout->setSizeConstraint(QLayout::SetMinimumSize);
horizontalLayout->setSizeConstraint( QLayout::SetFixedSize ); //horizontalLayout->setSizeConstraint( QLayout::SetFixedSize );
// Parameter tree // Parameter tree
horizontalLayout->addWidget(tree, 0, 0, 1, 3); horizontalLayout->addWidget(tree, 0, 0, 1, 3);
......
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