diff --git a/selfdrive/ui/.gitignore b/selfdrive/ui/.gitignore index 10c30bb7d9..5d656f889e 100644 --- a/selfdrive/ui/.gitignore +++ b/selfdrive/ui/.gitignore @@ -1,8 +1,8 @@ moc_* *.moc +watch3 installer/installers/* - replay/replay replay/tests/test_replay qt/text diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 7816beb033..eb919f761c 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -114,5 +114,7 @@ if arch in ['x86_64', 'Darwin'] and os.path.exists(Dir("#tools/").get_abspath()) replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2', 'curl'] + qt_libs qt_env.Program("replay/replay", ["replay/main.cc"], LIBS=replay_libs) + qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs) + if GetOption('test'): qt_env.Program('replay/tests/test_replay', ['replay/tests/test_runner.cc', 'replay/tests/test_replay.cc'], LIBS=[replay_libs]) diff --git a/selfdrive/ui/watch3.cc b/selfdrive/ui/watch3.cc new file mode 100644 index 0000000000..4c2b3d1a18 --- /dev/null +++ b/selfdrive/ui/watch3.cc @@ -0,0 +1,28 @@ +#include +#include + +#include "selfdrive/ui/qt/qt_window.h" +#include "selfdrive/ui/qt/util.h" +#include "selfdrive/ui/qt/widgets/cameraview.h" + +int main(int argc, char *argv[]) { + QSurfaceFormat fmt; + fmt.setRenderableType(QSurfaceFormat::OpenGLES); + QSurfaceFormat::setDefaultFormat(fmt); + + QApplication a(argc, argv); + QWidget w; + setMainWindow(&w); + + QVBoxLayout *layout = new QVBoxLayout(&w); + layout->setMargin(0); + layout->setSpacing(0); + layout->addWidget(new CameraViewWidget(VISION_STREAM_RGB_BACK, false)); + + QHBoxLayout *hlayout = new QHBoxLayout(&w); + layout->addLayout(hlayout); + hlayout->addWidget(new CameraViewWidget(VISION_STREAM_RGB_FRONT, false)); + hlayout->addWidget(new CameraViewWidget(VISION_STREAM_RGB_WIDE, false)); + + return a.exec(); +}