Added bar graph mode to plotwidget class and refactored the class nam…

…ing for better clarity around it's functionality
happycube · simoninns · Dec 7, 2025 · Dec 7, 2025 · Dec 7, 2025 · Dec 7, 2025
commit 6bdeb47525178fbf2176f8148af7030d79a138cb
diff --git a/tools/ld-analyse/blacksnranalysisdialog.cpp b/tools/ld-analyse/blacksnranalysisdialog.cpp
@@ -27,14 +27,14 @@ BlackSnrAnalysisDialog::BlackSnrAnalysisDialog(QWidget *parent) :
     plot->updateTheme();
     ui->verticalLayout->addWidget(plot);
 
-    // Set up curves and marker
-    blackCurve = plot->addCurve("Black SNR");
+    // Set up series and marker
+    blackSeries = plot->addSeries("Black SNR");
     // Theme-aware color: white in dark mode, black in light mode
     QColor dataColor = PlotWidget::isDarkTheme() ? Qt::white : Qt::black;
-    blackCurve->setPen(QPen(dataColor, 2));
+    blackSeries->setPen(QPen(dataColor, 2));
 
-    trendCurve = plot->addCurve("Trend line");
-    trendCurve->setPen(QPen(Qt::red, 2));
+    trendSeries = plot->addSeries("Trend line");
+    trendSeries->setPen(QPen(Qt::red, 2));
 
     plotMarker = plot->addMarker();
     plotMarker->setStyle(PlotMarker::VLine);
@@ -106,12 +106,12 @@ void BlackSnrAnalysisDialog::finishUpdate(qint32 _currentFrameNumber)
     plot->setAxisRange(Qt::Horizontal, 0, numberOfFrames);
     plot->setAxisRange(Qt::Vertical, 20, maxY);
 
-    // Set the black curve data
-    blackCurve->setData(blackPoints);
+    // Set the black series data
+    blackSeries->setData(blackPoints);
 
     // Generate and set the trend line
     generateTrendLine();
-    trendCurve->setData(trendPoints);
+    trendSeries->setData(trendPoints);
 
     // Set the frame marker position
     plotMarker->setPosition(QPointF(static_cast<double>(_currentFrameNumber), (maxY + 20) / 2));

diff --git a/tools/ld-analyse/blacksnranalysisdialog.h b/tools/ld-analyse/blacksnranalysisdialog.h
@@ -43,8 +43,8 @@ private slots:
 
     Ui::BlackSnrAnalysisDialog *ui;
     PlotWidget *plot;
-    PlotCurve *blackCurve;
-    PlotCurve *trendCurve;
+    PlotSeries *blackSeries;
+    PlotSeries *trendSeries;
     PlotMarker *plotMarker;
 
     double maxY;

diff --git a/tools/ld-analyse/dropoutanalysisdialog.cpp b/tools/ld-analyse/dropoutanalysisdialog.cpp
@@ -27,9 +27,10 @@ DropoutAnalysisDialog::DropoutAnalysisDialog(QWidget *parent) :
     plot->updateTheme();
     ui->verticalLayout->addWidget(plot);
 
-    // Set up curve and marker
-    curve = plot->addCurve("Dropout Length");
-    curve->setPen(QPen(Qt::red, 1));
+    // Set up series and marker
+    series = plot->addSeries("Dropout Length");
+    series->setPen(QPen(Qt::red, 1));
+    series->setStyle(PlotSeries::Bars);
 
     plotMarker = plot->addMarker();
     plotMarker->setStyle(PlotMarker::VLine);
@@ -98,8 +99,8 @@ void DropoutAnalysisDialog::finishUpdate(qint32 _currentFrameNumber)
 
     // Set the dropout curve data with theme-aware color
     QColor dataColor = PlotWidget::isDarkTheme() ? Qt::yellow : Qt::darkMagenta;
-    curve->setPen(QPen(dataColor, 2));
-    curve->setData(points);
+    series->setPen(QPen(dataColor, 2));
+    series->setData(points);
 
     // Set the frame marker position
     plotMarker->setPosition(QPointF(static_cast<double>(_currentFrameNumber), yMax / 2));

diff --git a/tools/ld-analyse/dropoutanalysisdialog.h b/tools/ld-analyse/dropoutanalysisdialog.h
@@ -40,7 +40,7 @@ private slots:
 
     Ui::DropoutAnalysisDialog *ui;
     PlotWidget *plot;
-    PlotCurve *curve;
+    PlotSeries *series;
     PlotMarker *plotMarker;
 
     double maxY;

