Use identifiers for fixed conversion preset values

[pulseview.git] / pv / views / trace / analogsignal.cpp

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index c40c93b028a341d2e8c2329313d16acde193c925..2ea5ffc55f92dbcdcc56dbe75271b903fe9a5f66 100644 (file)
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -70,6 +70,7 @@ const QColor AnalogSignal::SignalColours[4] = {
        QColor(0x4E, 0x9A, 0x06)        // Green
 };
 
+const QPen AnalogSignal::AxisPen(QColor(0, 0, 0, 30 * 256 / 100), 2);
 const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40 * 256 / 100);
 const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20 * 256 / 100);
 
@@ -99,6 +100,8 @@ AnalogSignal::AnalogSignal(
        display_type_(DisplayBoth),
        autoranging_(true)
 {
+       axis_pen_ = AxisPen;
+
        pv::data::Analog* analog_data =
                dynamic_cast<pv::data::Analog*>(data().get());
 
@@ -1047,7 +1050,7 @@ void AnalogSignal::on_conv_threshold_changed(int index)
                        delayed_conversion_starter_.start();
        }
 
-       base_->set_conversion_preset(index);
+       base_->set_conversion_preset((SignalBase::ConversionPreset)index);
 
        // Immediately start the conversion if we're not asking for a delayed reaction
        if (!delayed_conversion_starter_.isActive())