mawei/openpilot-evo
1
0
Fork 0
mirror of https://github.com/infiniteCable2/openpilot.git synced 2026-08-05 08:16:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: add trips panel in settings (#542)

Browse Source 
* ui: add trips panel in settings

* adjust ui preview clicks

* ci: add optional scroll parameter to setup functions in UI preview

* add trips to ui preview and scrolling for dev panel

* fix keyboard
This commit is contained in:
Jason Wen
2025-01-08 22:49:48 -05:00
committed by GitHub
parent b434043db7
commit 1b92f6ba3b
18 changed files with 125 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ui_preview.yaml
+1 -1
View File
@@ -86,7 +86,7 @@ jobs:
run: >-
sudo apt-get install -y imagemagick
scenes="homescreen settings_device settings_software settings_sunnylink settings_toggles settings_sunnypilot settings_sunnypilot_mads settings_developer offroad_alert update_available prime onroad onroad_disengaged onroad_override onroad_sidebar onroad_wide onroad_wide_sidebar onroad_alert_small onroad_alert_mid onroad_alert_full driver_camera body keyboard"
scenes="homescreen settings_device settings_software settings_sunnylink settings_toggles settings_sunnypilot settings_sunnypilot_mads setup_settings_trips settings_developer offroad_alert update_available prime onroad onroad_disengaged onroad_override onroad_sidebar onroad_wide onroad_wide_sidebar onroad_alert_small onroad_alert_mid onroad_alert_full driver_camera body keyboard"
A=($scenes)
DIFF=""
selfdrive/ui/sunnypilot/SConscript
+1
View File
@@ -20,6 +20,7 @@ qt_src = [
"sunnypilot/qt/offroad/settings/software_panel.cc",
"sunnypilot/qt/offroad/settings/sunnylink_panel.cc",
"sunnypilot/qt/offroad/settings/sunnypilot_panel.cc",
"sunnypilot/qt/offroad/settings/trips_panel.cc",
"sunnypilot/qt/onroad/annotated_camera.cc",
"sunnypilot/qt/onroad/hud.cc",
"sunnypilot/qt/onroad/model.cc",
selfdrive/ui/sunnypilot/qt/offroad/settings/settings.cc
+2
View File
@@ -14,6 +14,7 @@
#include "selfdrive/ui/sunnypilot/qt/offroad/settings/software_panel.h"
#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_panel.h"
#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_panel.h"
#include "selfdrive/ui/sunnypilot/qt/offroad/settings/trips_panel.h"
TogglesPanelSP::TogglesPanelSP(SettingsWindow *parent) : TogglesPanel(parent) {
QObject::connect(uiStateSP(), &UIStateSP::uiUpdate, this, &TogglesPanelSP::updateState);
@@ -74,6 +75,7 @@ SettingsWindowSP::SettingsWindowSP(QWidget *parent) : SettingsWindow(parent) {
PanelInfo(" " + tr("Toggles"), toggles, "../../sunnypilot/selfdrive/assets/offroad/icon_toggle.png"),
PanelInfo(" " + tr("Software"), new SoftwarePanelSP(this), "../../sunnypilot/selfdrive/assets/offroad/icon_software.png"),
PanelInfo(" " + tr("sunnypilot"), new SunnypilotPanel(this), "../assets/images/button_home.png"),
PanelInfo(" " + tr("Trips"), new TripsPanel(this), "../../sunnypilot/selfdrive/assets/offroad/icon_trips.png"),
PanelInfo(" " + tr("Developer"), new DeveloperPanel(this), "../assets/offroad/icon_shell.png"),
};
selfdrive/ui/sunnypilot/qt/offroad/settings/trips_panel.cc
+36
View File
@@ -0,0 +1,36 @@
/**
* Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
*
* This file is part of sunnypilot and is licensed under the MIT License.
* See the LICENSE.md file in the root directory for more details.
*/
#include "selfdrive/ui/sunnypilot/qt/offroad/settings/trips_panel.h"
TripsPanel::TripsPanel(QWidget* parent) : QFrame(parent) {
QVBoxLayout* main_layout = new QVBoxLayout(this);
main_layout->setMargin(0);
// main content
main_layout->addSpacing(25);
center_layout = new QStackedLayout();
driveStatsWidget = new DriveStats;
driveStatsWidget->setStyleSheet(R"(
QLabel[type="title"] { font-size: 51px; font-weight: 500; }
QLabel[type="number"] { font-size: 78px; font-weight: 500; }
QLabel[type="unit"] { font-size: 51px; font-weight: 300; color: #A0A0A0; }
)");
center_layout->addWidget(driveStatsWidget);
main_layout->addLayout(center_layout, 1);
setStyleSheet(R"(
* {
color: white;
}
TripsPanel > QLabel {
font-size: 55px;
}
)");
}
selfdrive/ui/sunnypilot/qt/offroad/settings/trips_panel.h
+25
View File
@@ -0,0 +1,25 @@
/**
* Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
*
* This file is part of sunnypilot and is licensed under the MIT License.
* See the LICENSE.md file in the root directory for more details.
*/
#pragma once
#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
#include "selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h"
class TripsPanel : public QFrame {
Q_OBJECT
public:
explicit TripsPanel(QWidget* parent = 0);
private:
Params params;
QStackedLayout* center_layout;
DriveStats *driveStatsWidget;
};
selfdrive/ui/tests/test_ui/run.py
+13 -6
View File
@@ -42,16 +42,17 @@ def setup_settings_device(click, pm: PubMaster, scroll=None):
def setup_settings_toggles(click, pm: PubMaster, scroll=None):
setup_settings_device(click, pm)
click(278, 640)
click(278, 632)
time.sleep(UI_DELAY)
def setup_settings_software(click, pm: PubMaster, scroll=None):
setup_settings_device(click, pm)
click(278, 750)
click(278, 742)
time.sleep(UI_DELAY)
def setup_settings_developer(click, pm: PubMaster, scroll=None):
setup_settings_device(click, pm)
scroll(-100, 278, 962)
click(278, 970)
time.sleep(UI_DELAY)
@@ -122,7 +123,8 @@ def setup_body(click, pm: PubMaster, scroll=None):
def setup_keyboard(click, pm: PubMaster, scroll=None):
setup_settings_device(click, pm)
click(250, 965)
scroll(-100, 278, 962)
click(278, 970)
click(1930, 228)
def setup_driver_camera(click, pm: PubMaster, scroll=None):
@@ -180,22 +182,27 @@ def setup_settings_sunnylink(click, pm: PubMaster, scroll=None):
Params().put_bool("SunnylinkEnabled", True)
setup_settings_device(click, pm)
click(278, 530)
click(278, 522)
time.sleep(UI_DELAY)
def setup_settings_sunnypilot(click, pm: PubMaster, scroll=None):
setup_settings_device(click, pm)
click(278, 860)
click(278, 852)
time.sleep(UI_DELAY)
def setup_settings_sunnypilot_mads(click, pm: PubMaster, scroll=None):
Params().put_bool("Mads", True)
setup_settings_device(click, pm)
click(278, 860)
click(278, 852)
click(970, 455)
time.sleep(UI_DELAY)
def setup_settings_trips(click, pm: PubMaster, scroll=None):
setup_settings_device(click, pm)
click(278, 962)
time.sleep(UI_DELAY)
CASES = {
"homescreen": setup_homescreen,
"prime": setup_homescreen,
selfdrive/ui/translations/main_ar.ts
+4
View File
@@ -756,6 +756,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_de.ts
+4
View File
@@ -738,6 +738,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_es.ts
+4
View File
@@ -740,6 +740,10 @@ Esto puede tardar un minuto.</translation>
<source>sunnylink</source>
<translation>sunnylink</translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_fr.ts
+4
View File
@@ -740,6 +740,10 @@ Cela peut prendre jusqu&apos;à une minute.</translation>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_ja.ts
+4
View File
@@ -734,6 +734,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_ko.ts
+4
View File
@@ -736,6 +736,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_pt-BR.ts
+4
View File
@@ -740,6 +740,10 @@ Isso pode levar até um minuto.</translation>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_th.ts
+4
View File
@@ -736,6 +736,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_tr.ts
+4
View File
@@ -734,6 +734,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_zh-CHS.ts
+4
View File
@@ -736,6 +736,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
selfdrive/ui/translations/main_zh-CHT.ts
+4
View File
@@ -736,6 +736,10 @@ This may take up to a minute.</source>
<source>sunnylink</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trips</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
sunnypilot/selfdrive/assets/offroad/icon_trips.png
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8e5ba807427b7533f513fdd9ca270e420f3ccb63b2182203ed71453449c127a
size 5354