Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added bearing pointer for Radio1 and 2 #17

Merged
merged 6 commits into from
Jan 31, 2024
Merged

Added bearing pointer for Radio1 and 2 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b52c073
Added a bearing pointer to the HSI widget for projects using pyG5 as …
timsschoen Dec 12, 2023
86ba603
Added the bearing in the view Tester
blauret Dec 12, 2023
950e89a
Added Network request for the bearing
blauret Dec 12, 2023
af71526
Added text box for bearings indication
blauret Dec 13, 2023
50516a1
Updated reference picture in the documentation
blauret Dec 13, 2023
b2c50c6
Added DME display depending on HSI source
blauret Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/demoView.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions pyG5/pyG5Network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,38 @@ def __init__(self, parent=None):
# list the datarefs to request
self.datarefs = [
# ( dataref, frequency, unit, description, num decimals to display in formatted output )
(
"sim/cockpit/radios/nav1_dme_dist_m",
30,
"kt",
"dme Range anv1",
0,
"_nav1dme",
),
(
"sim/cockpit/radios/nav2_dme_dist_m",
30,
"kt",
"dme Range nav2",
0,
"_nav2dme",
),
(
"sim/cockpit2/radios/indicators/nav1_bearing_deg_mag",
30,
"degrees",
"Nav bearing",
0,
"_nav1bearing",
),
(
"sim/cockpit2/radios/indicators/nav2_bearing_deg_mag",
30,
"degrees",
"Nav bearing",
0,
"_nav2bearing",
),
(
"sim/cockpit2/autopilot/altitude_hold_ft",
20,
Expand Down
238 changes: 233 additions & 5 deletions pyG5/pyG5View.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ def __init__(self, parent=None):
("nav2gs", 0),
("nav1dft", 0),
("nav2dft", 0),
("nav1bearing", 0),
("nav2bearing", 0),
("nav1dme", 0),
("nav2dme", 0),
("gpsdft", 0),
("gpsgsavailable", 0),
("gpsvnavavailable", 0),
Expand Down Expand Up @@ -1072,6 +1076,97 @@ def paintEvent(self, event):
vertAvailable = self._nav1gsavailable
gsDev = self._nav1gs

# bearing 1
if int(self._nav1fromto) != 0:
self.qp.rotate(90 - self._headingBug + self._nav1bearing)

self.setPen(2, Qt.GlobalColor.cyan)

# upside
self.qp.drawPolyline(
QPolygonF(
[
QPointF(rotatinghsiCircleRadius - 25, 0),
QPointF(hsiCircleRadius, 0),
]
)
)
# backside
self.qp.drawPolyline(
QPolygonF(
[
QPointF(-rotatinghsiCircleRadius + 25, 0),
QPointF(-hsiCircleRadius, 0),
]
)
)
# arrow
self.qp.drawPolyline(
QPolygonF(
[
QPointF(hsiCircleRadius + 20, -10),
QPointF(hsiCircleRadius + 30, 0),
QPointF(hsiCircleRadius + 20, 10),
]
)
)

self.qp.rotate(-90 + self._headingBug - self._nav1bearing)

# bearing 2
if int(self._nav2fromto) != 0:
self.qp.rotate(90 - self._headingBug + self._nav2bearing)

self.setPen(2, Qt.GlobalColor.cyan)

# backside
self.qp.drawPolyline(
QPolygonF(
[
QPointF(-hsiCircleRadius, -5),
QPointF(-hsiCircleRadius - 25, -5),
QPointF(-hsiCircleRadius - 30, 0),
QPointF(-rotatinghsiCircleRadius + 25, 0),
QPointF(-hsiCircleRadius - 30, 0),
QPointF(-hsiCircleRadius - 25, +5),
QPointF(-hsiCircleRadius, +5),
]
)
)

# upside
self.qp.drawPolyline(
QPolygonF(
[
QPointF(rotatinghsiCircleRadius - 42, -5),
QPointF(hsiCircleRadius, -5),
]
)
)
self.qp.drawPolyline(
QPolygonF(
[
QPointF(rotatinghsiCircleRadius - 42, +5),
QPointF(hsiCircleRadius, +5),
]
)
)
# arrow
self.qp.drawPolyline(
QPolygonF(
[
QPointF(hsiCircleRadius + 25, -10),
QPointF(hsiCircleRadius + 35, 0),
QPointF(hsiCircleRadius + 45, 0),
QPointF(hsiCircleRadius + 35, 0),
QPointF(hsiCircleRadius + 25, 10),
]
)
)

self.qp.rotate(-90 + self._headingBug - self._nav2bearing)

self.setPen(1, Qt.GlobalColor.black)
self.qp.setBrush(QBrush(navColor))
# Draw the CDI
self.qp.rotate(90 - self._headingBug + navcrs)
Expand Down Expand Up @@ -1178,13 +1273,14 @@ def paintEvent(self, event):
)

# Draw the heading Bug indicator bottom corner
self.setPen(2, Qt.GlobalColor.cyan)
self.setPen(2, Qt.GlobalColor.gray)
self.qp.setBrush(QBrush(Qt.GlobalColor.black))

headingWidth = 105
headingHeigth = 30
self.qp.drawRect(QRectF(g5Width, g5Height, -headingWidth, -headingHeigth))

self.setPen(2, Qt.GlobalColor.cyan)
# draw the bug symbol
self.setPen(1, Qt.GlobalColor.cyan)
self.qp.setBrush(QBrush(Qt.GlobalColor.cyan))
Expand All @@ -1211,7 +1307,11 @@ def paintEvent(self, event):
)

