sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nav: draw inactive lanes with 50% opacity (#25157)

Browse Source 
* nav: draw inactive lanes with 50% opacity

* update ts
pull/25154/head
Willem Melching 3 years ago committed by GitHub
parent a006cd168e
commit 49dd56fc24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      selfdrive/assets/navigation/direction_turn_left_inactive.png
  2. BIN
      selfdrive/assets/navigation/direction_turn_right_inactive.png
  3. BIN
      selfdrive/assets/navigation/direction_turn_straight_inactive.png
  4. 4
      selfdrive/ui/qt/maps/map.cc
  5. 10
      selfdrive/ui/translations/main_ko.ts
  6. 10
      selfdrive/ui/translations/main_zh-CHS.ts
  7. 10
      selfdrive/ui/translations/main_zh-CHT.ts

BIN
selfdrive/assets/navigation/direction_turn_left_inactive.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
selfdrive/assets/navigation/direction_turn_right_inactive.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
selfdrive/assets/navigation/direction_turn_straight_inactive.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

4
selfdrive/ui/qt/maps/map.cc
Unescape View File

@ -526,6 +526,10 @@ void MapInstructions::updateInstructions(cereal::NavInstruction::Reader instruct
fn += "turn_straight"; fn += "turn_straight";
} }
if (!active) {
fn += "_inactive";
}
auto icon = new QLabel; auto icon = new QLabel;
int wh = active ? 125 : 75; int wh = active ? 125 : 75;
icon->setPixmap(loadPixmap(fn + ICON_SUFFIX, {wh, wh}, Qt::IgnoreAspectRatio)); icon->setPixmap(loadPixmap(fn + ICON_SUFFIX, {wh, wh}, Qt::IgnoreAspectRatio));

10
selfdrive/ui/translations/main_ko.ts
Unescape View File

@ -338,27 +338,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="618"/> <location filename="../qt/maps/map.cc" line="622"/>
<source>eta</source> <source>eta</source>
<translation>도착</translation> <translation>도착</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="628"/> <location filename="../qt/maps/map.cc" line="632"/>
<source>min</source> <source>min</source>
<translation>분</translation> <translation>분</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="636"/>
<source>hr</source> <source>hr</source>
<translation>시간</translation> <translation>시간</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="652"/> <location filename="../qt/maps/map.cc" line="656"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="655"/> <location filename="../qt/maps/map.cc" line="659"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>

10
selfdrive/ui/translations/main_zh-CHS.ts
Unescape View File

@ -338,27 +338,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="618"/> <location filename="../qt/maps/map.cc" line="622"/>
<source>eta</source> <source>eta</source>
<translation>埃塔</translation> <translation>埃塔</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="628"/> <location filename="../qt/maps/map.cc" line="632"/>
<source>min</source> <source>min</source>
<translation>分钟</translation> <translation>分钟</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="636"/>
<source>hr</source> <source>hr</source>
<translation>小时</translation> <translation>小时</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="652"/> <location filename="../qt/maps/map.cc" line="656"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="655"/> <location filename="../qt/maps/map.cc" line="659"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>

10
selfdrive/ui/translations/main_zh-CHT.ts
Unescape View File

@ -338,27 +338,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="618"/> <location filename="../qt/maps/map.cc" line="622"/>
<source>eta</source> <source>eta</source>
<translation>埃塔</translation> <translation>埃塔</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="628"/> <location filename="../qt/maps/map.cc" line="632"/>
<source>min</source> <source>min</source>
<translation>分鐘</translation> <translation>分鐘</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="636"/>
<source>hr</source> <source>hr</source>
<translation>小時</translation> <translation>小時</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="652"/> <location filename="../qt/maps/map.cc" line="656"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="655"/> <location filename="../qt/maps/map.cc" line="659"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>

Write Preview
Loading…
Cancel
Save