weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved map scale display

Browse Source
This commit is contained in:
Khopa 2021-02-27 00:29:23 +01:00
parent 6704cded2d
commit f314c08216
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
qt_ui/widgets/map/QLiberationMap.py
View File

@ -914,35 +914,48 @@ class QLiberationMap(QGraphicsView):
SMALL_LINE = 2 SMALL_LINE = 2
dist = self.distance_to_pixels(nautical_miles(scale_distance_nm)) dist = self.distance_to_pixels(nautical_miles(scale_distance_nm))
self.scene().addRect(
POS_X,
POS_Y - PADDING,
PADDING * 2 + dist,
BIG_LINE * 2 + 3 * PADDING,
pen=CONST.COLORS["black"],
brush=CONST.COLORS["black"],
)
l = self.scene().addLine( l = self.scene().addLine(
POS_X + PADDING, POS_X + PADDING,
POS_Y + BIG_LINE * 2, POS_Y + BIG_LINE * 2,
POS_X + PADDING + dist, POS_X + PADDING + dist,
POS_Y + BIG_LINE * 2, POS_Y + BIG_LINE * 2,
) )
l.setPen(CONST.COLORS["black"])
lw = self.scene().addLine(
POS_X + PADDING + 1,
POS_Y + BIG_LINE * 2 + 1,
POS_X + PADDING + dist + 1,
POS_Y + BIG_LINE * 2 + 1,
)
lw.setPen(CONST.COLORS["white"])
text = self.scene().addText( text = self.scene().addText(
"0nm", font=QFont("Trebuchet MS", 6, weight=5, italic=False) "0nm", font=QFont("Trebuchet MS", 6, weight=5, italic=False)
) )
text.setPos(POS_X, POS_Y + BIG_LINE * 2) text.setPos(POS_X, POS_Y + BIG_LINE * 2)
text.setDefaultTextColor(Qt.white) text.setDefaultTextColor(Qt.black)
text_white = self.scene().addText(
"0nm", font=QFont("Trebuchet MS", 6, weight=5, italic=False)
)
text_white.setPos(POS_X + 1, POS_Y + BIG_LINE * 2)
text_white.setDefaultTextColor(Qt.white)
text2 = self.scene().addText( text2 = self.scene().addText(
str(scale_distance_nm) + "nm", str(scale_distance_nm) + "nm",
font=QFont("Trebuchet MS", 6, weight=5, italic=False), font=QFont("Trebuchet MS", 6, weight=5, italic=False),
) )
text2.setPos(POS_X + dist, POS_Y + BIG_LINE * 2) text2.setPos(POS_X + dist, POS_Y + BIG_LINE * 2)
text2.setDefaultTextColor(Qt.white) text2.setDefaultTextColor(Qt.black)
text2_white = self.scene().addText(
str(scale_distance_nm) + "nm",
font=QFont("Trebuchet MS", 6, weight=5, italic=False),
)
text2_white.setPos(POS_X + dist + 1, POS_Y + BIG_LINE * 2)
text2_white.setDefaultTextColor(Qt.white)
l.setPen(CONST.COLORS["white"])
for i in range(number_of_points + 1): for i in range(number_of_points + 1):
d = float(i) / float(number_of_points) d = float(i) / float(number_of_points)
if i == 0 or i == number_of_points: if i == 0 or i == number_of_points:
@ -956,7 +969,15 @@ class QLiberationMap(QGraphicsView):
POS_X + PADDING + d * dist, POS_X + PADDING + d * dist,
POS_Y + BIG_LINE - h, POS_Y + BIG_LINE - h,
) )
l.setPen(CONST.COLORS["white"]) l.setPen(CONST.COLORS["black"])
lw = self.scene().addLine(
POS_X + PADDING + d * dist + 1,
POS_Y + BIG_LINE * 2,
POS_X + PADDING + d * dist + 1,
POS_Y + BIG_LINE - h,
)
lw.setPen(CONST.COLORS["white"])
def wheelEvent(self, event: QWheelEvent): def wheelEvent(self, event: QWheelEvent):
if event.angleDelta().y() > 0: if event.angleDelta().y() > 0: