rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-1543 Fix Sbas range - UI changes for resize behavior

Browse Source
This commit is contained in:
Laurent Lalanne 2014-10-20 11:30:05 +02:00
parent 1183155c65
commit ffa12e2513
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
View File

@ -129,8 +129,8 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
-satIcons[index]->boundingRect().center().y()); -satIcons[index]->boundingRect().center().y());
satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false); satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false);
// Show normal GPS or SBAS // Show normal GPS or SBAS (120 - 158 range)
if (prn > 120 && prn < 158) { if (prn > 119 && prn < 159) {
if (snr) { if (snr) {
satIcons[index]->setElementId("satellite-sbas"); satIcons[index]->setElementId("satellite-sbas");
} else { } else {

26
ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>768</width> <width>901</width>
<height>600</height> <height>651</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -52,7 +52,7 @@
<widget class="GpsSnrWidget" name="gpsSnrWidget"> <widget class="GpsSnrWidget" name="gpsSnrWidget">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -133,7 +133,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::Panel</enum>
</property> </property>
<property name="lineWidth"> <property name="lineWidth">
<number>0</number> <number>0</number>
@ -635,7 +635,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout2" stretch="0,0,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout2" stretch="0,0,0,0,0,0">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@ -694,6 +694,9 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
@ -745,6 +748,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

4
ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
View File

@ -104,8 +104,8 @@ void GpsSnrWidget::drawSat(int index)
QRectF boxRect = boxes[index]->boundingRect(); QRectF boxRect = boxes[index]->boundingRect();
// Change color for SBAS sat (Egnos, etc..) // Change color for SBAS sat (Egnos, etc..) 120 - 158 range
if (prn > 120 && prn < 158) { if (prn > 119 && prn < 159) {
boxes[index]->setBrush(QColor("#fd700b")); boxes[index]->setBrush(QColor("#fd700b"));
} else { } else {
boxes[index]->setBrush(QColor("Green")); boxes[index]->setBrush(QColor("Green"));