Trace/AnalogSignal: Improve contrast and precision of the trace lines

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 1b4e32080e6107ea41041e37795333489d589fa5..e0add7aaedc64e7a116ea2bc4229dd4e25ab6583 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -26,8 +26,12 @@
 #include <limits>
 
 #include <QApplication>
+#include <QComboBox>
 #include <QFormLayout>
+#include <QGridLayout>
+#include <QLabel>
 #include <QSpinBox>
+#include <QString>
 
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
@@ -54,12 +58,17 @@ const QColor AnalogSignal::SignalColours[4] = {
        QColor(0x4E, 0x9A, 0x06)        // Green
 };
 
-const QColor AnalogSignal::GridMajorColor = QColor(0xB0, 0xB0, 0xB0);
-const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0);
+const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
+const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;
+const int AnalogSignal::MinScaleIndex = -6;
+const int AnalogSignal::MaxScaleIndex = 7;
+
+const int AnalogSignal::InfoTextMarginRight = 20;
+const int AnalogSignal::InfoTextMarginBottom = 5;
 
 AnalogSignal::AnalogSignal(
        pv::Session &session,
@@ -168,18 +177,41 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
                        pixels_offset, samples_per_pixel);
 }
 
+void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+       if (!enabled())
+               return;
+
+       const int y = get_visual_y();
+
+       // Show the info section on the right side of the trace
+       const QString infotext = QString("%1 V/div").arg(resolution_);
+
+       p.setPen(colour_);
+       p.setFont(QApplication::font());
+
+       const QRectF bounding_rect = QRectF(pp.left(),
+                       y + v_extents().first,
+                       pp.width() - InfoTextMarginRight,
+                       v_extents().second - v_extents().first - InfoTextMarginBottom);
+
+       p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext);
+}
+
 void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {
-       p.setPen(QPen(GridMajorColor, 0.5, Qt::DashLine));
+       p.setRenderHint(QPainter::Antialiasing, false);
+
+       p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
        for (int i = 1; i <= vdivs_; i++) {
-               const int dy = i * div_height_;
+               const float dy = i * div_height_;
                p.drawLine(QLineF(left, y - dy, right, y - dy));
                p.drawLine(QLineF(left, y + dy, right, y + dy));
        }
 
-       p.setPen(QPen(GridMinorColor, 0.5, Qt::DashLine));
+       p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
        for (int i = 0; i < vdivs_; i++) {
-               const int dy = i * div_height_;
+               const float dy = i * div_height_;
                const float dy25 = dy + (0.25 * div_height_);
                const float dy50 = dy + (0.50 * div_height_);
                const float dy75 = dy + (0.75 * div_height_);
@@ -190,6 +222,8 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
                p.drawLine(QLineF(left, y - dy75, right, y - dy75));
                p.drawLine(QLineF(left, y + dy75, right, y + dy75));
        }
+
+       p.setRenderHint(QPainter::Antialiasing, true);
 }
 
 void AnalogSignal::paint_trace(QPainter &p,
@@ -265,16 +299,21 @@ void AnalogSignal::paint_envelope(QPainter &p,
        delete[] e.samples;
 }
 
-void AnalogSignal::update_scale()
+float AnalogSignal::get_resolution(int scale_index)
 {
        const float seq[] = {1.0f, 2.0f, 5.0f};
 
        const int offset = std::numeric_limits<int>::max() / (2 * countof(seq));
        const std::div_t d = std::div(
-               (int)(scale_index_ + countof(seq) * offset),
+               (int)(scale_index + countof(seq) * offset),
                countof(seq));
 
-       resolution_ = powf(10.0f, d.quot - offset) * seq[d.rem];
+       return powf(10.0f, d.quot - offset) * seq[d.rem];
+}
+
+void AnalogSignal::update_scale()
+{
+       resolution_ = get_resolution(scale_index_);
        scale_ = div_height_ / resolution_;
 }
 
@@ -283,13 +322,38 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
        // Add the standard options
        Signal::populate_popup_form(parent, form);
 
-       // Add the vdiv settings
+       QFormLayout *const layout = new QFormLayout;
+
+       // Add the number of vdivs
        QSpinBox *vdiv_sb = new QSpinBox(parent);
        vdiv_sb->setRange(1, MaximumVDivs);
        vdiv_sb->setValue(vdivs_);
        connect(vdiv_sb, SIGNAL(valueChanged(int)),
                this, SLOT(on_vdivs_changed(int)));
-       form->addRow(tr("Number of vertical divs"), vdiv_sb);
+       layout->addRow(tr("Number of vertical divs"), vdiv_sb);
+
+       // Add the vertical resolution
+       resolution_cb_ = new QComboBox(parent);
+
+       for (int i = MinScaleIndex; i < MaxScaleIndex; i++) {
+               const QString label = QString("%1").arg(get_resolution(i));
+               resolution_cb_->insertItem(0, label, QVariant(i));
+       }
+
+       const int cur_idx = resolution_cb_->findData(QVariant(scale_index_));
+       resolution_cb_->setCurrentIndex(cur_idx);
+
+       connect(resolution_cb_, SIGNAL(currentIndexChanged(int)),
+               this, SLOT(on_resolution_changed(int)));
+
+       QGridLayout *const vdiv_layout = new QGridLayout;
+       QLabel *const vdiv_unit = new QLabel(tr("V/div"));
+       vdiv_layout->addWidget(resolution_cb_, 0, 0);
+       vdiv_layout->addWidget(vdiv_unit, 0, 1);
+
+       layout->addRow(tr("Vertical resolution"), vdiv_layout);
+
+       form->addRow(layout);
 }
 
 void AnalogSignal::on_vdivs_changed(int vdivs)
@@ -300,6 +364,14 @@ void AnalogSignal::on_vdivs_changed(int vdivs)
                owner_->extents_changed(false, true);
 }
 
+void AnalogSignal::on_resolution_changed(int index)
+{
+       scale_index_ = resolution_cb_->itemData(index).toInt();
+       update_scale();
+
+       if (owner_)
+               owner_->row_item_appearance_changed(false, true);
+}
 
 } // namespace view
 } // namespace pv