From 9ccc1523b984ec65dd1b837cd20beac7c4f3cd4b Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sun, 19 Feb 2023 00:24:01 -0500 Subject: [PATCH] ui: fix upstream conflict (commaai/openpilot:#27380) --- selfdrive/ui/qt/onroad.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index bddb48d8d5..bb93208a91 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -928,7 +928,7 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { for (int i = 0; i < std::size(scene.lane_line_vertices); ++i) { if (i == 1 || i == 2) { // TODO: can we just use the projected vertices somehow? - const cereal::ModelDataV2::XYZTData::Reader &line = (*s->sm)["modelV2"].getModelV2().getLaneLines()[i]; + const cereal::XYZTData::Reader &line = (*s->sm)["modelV2"].getModelV2().getLaneLines()[i]; const float default_pos = 1.4; // when lane poly isn't available const float lane_pos = line.getY().size() > 0 ? std::abs(line.getY()[5]) : default_pos; // get redder when line is closer to car float hue = 332.5 * lane_pos - 332.5; // equivalent to {1.4, 1.0}: {133, 0} (green to red)