set default series type in settings dlg

Author: deanlee

tools/cabana/chartswidget.cc

@@ -181,6 +181,7 @@ void ChartsWidget::settingChanged() {
   range_slider->setRange(1, settings.max_cached_minutes * 60);
   for (auto c : charts) {
     c->setFixedHeight(settings.chart_height);
+    c->setSeriesType(settings.chart_series_type == 0 ? QAbstractSeries::SeriesTypeLine : QAbstractSeries::SeriesTypeScatter);
   }
 }
 
@@ -300,6 +301,8 @@ bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) {
 // ChartView
 
 ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) {
+  series_type = settings.chart_series_type == 0 ? QAbstractSeries::SeriesTypeLine : QAbstractSeries::SeriesTypeScatter;
+
   QChart *chart = new QChart();
   chart->setBackgroundRoundness(0);
   axis_x = new QValueAxis(this);
@@ -326,9 +329,10 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) {
   QMenu *menu = new QMenu(this);
   line_series_action = menu->addAction(tr("Line"), [this]() { setSeriesType(QAbstractSeries::SeriesTypeLine); });
   line_series_action->setCheckable(true);
-  line_series_action->setChecked(true);
+  line_series_action->setChecked(series_type == QAbstractSeries::SeriesTypeLine);
   scatter_series_action = menu->addAction(tr("Scatter"), [this]() { setSeriesType(QAbstractSeries::SeriesTypeScatter); });
   scatter_series_action->setCheckable(true);
+  scatter_series_action->setChecked(series_type == QAbstractSeries::SeriesTypeScatter);
   menu->addSeparator();
   menu->addAction(tr("Manage series"), this, &ChartView::manageSeries);
   manage_btn->setMenu(menu);
@@ -490,7 +494,7 @@ void ChartView::updatePlot(double cur, double min, double max) {
     int num_points = std::max<int>(end - begin, 1);
     int pixels_per_point = width() / num_points;
     if (series_type == QAbstractSeries::SeriesTypeScatter) {
-      ((QScatterSeries *)s.series)->setMarkerSize(std::max<int>(1, 16 * (pixels_per_point / 64.0)));
+      ((QScatterSeries *)s.series)->setMarkerSize(std::clamp(pixels_per_point / 10 , 1, 16));
     } else {
       s.series->setPointsVisible(pixels_per_point > 20);
     }

tools/cabana/chartswidget.h

@@ -31,6 +31,7 @@ class ChartView : public QChartView {
   void updatePlot(double cur, double min, double max);
   void setPlotAreaLeftPosition(int pos);
   qreal getYAsixLabelWidth() const;
+  void setSeriesType(QAbstractSeries::SeriesType type);
 
   struct SigItem {
     QString msg_id;
@@ -56,7 +57,6 @@ private slots:
   void signalUpdated(const Signal *sig);
   void signalRemoved(const Signal *sig);
   void manageSeries();
-  void setSeriesType(QAbstractSeries::SeriesType type);
 
 private:
   QList<ChartView::SigItem>::iterator removeItem(const QList<ChartView::SigItem>::iterator &it);

tools/cabana/settings.cc

@@ -25,6 +25,7 @@ void Settings::save() {
   s.setValue("video_splitter_state", video_splitter_state);
   s.setValue("recent_files", recent_files);
   s.setValue("message_header_state", message_header_state);
+  s.setValue("chart_series_type", chart_series_type);
 }
 
 void Settings::load() {
@@ -40,6 +41,7 @@ void Settings::load() {
   video_splitter_state = s.value("video_splitter_state").toByteArray();
   recent_files = s.value("recent_files").toStringList();
   message_header_state = s.value("message_header_state").toByteArray();
+  chart_series_type = s.value("chart_series_type", 0).toInt();
 }
 
 // SettingsDlg
@@ -60,6 +62,11 @@ SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent) {
   cached_minutes->setValue(settings.max_cached_minutes);
   form_layout->addRow(tr("Max Cached Minutes"), cached_minutes);
 
+  chart_series_type = new QComboBox(this);
+  chart_series_type->addItems({tr("Line"), tr("Scatter")});
+  chart_series_type->setCurrentIndex(settings.chart_series_type);
+  form_layout->addRow(tr("Chart Default Series Type"), chart_series_type);
+
   chart_height = new QSpinBox(this);
   chart_height->setRange(100, 500);
   chart_height->setSingleStep(10);
@@ -77,6 +84,7 @@ SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent) {
 void SettingsDlg::save() {
   settings.fps = fps->value();
   settings.max_cached_minutes = cached_minutes->value();
+  settings.chart_series_type = chart_series_type->currentIndex();
   settings.chart_height = chart_height->value();
   settings.save();
   accept();

tools/cabana/settings.h

@@ -18,6 +18,7 @@ class Settings : public QObject {
   int chart_height = 200;
   int chart_column_count = 1;
   int chart_range = 3 * 60; // e minutes
+  int chart_series_type = 0;
   QString last_dir;
   QByteArray geometry;
   QByteArray video_splitter_state;
@@ -38,6 +39,7 @@ class SettingsDlg : public QDialog {
   QSpinBox *fps;
   QSpinBox *cached_minutes;
   QSpinBox *chart_height;
+  QComboBox *chart_series_type;
 };
 
 extern Settings settings;