# draw the dist box
if int(self._hsiSource) == 2:
if (
int(self._hsiSource) == 2
or (int(self._hsiSource) == 1 and int(self._nav2fromto) != 0)
or (int(self._hsiSource) == 0 and int(self._nav1fromto) != 0)
):
font.setPixelSize(12)
font.setBold(False)
self.qp.setFont(font)
Expand All @@ -1231,12 +1331,18 @@ def paintEvent(self, event):
font.setBold(True)
self.qp.setFont(font)
self.setPen(1, navColor)
if int(self._hsiSource) == 2:
dist = self._gpsdmedist
elif int(self._hsiSource) == 1:
dist = self._nav2dme
else:
dist = self._nav1dme

distRect = QRectF(g5Width - 105, 12, 105, 45 - 12)
self.qp.drawText(
distRect,
Qt.AlignmentFlag.AlignCenter,
"{}".format(round(self._gpsdmedist, 1)),
"{}".format(round(dist, 1)),
)

# set default font size
Expand Down Expand Up @@ -1445,11 +1551,133 @@ def paintEvent(self, event):

self.qp.resetTransform()

# draw the CRS selection

crsBoxHeight = 30
crsBoxWidth = 105

# draw the Selected Nav Bearing type
self.setPen(2, greyColor)
self.qp.setBrush(QBrush(Qt.GlobalColor.black))

if int(self._nav1fromto) != 0:
# draw the contour
self.qp.drawPolyline(
QPolygonF(
[
QPointF(0, g5Height - crsBoxHeight),
QPointF(0, g5Height - 3 * crsBoxHeight),
QPointF(60, g5Height - 3 * crsBoxHeight),
]
)
)

# draw the contour arc
self.qp.drawArc(
QRectF(g5Width / 2 - 195, g5Height / 2 - 185, 390, 390),
3268,
350,
)

# set color to cyan and draw the bearing symbol
self.setPen(2, Qt.GlobalColor.cyan)

self.qp.drawPolyline(
QPolygonF(
[
QPointF(10, g5Height - 2.5 * crsBoxHeight),
QPointF(50, g5Height - 2.5 * crsBoxHeight),
]
)
)
self.qp.drawPolyline(
QPolygonF(
[
QPointF(30, g5Height - 2.8 * crsBoxHeight),
QPointF(40, g5Height - 2.5 * crsBoxHeight),
QPointF(30, g5Height - 2.2 * crsBoxHeight),
]
)
)

# draw the nav type
self.qp.drawText(
QRectF(
QPointF(0, g5Height - crsBoxHeight),
QPointF(crsBoxWidth, g5Height - 2 * crsBoxHeight),
),
Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignVCenter,
"{}".format(self.getNavTypeString(self._nav1type, "")),
)

if int(self._nav2fromto) != 0 and vertAvailable == 0:
# set color to grey
self.setPen(2, Qt.GlobalColor.gray)

# draw the contour
self.qp.drawPolyline(
QPolygonF(
[
QPointF(g5Width, g5Height - crsBoxHeight),
QPointF(g5Width, g5Height - 3 * crsBoxHeight),
QPointF(g5Width - 60, g5Height - 3 * crsBoxHeight),
]
)
)

# draw the contour arc
self.qp.drawArc(
QRectF(g5Width / 2 - 195, g5Height / 2 - 185, 390, 390),
5036,
335,
)

# set color to cyan and draw the bearing symbol
self.setPen(2, Qt.GlobalColor.cyan)
self.qp.drawPolyline(
QPolygonF(
[
QPointF(g5Width - 40, g5Height - 2.5 * crsBoxHeight),
QPointF(g5Width - 50, g5Height - 2.5 * crsBoxHeight),
]
)
)
self.qp.drawPolyline(
QPolygonF(
[
QPointF(g5Width - 10, g5Height - 2.5 * crsBoxHeight + 5),
QPointF(g5Width - 34, g5Height - 2.5 * crsBoxHeight + 5),
]
)
)
self.qp.drawPolyline(
QPolygonF(
[
QPointF(g5Width - 10, g5Height - 2.5 * crsBoxHeight - 5),
QPointF(g5Width - 34, g5Height - 2.5 * crsBoxHeight - 5),
]
)
)
self.qp.drawPolyline(
QPolygonF(
[
QPointF(g5Width - 30, g5Height - 2.8 * crsBoxHeight),
QPointF(g5Width - 40, g5Height - 2.5 * crsBoxHeight),
QPointF(g5Width - 30, g5Height - 2.2 * crsBoxHeight),
]
)
)

# draw the nav type
self.qp.drawText(
QRectF(
QPointF(g5Width, g5Height - crsBoxHeight),
QPointF(g5Width - crsBoxWidth, g5Height - 2 * crsBoxHeight),
),
Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignVCenter,
"{}".format(self.getNavTypeString(self._nav2type, "")),
)

# draw the CRS selection

self.setPen(2, greyColor)
self.qp.setBrush(QBrush(Qt.GlobalColor.black))

Expand Down
4 changes: 4 additions & 0 deletions pyG5/pyG5ViewTester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,14 @@ def makeControlDict(name, min, max):
makeControlDict("hsiSource", 0, 2),
makeControlDict("nav1crs", 0, 360),
makeControlDict("nav1dft", -3, 3),
makeControlDict("nav1fromto", 0, 1),
makeControlDict("nav1bearing", 0, 360),
makeControlDict("nav1gsavailable", 0, 1),
makeControlDict("nav1gs", -30, 30),
makeControlDict("nav2crs", 0, 360),
makeControlDict("nav2dft", -3, 3),
makeControlDict("nav2fromto", 0, 1),
makeControlDict("nav2bearing", 0, 360),
makeControlDict("nav2gsavailable", 0, 1),
makeControlDict("nav2gs", -30, 30),
makeControlDict("gpscrs", 0, 360),
Expand Down
Loading