Browse Source

Minor improvements

QGC4.4
lm 15 years ago
parent
commit
c479b09d4f
  1. 1
      src/ui/HSIDisplay.cc
  2. 19
      src/ui/UASControl.ui
  3. 64
      src/ui/UASInfo.ui

1
src/ui/HSIDisplay.cc

@ -665,6 +665,7 @@ void HSIDisplay::drawWaypoints(QPainter& painter)
QPen pen(color); QPen pen(color);
pen.setWidthF(refLineWidthToPen(0.4f)); pen.setWidthF(refLineWidthToPen(0.4f));
painter.setPen(pen); painter.setPen(pen);
painter.setBrush(Qt::NoBrush);
// Draw line from last waypoint to this one // Draw line from last waypoint to this one
if (!lastWaypoint.isNull()) if (!lastWaypoint.isNull())

19
src/ui/UASControl.ui

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>380</width> <width>280</width>
<height>190</height> <height>164</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>280</width>
<height>130</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowminimumheight="0,0,0,0,0,0,100"> <layout class="QGridLayout" name="gridLayout" rowminimumheight="5,10,10,0,10,5,0">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>6</number>
</property> </property>
@ -147,10 +153,13 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>0</width>
<height>0</height> <height>1</height>
</size> </size>
</property> </property>
</spacer> </spacer>

64
src/ui/UASInfo.ui

@ -287,7 +287,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>CPU Load</string> <string>MCU Load</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -370,14 +370,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="6"> <item row="5" column="0" colspan="6">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="7"> <item row="7" column="0" colspan="7">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -393,13 +393,69 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0" colspan="6"> <item row="6" column="0" colspan="6">
<widget class="QLabel" name="errorLabel"> <widget class="QLabel" name="errorLabel">
<property name="text"> <property name="text">
<string>No error status received yet</string> <string>No error status received yet</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>CPU Load</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QLabel" name="label_10">
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item row="4" column="4" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>20</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>18</height>
</size>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>13</width>
<height>15</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

Loading…
Cancel
Save