diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript index 718e2e50af..507b98ae88 100644 --- a/tools/cabana/SConscript +++ b/tools/cabana/SConscript @@ -8,10 +8,13 @@ base_libs = [common, messaging, cereal, visionipc, transformations, 'zmq', if arch == "Darwin": base_frameworks.append('OpenCL') + base_frameworks.append('QtCharts') else: base_libs.append('OpenCL') + base_libs.append('Qt5Charts') + +qt_libs = ['qt_util'] + base_libs -qt_libs = ['qt_util', 'Qt5Charts'] + base_libs cabana_libs = [widgets, cereal, messaging, visionipc, replay_lib, opendbc,'avutil', 'avcodec', 'avformat', 'bz2', 'curl', 'yuv'] + qt_libs cabana_env = qt_env.Clone() diff --git a/tools/cabana/cabana.cc b/tools/cabana/cabana.cc index 4f037ba595..6a9db120e9 100644 --- a/tools/cabana/cabana.cc +++ b/tools/cabana/cabana.cc @@ -33,7 +33,11 @@ int main(int argc, char *argv[]) { replay_flags |= REPLAY_FLAG_QCAMERA; } + // TODO: Remove when OpenpilotPrefix supports ZMQ +#ifndef __APPLE__ OpenpilotPrefix op_prefix; +#endif + CANMessages p(&app); int ret = 0; if (p.loadRoute(route, cmd_parser.value("data_dir"), replay_flags)) { diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index c8208b2f14..b8ec0af346 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -268,7 +268,12 @@ void ChartView::setPlotAreaLeftPosition(int pos) { void ChartView::addSeries(const QString &msg_id, const Signal *sig) { QLineSeries *series = new QLineSeries(this); + + // TODO: Due to a bug in CameraWidget the camera frames + // are drawn instead of the graphs on MacOS. Re-enable OpenGL when fixed +#ifndef __APPLE__ series->setUseOpenGL(true); +#endif chart()->addSeries(series); series->attachAxis(axis_x); series->attachAxis(axis_y);