Merge remote-tracking branch 'upstream/master' into big-test-models

pull/26301/head
Shane Smiskol 3 years ago
commit d3f74576b8
  1. 4
      selfdrive/car/tests/test_models.py
  2. 5
      tools/cabana/chartswidget.cc

@ -121,6 +121,10 @@ class TestCarModelBase(unittest.TestCase):
assert cls.CP assert cls.CP
assert cls.CP.carFingerprint == cls.car_model assert cls.CP.carFingerprint == cls.car_model
@classmethod
def tearDownClass(cls):
del cls.can_msgs
def setUp(self): def setUp(self):
self.CI = self.CarInterface(self.CP, self.CarController, self.CarState) self.CI = self.CarInterface(self.CP, self.CarController, self.CarState)
assert self.CI assert self.CI

@ -402,10 +402,13 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) {
// zoom in if selected range is greater than 0.5s // zoom in if selected range is greater than 0.5s
emit zoomIn(min, max); emit zoomIn(min, max);
} }
event->accept();
} else if (event->button() == Qt::RightButton) { } else if (event->button() == Qt::RightButton) {
emit zoomReset(); emit zoomReset();
event->accept();
} else {
QGraphicsView::mouseReleaseEvent(event);
} }
event->accept();
} }
void ChartView::mouseMoveEvent(QMouseEvent *ev) { void ChartView::mouseMoveEvent(QMouseEvent *ev) {

Loading…
Cancel
Save