diff --git a/tools/ld-analyse/plotwidget.cpp b/tools/ld-analyse/plotwidget.cpp
@@ -40,7 +40,7 @@ PlotWidget::PlotWidget(QWidget *parent)
 
 PlotWidget::~PlotWidget()
 {
-    clearCurves();
+    clearSeries();
     clearMarkers();
 }
 
@@ -137,31 +137,31 @@ void PlotWidget::setGridPen(const QPen &pen)
     }
 }
 
-PlotCurve* PlotWidget::addCurve(const QString &title)
+PlotSeries* PlotWidget::addSeries(const QString &title)
 {
-    PlotCurve *curve = new PlotCurve(this);
-    curve->setTitle(title);
-    m_curves.append(curve);
-    m_scene->addItem(curve);
-    return curve;
+    PlotSeries *series = new PlotSeries(this);
+    series->setTitle(title);
+    m_series.append(series);
+    m_scene->addItem(series);
+    return series;
 }
 
-void PlotWidget::removeCurve(PlotCurve *curve)
+void PlotWidget::removeSeries(PlotSeries *series)
 {
-    if (curve && m_curves.contains(curve)) {
-        m_curves.removeAll(curve);
-        m_scene->removeItem(curve);
-        delete curve;
+    if (series && m_series.contains(series)) {
+        m_series.removeAll(series);
+        m_scene->removeItem(series);
+        delete series;
     }
 }
 
-void PlotWidget::clearCurves()
+void PlotWidget::clearSeries()
 {
-    for (PlotCurve *curve : m_curves) {
-        m_scene->removeItem(curve);
-        delete curve;
+    for (PlotSeries *series : m_series) {
+        m_scene->removeItem(series);
+        delete series;
     }
-    m_curves.clear();
+    m_series.clear();
 }
 
 PlotMarker* PlotWidget::addMarker()
@@ -266,9 +266,9 @@ void PlotWidget::replot()
     QRectF sceneRect = QRectF(0, 0, m_view->width(), m_view->height());
     m_scene->setSceneRect(sceneRect);
 
-    // Update all curves
-    for (PlotCurve *curve : m_curves) {
-        curve->updatePath(m_plotRect, m_dataRect);
+    // Update all series
+    for (PlotSeries *series : m_series) {
+        series->updatePath(m_plotRect, m_dataRect);
     }
 
     // Update grid
@@ -283,7 +283,7 @@ void PlotWidget::replot()
 
     // Update legend
     if (m_legend) {
-        m_legend->updateLegend(m_curves, m_plotRect);
+        m_legend->updateLegend(m_series, m_plotRect);
     }
 
     // Update axis labels
@@ -326,13 +326,13 @@ void PlotWidget::updatePlotArea()
 
 void PlotWidget::calculateDataRange()
 {
-    if (m_curves.isEmpty()) return;
+    if (m_series.isEmpty()) return;
 
     bool firstPoint = true;
     double xMin = 0, xMax = 0, yMin = 0, yMax = 0;
 
-    for (PlotCurve *curve : m_curves) {
-        const QVector<QPointF> &data = curve->data();
+    for (PlotSeries *series : m_series) {
+        const QVector<QPointF> &data = series->data();
         for (const QPointF &point : data) {
             if (firstPoint) {
                 xMin = xMax = point.x();
@@ -373,35 +373,41 @@ QPointF PlotWidget::mapFromData(const QPointF &dataPos) const
     return QPointF(x, y);
 }
 
-// PlotCurve implementation
-PlotCurve::PlotCurve(PlotWidget *parent)
+// PlotSeries implementation
+PlotSeries::PlotSeries(PlotWidget *parent)
     : QGraphicsPathItem()
     , m_plotWidget(parent)
+    , m_style(Lines)
 {
     setPen(QPen(Qt::blue, 1.0));
 }
 
-void PlotCurve::setTitle(const QString &title)
+void PlotSeries::setTitle(const QString &title)
 {
     m_title = title;
 }
 
-void PlotCurve::setPen(const QPen &pen)
+void PlotSeries::setPen(const QPen &pen)
 {
     QGraphicsPathItem::setPen(pen);
 }
 
-void PlotCurve::setBrush(const QBrush &brush)
+void PlotSeries::setBrush(const QBrush &brush)
 {
     QGraphicsPathItem::setBrush(brush);
 }
 
-void PlotCurve::setData(const QVector<QPointF> &data)
+void PlotSeries::setStyle(PlotStyle style)
+{
+    m_style = style;
+}
+
+void PlotSeries::setData(const QVector<QPointF> &data)
 {
     m_data = data;
 }
 
-void PlotCurve::setData(const QVector<double> &xData, const QVector<double> &yData)
+void PlotSeries::setData(const QVector<double> &xData, const QVector<double> &yData)
 {
     m_data.clear();
     int count = qMin(xData.size(), yData.size());
@@ -410,27 +416,41 @@ void PlotCurve::setData(const QVector<double> &xData, const QVector<double> &yDa
     }
 }
 
-void PlotCurve::setVisible(bool visible)
+void PlotSeries::setVisible(bool visible)
 {
     QGraphicsPathItem::setVisible(visible);
 }
 
-void PlotCurve::updatePath(const QRectF &plotRect, const QRectF &dataRect)
+void PlotSeries::updatePath(const QRectF &plotRect, const QRectF &dataRect)
 {
     if (m_data.isEmpty() || !m_plotWidget) return;
 
     QPainterPath path;
-    bool firstPoint = true;
 
-    for (const QPointF &dataPoint : m_data) {
-        QPointF scenePoint = m_plotWidget->mapFromData(dataPoint);
-
-        if (firstPoint) {
-            path.moveTo(scenePoint);
-            firstPoint = false;
-        } else {
+    if (m_style == Bars) {
+        // Draw vertical bars from x-axis (y=0) to each data point
+        for (const QPointF &dataPoint : m_data) {
+            QPointF scenePoint = m_plotWidget->mapFromData(dataPoint);
+            QPointF basePoint = m_plotWidget->mapFromData(QPointF(dataPoint.x(), 0.0));
+
+            // Draw vertical line from base (y=0) to the data point
+            path.moveTo(basePoint);
             path.lineTo(scenePoint);
         }
+    } else {
+        // Default Lines style: connect points with continuous line
+        bool firstPoint = true;
+
+        for (const QPointF &dataPoint : m_data) {
+            QPointF scenePoint = m_plotWidget->mapFromData(dataPoint);
+
+            if (firstPoint) {
+                path.moveTo(scenePoint);
+                firstPoint = false;
+            } else {
+                path.lineTo(scenePoint);
+            }
+        }
     }
 
     setPath(path);
@@ -594,11 +614,11 @@ void PlotLegend::setEnabled(bool enabled)
     setVisible(enabled);
 }
 
-void PlotLegend::updateLegend(const QList<PlotCurve*> &curves, const QRectF &plotRect)
+void PlotLegend::updateLegend(const QList<PlotSeries*> &series, const QRectF &plotRect)
 {
-    m_curves = curves;
+    m_series = series;
 
-    if (!m_enabled || curves.isEmpty()) {
+    if (!m_enabled || series.isEmpty()) {
         m_boundingRect = QRectF();
         return;
     }
@@ -610,9 +630,9 @@ void PlotLegend::updateLegend(const QList<PlotCurve*> &curves, const QRectF &plo
     int maxWidth = 0;
     int totalHeight = 0;
 
-    for (PlotCurve *curve : curves) {
-        if (!curve->title().isEmpty()) {
-            int width = fm.horizontalAdvance(curve->title()) + 30; // 30 for line sample
+    for (PlotSeries *s : series) {
+        if (!s->title().isEmpty()) {
+            int width = fm.horizontalAdvance(s->title()) + 30; // 30 for line sample
             maxWidth = qMax(maxWidth, width);
             totalHeight += fm.height() + 2;
         }
@@ -636,7 +656,7 @@ void PlotLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
     Q_UNUSED(option)
     Q_UNUSED(widget)
 
-    if (!m_enabled || m_curves.isEmpty()) return;
+    if (!m_enabled || m_series.isEmpty()) return;
 
     // Draw legend background
     painter->fillRect(m_boundingRect, QColor(255, 255, 255, 200));
@@ -649,16 +669,16 @@ void PlotLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
 
     int y = m_boundingRect.top() + 5;
 
-    for (PlotCurve *curve : m_curves) {
-        if (!curve->title().isEmpty()) {
+    for (PlotSeries *series : m_series) {
+        if (!series->title().isEmpty()) {
             // Draw line sample
-            painter->setPen(curve->pen());
+            painter->setPen(series->pen());
             painter->drawLine(QPointF(m_boundingRect.left() + 5, y + fm.height()/2),
                              QPointF(m_boundingRect.left() + 25, y + fm.height()/2));
 
             // Draw text
             painter->setPen(QPen(Qt::black));
-            painter->drawText(QPointF(m_boundingRect.left() + 30, y + fm.ascent()), curve->title());
+            painter->drawText(QPointF(m_boundingRect.left() + 30, y + fm.ascent()), series->title());
 
             y += fm.height() + 2;
         }