diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py index 444274d729..30ba12cc9e 100755 --- a/selfdrive/car/tests/test_models.py +++ b/selfdrive/car/tests/test_models.py @@ -121,6 +121,10 @@ class TestCarModelBase(unittest.TestCase): assert cls.CP assert cls.CP.carFingerprint == cls.car_model + @classmethod + def tearDownClass(cls): + del cls.can_msgs + def setUp(self): self.CI = self.CarInterface(self.CP, self.CarController, self.CarState) assert self.CI diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 21fd71b8ea..56346c6d6e 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -402,10 +402,13 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { // zoom in if selected range is greater than 0.5s emit zoomIn(min, max); } + event->accept(); } else if (event->button() == Qt::RightButton) { emit zoomReset(); + event->accept(); + } else { + QGraphicsView::mouseReleaseEvent(event); } - event->accept(); } void ChartView::mouseMoveEvent(QMouseEvent *ev) {