Commit Graph

169 Commits

Author SHA1 Message Date
Dean Lee a50a9ef9b4 ui/map: hide icon if no maneuver type (#29084)
hide icon if no maneuver type
old-commit-hash: 202b2f2113d48f517c64f0daf9ad2d61fdb0b7a6
2023-08-17 02:05:19 -07:00
Dean Lee f667936f3a ui/map: show map on destination set/change (#29327)
* show map on dest set/change

* check for rcv_frame

* clear current_nav_dest

* restore allow_open

* use requestShow

* cleanup

* one check

* revert behavior changes

* Update selfdrive/ui/qt/maps/map.cc

* more obvious

* Update selfdrive/ui/qt/maps/map.cc

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 3a277f1b81fbb16673a77a475421a18751127cf2
2023-08-17 01:32:22 -07:00
Shane Smiskol 312d80c877 map: set destination marker visibility once (#29444)
set visibility once
old-commit-hash: da38aed48300ca1db0a1032c12c26b0268ebb03c
2023-08-17 01:02:59 -07:00
Dean Lee e0439a516f ui/map: assign the return value to last_position (#29341)
assign the return value directly to last_position
old-commit-hash: 613bbb7e6da40b313dea86af9bfae71c057b375d
2023-08-14 16:39:43 -07:00
Dean Lee 87c4c661c7 ui/map_instructions: set margin-top to UI_BORDER_SIZE (#29387)
old-commit-hash: 9071c8a4fcd392efd9b0533879ee080aff9cccac
2023-08-14 12:43:32 +01:00
Shane Smiskol d33545a0b6 ui/map_instructions: round <500 distances (#29333)
round
old-commit-hash: cc747e21666c6a6e382503eaf4cc29bfe3329635
2023-08-11 03:33:40 -07:00
Dean Lee b065f5c9a2 ui/map: fix CSS error (#29332)
fix css error
old-commit-hash: 4a89928a9a1eebcf46e789a2df037af66b087252
2023-08-11 03:31:13 -07:00
Shane Smiskol f8d9860d20 ui/map_instructions: clean up lane icon selection (#29330)
* draft

* revert

* remove extra directions

* more clean up

* add todo

* revert rename

* I assume this is moot, but preserve behavior

* spacing
old-commit-hash: 52675b2739de56a9b5784ba8016791cdb5286085
2023-08-11 03:27:32 -07:00
Dean Lee eb695a00c2 ui/map: check NavDestination only if navInstruction is invalid (#29331)
* check NavDestination only if navInstruction is invalid

* Update selfdrive/ui/qt/maps/map.cc

Co-authored-by: Shane Smiskol <shane@smiskol.com>

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 80356b34f1c189bee4287c0b70c3e6a18e105cc3
2023-08-11 03:26:08 -07:00
Dean Lee a494b38f6e ui/map: set WA_NoMousePropagation to prevent mouse event from propagating up (#29329)
set WA_NoMousePropagation
old-commit-hash: 15bb9dd09612bc23cc0d59da6fafd74669e1190e
2023-08-11 02:45:54 -07:00
eFini e90ced8449 map ui: Fixed ETA text alignment issue in CJK (#29311)
fixed ETA text alignment issue in CJK
old-commit-hash: 8d7e909b539ee5e8411ccb7e3375a74dc6c86c2d
2023-08-10 02:15:43 -07:00
Cameron Clough 6ed5aca05a ui/map: update mapbox style (#29186)
old-commit-hash: 748238f87cbce5e05ffa06a49f490012d5424864
2023-08-08 20:18:49 +01:00
Shane Smiskol 7b1fa23144 map: fix exit lane direction when active (#29159)
* fix

* clean up

* comment
old-commit-hash: cffc14e4d8da259c6b69708868c9bef8d0a6febd
2023-08-05 04:02:18 -07:00
Shane Smiskol ec900d0389 navd: don't use empty last step banner instructions (#29034)
* fix empty banner instructions when arriving at destination

* bug fixes

* hide distance on arrival

* stash

* simpler

* can also do this, but i don't like modifying the response

* clean up

* rm

* revert

* rm

* flip this order

* move up

* need to flip order

* Revert "need to flip order"

This reverts commit ba961b8e6aa5d9490ab0dc661866cff9c72db91d.

* Revert "move up"

This reverts commit f1a4d8ae883080d52547fdaf9472457050e40669.

* Update selfdrive/navd/navd.py
old-commit-hash: 412ed6a017acef84e42395299042717d7120544b
2023-07-25 01:28:17 -07:00
Shane Smiskol d4ec764235 ui: new nav settings button (#29068)
* add image

* remove extra spacing

* add images

* use nav-settings-square-smaller.png

* draft

* clean up

* kinda works!

* nop need to update state

* can just use clicked

* MORE

* remove old button

* slightly smaller (todo change image))

* this works but is ugly

* remove old settings button

* draft

* no it's not

* draft 2.0

* clean up

* clean up

* let's make map_settings_btn public

* since we don't have map, use enabled

* fix image size

* can do clean up in another PR

show

* add line

* rename

* useless spacing

* use old nav icon

* handle DM icon (and test)

* clean up

* no reason

* remove old image

* don't use setCurrentIndex

* Revert "don't use setCurrentIndex"

This reverts commit 6fde765a3cd3a9ee39205614587a23fbfbc60950.

* also can use a ternary

* seems cleanest

This reverts commit f9287230704b94f46b6bb5376d9a17075a20caf7.
old-commit-hash: 0dd1dcc7d06e8d5873dc9a2fa5c3e220295bfc1c
2023-07-24 22:27:01 -07:00
Shane Smiskol 6d9a313f19 ui/map: hide settings with showing map (#29127)
consistent map showing behavior
old-commit-hash: 13dc0325b237a378304bf2a54b66ecb501fc2bea
2023-07-24 18:25:46 -07:00
Dean Lee 8d2a08723a ui/map: remove unused variables (#29098)
old-commit-hash: 980ba1312fc587b735c71887251e16dd20f6cec3
2023-07-22 12:24:16 -07:00
Dean Lee ee42f316d7 ui/MapSettings: remove function shorten (#29078)
old-commit-hash: cc551fe24bf62e1825b36b1b9d37df34e84b0188
2023-07-21 19:51:25 +01:00
Shane Smiskol b8bf3fc0c2 nav: improve no route alert text (#29076)
* kind of

* Revert "kind of"

This reverts commit 25abbbf1764b0f7e8fbcb83e37159ba6f8cdf641.

* more generic alert text, whenever we're waiting for navd.

* actual better comment

* update translations
old-commit-hash: d70c4916db0af3c5288034db9a361fd0aff39f7b
2023-07-20 22:40:31 -07:00
Dean Lee 9865a32252 ui/map: fix ETA widget text spacing (#29065)
* fix eta spacing

* fix unit color

---------

Co-authored-by: Justin Newberry <jnewberry0502@gmail.com>
old-commit-hash: 0b8d35b132de6249640a2b8b46bdb1018dc8560c
2023-07-20 21:10:17 -07:00
Shane Smiskol a069514c36 ui: set global map transition duration (#29061)
* this works!

* revert properties

* more clean up

* more

* more

* add comment

* final
old-commit-hash: e4dc86f44d6efc6153f8ace852a63802e4a65ca4
2023-07-20 16:11:23 -07:00
Dean Lee 7d5d1b1e70 ui/map: move MapInstructions & MapETA to separate files (#28976)
old-commit-hash: 942a2f97608b0b371c5ca48564d83b3744c82c77
2023-07-20 21:58:46 +01:00
Shane Smiskol a7b32acd4b nav: show warning for routing problems (#29055)
* all my debugging stuff

* this works

* add comment

* bb navd

* navInstruction is valid when we get a non-empty route response

* now don't need this

* stash

* big cleanup

* clean up

* clean up

* debug

* final clean up

* one line

* flip order

* update translations

* is this simpler?
old-commit-hash: 5b368a67eadff384e8c38085a5e8f10ecd37c1e5
2023-07-20 04:01:55 -07:00
Shane Smiskol 3a41e53b08 nav: set icon anchor for destination pin (#29054)
* anchor!

* whoops

* fix anchor
old-commit-hash: d0ea8be95fd5900930070b55c8582bafd329639e
2023-07-20 01:28:21 -07:00
Mitchell Goff 949375984f nav: draw destination pin on top of navigation path (#29050)
* Draw destination pin on top of navigation path

* fix draw ordering

fix draw ordering

* add todo

* rename to feature

* draft

* clean up

* testing

* testing 2

* Revert "testing 2"

This reverts commit fc236aafbc14bbdc5ddb52fb56265302247ddf4b.

* Revert "testing"

This reverts commit 982a508ad701268ebdae910980fd5464454f44a8.

* clean up

* add todo

* show!

* Update selfdrive/ui/qt/maps/map.cc

* lgtm

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: ba03e9429044e40477c3b1f38737688f5a24f4b4
2023-07-20 00:54:42 -07:00
Shane Smiskol 372ae37d91 nav: show green path when enabled (#29020)
* draft

* draft

* clean up

* clean up

* cleaner

* needs to be here to work

* or this works

* works too

* stash

* clean up qdebugs

* revert to master

* reapply changes

add bool

* consistent cmts

* clean up

* can be simpler combined

* clean up/fix
old-commit-hash: 7a673c87ffd8bac16debd306977d00e0db156360
2023-07-18 15:52:59 -07:00
Shane Smiskol d38f321d6e nav: show when using navigate on openpilot (#28958)
* draft

* clean up

* helper

* comment

* debug

* Revert "debug"

This reverts commit d30ff3e996e73818e14f28b51afed206337bf6da.

* nav path

* transition

* revert width transition

revert width transition

* 400 is better, hard to see flicker at 500

* add width back

* tune

* tune

* 12 might be good

* 400ms is good

* lower case company lcc

* up here

* up here

* clean up

* multiple lines

* self explanetory
old-commit-hash: 358a86b63682c4ed5d570020d254a9654c0d61df
2023-07-17 21:28:10 -07:00
Dean Lee 8c026eff7c ui/MapSettings: remove call to clearLayout (#28961)
old-commit-hash: 1afdca2ef1a0d2ae9d0ad03205667dc644e319ac
2023-07-17 15:32:28 +01:00
Dean Lee e8478e81c7 ui/map: update destination on param change (#28957)
* update destination on param change

* use ParamWatcher

* remove include
old-commit-hash: d47d8808d1f973e4765a3fc806bcce6d33681048
2023-07-16 13:48:33 -07:00
Dean Lee cba02f9a59 ui/map: fix wrong remaining time (#28960)
old-commit-hash: 53934c7fee3da1aa7ee752c53796f3859e156815
2023-07-15 13:28:21 +01:00
Dean Lee b81910128d ui/MapSettings: store destinations to load on widget init (#28950)
Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

old-commit-hash: 187696977e32c0042b9141d6042e8dddb507fceb
2023-07-15 11:37:41 +01:00
Dean Lee 9212a16e54 ui/map: cache navigation images at startup (#28783)
Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

old-commit-hash: ccfca97dfc08f2d7a583fe268bb816c5ae47fc6b
2023-07-14 20:18:49 +01:00
Dean Lee 1c2f2d52e1 ui/MapSettings: sort location JsonArray inplace (#28886)
old-commit-hash: c3fe3c816298fc862b3136a7f52822a4c0525393
2023-07-13 10:59:46 +01:00
Shane Smiskol e9c0c9b693 map panel: show map on interactive timeout (#28904)
Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

old-commit-hash: daf80eaef55bf598325b4f771b28c094df64559b
2023-07-13 10:35:57 +01:00
Dean Lee 387f6b6bf6 ui/map: handle & display error in MapWindow (#28854)
old-commit-hash: ae4a375dd658dbb2b5c3093a097100d7c0e1040a
2023-07-13 10:26:58 +01:00
Shane Smiskol 24bd763e45 ui: reset nav status on offroad transition (#28897)
* need to do this

* actually better to clear it on offroad transition, then onroad transition will be fine
old-commit-hash: c158537df69c21dc0f134774cdd02b48dfbadeeb
2023-07-11 19:04:41 -07:00
Shane Smiskol 37ee12de52 ui: show map with nav (#28867)
* accept touch events in map settings

* draft

* draft 2.0

* revert this stuff

* need this

* fix

* clean up debug prints

* fraft

* only show map on closeSettings if nav

* works!

* can't do it here

* I was going to connect signals from UIState to HomeWindow, then to OnroadWidget, but that seems like too much

* just need to keep track of it in onroad, seems like the cleanest option

* ideally we show the map where we set the scene variable, and that's in map.cc

* old variable

* comments

* less confusing

* app comment

* add back

* fix

* move to top

* remove this comment
old-commit-hash: 34a5e626d6f55cd33bc292e4f9d4a21e1fd2972b
2023-07-11 14:49:19 -07:00
Cameron Clough 9716affb3b nav: hide settings on map request visible (#28884)
old-commit-hash: 6643616c475a2a9a884352af19233e596eb5e9e3
2023-07-11 21:40:33 +01:00
Cameron Clough 6b3daee3d3 UI: preserve recent destinations sort order (#28881)
old-commit-hash: 4d61d680b256b38251bd8231d2e4aeb2e31f28de
2023-07-11 12:39:06 +01:00
Dean Lee 261d7ed673 ui/map: singleton navigation requests (#28862)
old-commit-hash: 8149c07fac9aa651608aa761f50744edcb5b9ea1
2023-07-11 11:42:10 +01:00
Dean Lee 22b1baff64 ui/map: don't clear eta when map is hidden (#28878)
old-commit-hash: 4544b40b7077b9aa7447c8fee1d0b254397eec65
2023-07-11 10:23:45 +01:00
Shane Smiskol a11b6330ae ui: don't hide sidebar twice (#28868)
* draft

* draft 2

* comment and clean up

* delete

* better name

* even better?
old-commit-hash: 305ab3cb3eeee3f821f7ff5ca823616390dc253f
2023-07-11 00:58:28 -07:00
Shane Smiskol b205c1b1f0 ui: remove unused MapPanel function (#28874)
forgot about this
old-commit-hash: 28df811f42c83c905d6d942eddf0017d096ca7d9
2023-07-11 00:46:59 -07:00
Shane Smiskol c9630b0a7a map settings: accept touch events (#28865)
* accept touch events in map settings

* use override

* revert this

* remove debug stuff

* add comments

* not the main purpose
old-commit-hash: 71e001ee577811d2bf1ea1973545322c6a3ba95d
2023-07-11 00:21:25 -07:00
Dean Lee 96b9902629 ui/map: reuse the Qlabels and remove call to clearLayout (#28788)
* dont clearlayout

* replace show with setVisible

* remove signals&connections, call updateDistance in updateInstructions

* refactor updateDistance to getDistance
old-commit-hash: e1ea1d58e4f8e96c9c14367ade2e4e650a9ffb9a
2023-07-09 21:27:24 +01:00
Dean Lee d70f51a8db ui/map: use overlay widget to simplify code and improve rendering performance (#28800)
* move widgets into overlay

* adjust margin

* add spacing
old-commit-hash: 7a42e51c90cc837248e4aac8bbc04d3eec7d474d
2023-07-09 16:03:51 +01:00
Dean Lee 0c814c0cf9 ui/map: draw ETA with rich formatted text (#28780)
* draw ETA with rich formatted text

* no rounded at the bottom corners

* add Params param to member

* fix font typo

* restore opendbc

* set antialiasing

* fix time format
old-commit-hash: 060490bdf1d812cf7d687cb2d04994daa0e75ed0
2023-07-09 11:54:29 +01:00
Jason Young 089a09a92a nav ui: restore speed-adaptive map zoom level (#28796)
Revert "map: fix repeated call to m_map->setZoom (#25784)"

This reverts commit 00cc1831bb13d838ba5df4fdfc6c071f7c704493.
old-commit-hash: e816c81a5af8684cf3eb6f0c9d578cf82ebc1588
2023-07-05 15:45:32 -07:00
Dean Lee 724ef9d7ef ui: more descriptive global names (#28813)
* rename global bdr_s to UI_BORDER_SIZE

* rename header_h to UI_HEADER_HEIGHT

* remove unused footer_h
old-commit-hash: 5991aea10a63d9314149e88e22898875801ef775
2023-07-05 15:00:33 -07:00
Dean Lee c25ca091ff ui: cleanup controls (#28809)
* cleanup controls

* restore LayoutWidget
old-commit-hash: 2d37c219e794cc4d8ed0de031b38b183af281db3
2023-07-05 10:50:14 -07:00