Merge pull request #1180 from srcejon/adsb_splitter

ADS-B: Use QSplitter for table and map
pull/1182/head
Edouard Griffiths 2022-03-20 12:13:03 +01:00 zatwierdzone przez GitHub
commit 9a2ba902c7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 469 dodań i 472 usunięć

Wyświetl plik

@ -457,7 +457,7 @@
<string>Correlation threshold in dB. Lower values will increase the number of frames that can be received, but require more processing and possibly result in invalid frames.</string>
</property>
<property name="minimum">
<number>0</number>
<number>10</number>
</property>
<property name="maximum">
<number>200</number>
@ -767,456 +767,13 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="dataContainer" native="true">
<widget class="QWidget" name="mapContainer" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>140</y>
<width>600</width>
<height>270</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>600</width>
<height>270</height>
</size>
</property>
<property name="windowTitle">
<string>ADS-B Data</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QTableWidget" name="adsbData">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<column>
<property name="text">
<string>ICAO ID</string>
</property>
<property name="toolTip">
<string extracomment="Double click to search for the aircraft on www.planespotters.net">Aircraft International Civil Aviation Organization identifier. Links to www.planespotters.net</string>
</property>
</column>
<column>
<property name="text">
<string>Callsign</string>
</property>
<property name="toolTip">
<string>Callsign. Links to www.flightradar24.com</string>
</property>
</column>
<column>
<property name="text">
<string>Aircraft</string>
</property>
<property name="toolTip">
<string>Aircraft model</string>
</property>
</column>
<column>
<property name="text">
<string>Airline</string>
</property>
<property name="toolTip">
<string>Airline logo</string>
</property>
</column>
<column>
<property name="text">
<string>Alt (ft)</string>
</property>
<property name="toolTip">
<string>Altitude in feet or metres</string>
</property>
</column>
<column>
<property name="text">
<string>Spd (kn)</string>
</property>
<property name="toolTip">
<string>Speed in knots or kilometres per hour</string>
</property>
</column>
<column>
<property name="text">
<string>Hd (°)</string>
</property>
<property name="toolTip">
<string>Aircraft heading in degrees</string>
</property>
</column>
<column>
<property name="text">
<string>VR (ft/m)</string>
</property>
<property name="toolTip">
<string>Vertical climb rate in feet per minute or metres per second</string>
</property>
</column>
<column>
<property name="text">
<string>D (km)</string>
</property>
<property name="toolTip">
<string>Range or distance of aircraft from home location</string>
</property>
</column>
<column>
<property name="text">
<string>Az/El (°)</string>
</property>
<property name="toolTip">
<string>Azimuth and elevation to aircraft from My Position. Double click to set as target.</string>
</property>
</column>
<column>
<property name="text">
<string>Lat (°)</string>
</property>
<property name="toolTip">
<string extracomment="Double click to centre the map on this aircraft">Latitude in degrees postive towards the North</string>
</property>
</column>
<column>
<property name="text">
<string>Lon (°)</string>
</property>
<property name="toolTip">
<string extracomment="Double click to centre the map on this aircraft">Longitude in degrees. Positive towards the East</string>
</property>
</column>
<column>
<property name="text">
<string>Cat</string>
</property>
<property name="toolTip">
<string>Aircraft standard category</string>
</property>
</column>
<column>
<property name="text">
<string>Status</string>
</property>
<property name="toolTip">
<string>Aircraft emergency status</string>
</property>
</column>
<column>
<property name="text">
<string>Squawk</string>
</property>
<property name="toolTip">
<string>Mode-A transponder code</string>
</property>
</column>
<column>
<property name="text">
<string>Reg</string>
</property>
<property name="toolTip">
<string>Aircraft registration</string>
</property>
</column>
<column>
<property name="text">
<string>Country</string>
</property>
<property name="toolTip">
<string>Country of registration</string>
</property>
</column>
<column>
<property name="text">
<string>Registered</string>
</property>
<property name="toolTip">
<string>Date aircraft was registered</string>
</property>
</column>
<column>
<property name="text">
<string>Manufacturer</string>
</property>
<property name="toolTip">
<string>Aircraft manufacturer</string>
</property>
</column>
<column>
<property name="text">
<string>Owner</string>
</property>
<property name="toolTip">
<string>Owner of the aircraft</string>
</property>
</column>
<column>
<property name="text">
<string>Operator</string>
</property>
<property name="toolTip">
<string>Aircraft operator ICAO code</string>
</property>
</column>
<column>
<property name="text">
<string>Updated</string>
</property>
<property name="toolTip">
<string>Time when the last ADS-B message from this aircraft was received.</string>
</property>
</column>
<column>
<property name="text">
<string>Frames</string>
</property>
<property name="toolTip">
<string>Number of ADS-B frames received from this aircraft</string>
</property>
</column>
<column>
<property name="text">
<string>Correlation</string>
</property>
<property name="toolTip">
<string>Correlation values for received frames. min/avg/max</string>
</property>
</column>
<column>
<property name="text">
<string>RSSI</string>
</property>
</column>
<column>
<property name="text">
<string>Flight Status</string>
</property>
<property name="toolTip">
<string>Status of flight</string>
</property>
</column>
<column>
<property name="text">
<string>Dep</string>
</property>
<property name="toolTip">
<string>Departure airport</string>
</property>
</column>
<column>
<property name="text">
<string>Arr</string>
</property>
<property name="toolTip">
<string>Arrival airport</string>
</property>
</column>
<column>
<property name="text">
<string>STD</string>
</property>
<property name="toolTip">
<string>Scheduled time of departure</string>
</property>
</column>
<column>
<property name="text">
<string>ETD</string>
</property>
<property name="toolTip">
<string>Estimated time of departure</string>
</property>
</column>
<column>
<property name="text">
<string>ATD</string>
</property>
<property name="toolTip">
<string>Actual time of departure</string>
</property>
</column>
<column>
<property name="text">
<string>STA</string>
</property>
<property name="toolTip">
<string>Scheduled time of arrival</string>
</property>
</column>
<column>
<property name="text">
<string>ETA</string>
</property>
<property name="toolTip">
<string>Estimated time of arrival</string>
</property>
</column>
<column>
<property name="text">
<string>ATA</string>
</property>
<property name="toolTip">
<string>Actual time of arrival</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="photoLayout">
<property name="spacing">
<number>4</number>
</property>
<item>
<layout class="QHBoxLayout" name="photoHeaderLayout">
<property name="spacing">
<number>4</number>
</property>
<item>
<widget class="QLabel" name="photoHeader">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="photoFlag">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="ClickableLabel" name="photo">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="flightDetails">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="aircraftDetails">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="photoVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="mapContainer" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>450</y>
<width>600</width>
<height>581</height>
<height>600</height>
</rect>
</property>
<property name="sizePolicy">
@ -1232,49 +789,489 @@
</size>
</property>
<property name="windowTitle">
<string>Map</string>
<string>ADS-B Data</string>
</property>
<layout class="QVBoxLayout" name="verticalLayoutMap" stretch="0">
<property name="spacing">
<number>2</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>3</number>
<number>0</number>
</property>
<property name="topMargin">
<number>3</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>3</number>
<number>0</number>
</property>
<item>
<widget class="QQuickWidget" name="map">
<widget class="QSplitter" name="splitter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>500</height>
</size>
</property>
<property name="toolTip">
<string>Aircraft map</string>
</property>
<property name="resizeMode">
<enum>QQuickWidget::SizeRootObjectToView</enum>
</property>
<property name="source">
<url>
<string/>
</url>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QWidget" name="dataContainer" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>600</width>
<height>150</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QTableWidget" name="adsbData">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<column>
<property name="text">
<string>ICAO ID</string>
</property>
<property name="toolTip">
<string extracomment="Double click to search for the aircraft on www.planespotters.net">Aircraft International Civil Aviation Organization identifier. Links to www.planespotters.net</string>
</property>
</column>
<column>
<property name="text">
<string>Callsign</string>
</property>
<property name="toolTip">
<string>Callsign. Links to www.flightradar24.com</string>
</property>
</column>
<column>
<property name="text">
<string>Aircraft</string>
</property>
<property name="toolTip">
<string>Aircraft model</string>
</property>
</column>
<column>
<property name="text">
<string>Airline</string>
</property>
<property name="toolTip">
<string>Airline logo</string>
</property>
</column>
<column>
<property name="text">
<string>Alt (ft)</string>
</property>
<property name="toolTip">
<string>Altitude in feet or metres</string>
</property>
</column>
<column>
<property name="text">
<string>Spd (kn)</string>
</property>
<property name="toolTip">
<string>Speed in knots or kilometres per hour</string>
</property>
</column>
<column>
<property name="text">
<string>Hd (°)</string>
</property>
<property name="toolTip">
<string>Aircraft heading in degrees</string>
</property>
</column>
<column>
<property name="text">
<string>VR (ft/m)</string>
</property>
<property name="toolTip">
<string>Vertical climb rate in feet per minute or metres per second</string>
</property>
</column>
<column>
<property name="text">
<string>D (km)</string>
</property>
<property name="toolTip">
<string>Range or distance of aircraft from home location</string>
</property>
</column>
<column>
<property name="text">
<string>Az/El (°)</string>
</property>
<property name="toolTip">
<string>Azimuth and elevation to aircraft from My Position. Double click to set as target.</string>
</property>
</column>
<column>
<property name="text">
<string>Lat (°)</string>
</property>
<property name="toolTip">
<string extracomment="Double click to centre the map on this aircraft">Latitude in degrees postive towards the North</string>
</property>
</column>
<column>
<property name="text">
<string>Lon (°)</string>
</property>
<property name="toolTip">
<string extracomment="Double click to centre the map on this aircraft">Longitude in degrees. Positive towards the East</string>
</property>
</column>
<column>
<property name="text">
<string>Cat</string>
</property>
<property name="toolTip">
<string>Aircraft standard category</string>
</property>
</column>
<column>
<property name="text">
<string>Status</string>
</property>
<property name="toolTip">
<string>Aircraft emergency status</string>
</property>
</column>
<column>
<property name="text">
<string>Squawk</string>
</property>
<property name="toolTip">
<string>Mode-A transponder code</string>
</property>
</column>
<column>
<property name="text">
<string>Reg</string>
</property>
<property name="toolTip">
<string>Aircraft registration</string>
</property>
</column>
<column>
<property name="text">
<string>Country</string>
</property>
<property name="toolTip">
<string>Country of registration</string>
</property>
</column>
<column>
<property name="text">
<string>Registered</string>
</property>
<property name="toolTip">
<string>Date aircraft was registered</string>
</property>
</column>
<column>
<property name="text">
<string>Manufacturer</string>
</property>
<property name="toolTip">
<string>Aircraft manufacturer</string>
</property>
</column>
<column>
<property name="text">
<string>Owner</string>
</property>
<property name="toolTip">
<string>Owner of the aircraft</string>
</property>
</column>
<column>
<property name="text">
<string>Operator</string>
</property>
<property name="toolTip">
<string>Aircraft operator ICAO code</string>
</property>
</column>
<column>
<property name="text">
<string>Updated</string>
</property>
<property name="toolTip">
<string>Time when the last ADS-B message from this aircraft was received.</string>
</property>
</column>
<column>
<property name="text">
<string>Frames</string>
</property>
<property name="toolTip">
<string>Number of ADS-B frames received from this aircraft</string>
</property>
</column>
<column>
<property name="text">
<string>Correlation</string>
</property>
<property name="toolTip">
<string>Correlation values for received frames. min/avg/max</string>
</property>
</column>
<column>
<property name="text">
<string>RSSI</string>
</property>
</column>
<column>
<property name="text">
<string>Flight Status</string>
</property>
<property name="toolTip">
<string>Status of flight</string>
</property>
</column>
<column>
<property name="text">
<string>Dep</string>
</property>
<property name="toolTip">
<string>Departure airport</string>
</property>
</column>
<column>
<property name="text">
<string>Arr</string>
</property>
<property name="toolTip">
<string>Arrival airport</string>
</property>
</column>
<column>
<property name="text">
<string>STD</string>
</property>
<property name="toolTip">
<string>Scheduled time of departure</string>
</property>
</column>
<column>
<property name="text">
<string>ETD</string>
</property>
<property name="toolTip">
<string>Estimated time of departure</string>
</property>
</column>
<column>
<property name="text">
<string>ATD</string>
</property>
<property name="toolTip">
<string>Actual time of departure</string>
</property>
</column>
<column>
<property name="text">
<string>STA</string>
</property>
<property name="toolTip">
<string>Scheduled time of arrival</string>
</property>
</column>
<column>
<property name="text">
<string>ETA</string>
</property>
<property name="toolTip">
<string>Estimated time of arrival</string>
</property>
</column>
<column>
<property name="text">
<string>ATA</string>
</property>
<property name="toolTip">
<string>Actual time of arrival</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="photoLayout">
<property name="spacing">
<number>4</number>
</property>
<item>
<layout class="QHBoxLayout" name="photoHeaderLayout">
<property name="spacing">
<number>4</number>
</property>
<item>
<widget class="QLabel" name="photoHeader">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="photoFlag">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="ClickableLabel" name="photo">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="flightDetails">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="aircraftDetails">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="photoVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QQuickWidget" name="map">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>3</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="toolTip">
<string>Aircraft map</string>
</property>
<property name="resizeMode">
<enum>QQuickWidget::SizeRootObjectToView</enum>
</property>
<property name="source">
<url>
<string/>
</url>
</property>
</widget>
</widget>
</item>
</layout>