X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=323a2434ec79083f00db203a9c23ae37031ac790;hb=561ba3ae052a93fe150a2161fcdc361144e68e4f;hp=41c1fba4028f34f53df04f5e970cbdd166e467b0;hpb=52c900ac8626b33cfd55485b4474fb5160524d33;p=pulseview.git diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index 41c1fba..323a243 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -57,6 +57,8 @@ using std::pair; using std::shared_ptr; using std::vector; +using pv::data::SignalBase; + namespace pv { namespace views { namespace trace { @@ -68,11 +70,14 @@ 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); const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77); +const QColor AnalogSignal::ThresholdColor = QColor(0, 0, 0, 30 * 256 / 100); + const int64_t AnalogSignal::TracePaintBlockSize = 1024 * 1024; // 4 MiB (due to float) const float AnalogSignal::EnvelopeThreshold = 64.0f; @@ -95,6 +100,8 @@ AnalogSignal::AnalogSignal( display_type_(DisplayBoth), autoranging_(true) { + axis_pen_ = AxisPen; + pv::data::Analog* analog_data = dynamic_cast(data().get()); @@ -240,15 +247,16 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) pixels_offset, samples_per_pixel); } - if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) { - const data::SignalBase::ConversionType conv_type = - base_->get_conversion_type(); + const SignalBase::ConversionType conv_type = base_->get_conversion_type(); - if (((conv_type == data::SignalBase::A2LConversionByTreshold) || - (conv_type == data::SignalBase::A2LConversionBySchmittTrigger))) { + if (((conv_type == SignalBase::A2LConversionByThreshold) || + (conv_type == SignalBase::A2LConversionBySchmittTrigger))) { + if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth)) + paint_conversion_thresholds(p, pp); + + if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) paint_logic_mid(p, pp); - } } } @@ -435,6 +443,44 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } +void AnalogSignal::paint_conversion_thresholds(QPainter &p, + ViewItemPaintParams &pp) +{ + if (!base_->enabled() || !base_->logic_data()) + return; + + // TODO Register a change handler instead of querying this with every repaint + GlobalSettings settings; + const bool show_conversion_thresholds = + settings.value(GlobalSettings::Key_View_ShowConversionThresholds).toBool(); + + if (!show_conversion_thresholds) + return; + + const vector thresholds = base_->get_conversion_thresholds(); + const int y = get_visual_y(); + + p.setRenderHint(QPainter::Antialiasing, false); + + p.setPen(ThresholdColor); + + if (thresholds.size() == 2) { + // Draw as hatched block because two thresholds denote lower/upper level + const double thr_y0 = y - thresholds[0] * scale_; + const double thr_y1 = y - thresholds[1] * scale_; + p.fillRect(QRect(pp.left(), thr_y0, pp.right(), thr_y1 - thr_y0), + QBrush(ThresholdColor, Qt::BDiagPattern)); + } else { + // Draw as individual lines + for (const double thr : thresholds) { + const double thr_y = y - thr * scale_; + p.drawLine(QPointF(pp.left(), thr_y), QPointF(pp.right(), thr_y)); + } + } + + p.setRenderHint(QPainter::Antialiasing, true); +} + void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) { QLineF *line; @@ -597,11 +643,11 @@ void AnalogSignal::update_scale() void AnalogSignal::update_conversion_widgets() { - data::SignalBase::ConversionType conv_type = base_->get_conversion_type(); + SignalBase::ConversionType conv_type = base_->get_conversion_type(); // Enable or disable widgets depending on conversion state - conv_threshold_cb_->setEnabled(conv_type != data::SignalBase::NoConversion); - display_type_cb_->setEnabled(conv_type != data::SignalBase::NoConversion); + conv_threshold_cb_->setEnabled(conv_type != SignalBase::NoConversion); + display_type_cb_->setEnabled(conv_type != SignalBase::NoConversion); conv_threshold_cb_->clear(); @@ -617,16 +663,16 @@ void AnalogSignal::update_conversion_widgets() map < QString, QVariant > options = base_->get_conversion_options(); - if (conv_type == data::SignalBase::A2LConversionByTreshold) { + if (conv_type == SignalBase::A2LConversionByThreshold) { const vector thresholds = base_->get_conversion_thresholds( - data::SignalBase::A2LConversionByTreshold, true); + SignalBase::A2LConversionByThreshold, true); conv_threshold_cb_->addItem( QString("%1V").arg(QString::number(thresholds[0], 'f', 1)), -1); } - if (conv_type == data::SignalBase::A2LConversionBySchmittTrigger) { + if (conv_type == SignalBase::A2LConversionBySchmittTrigger) { const vector thresholds = base_->get_conversion_thresholds( - data::SignalBase::A2LConversionBySchmittTrigger, true); + SignalBase::A2LConversionBySchmittTrigger, true); conv_threshold_cb_->addItem(QString("%1V/%2V").arg( QString::number(thresholds[0], 'f', 1), QString::number(thresholds[1], 'f', 1)), -1); @@ -773,9 +819,12 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) // Add the conversion type dropdown conversion_cb_ = new QComboBox(); - conversion_cb_->addItem("none", data::SignalBase::NoConversion); - conversion_cb_->addItem("to logic via threshold", data::SignalBase::A2LConversionByTreshold); - conversion_cb_->addItem("to logic via schmitt-trigger", data::SignalBase::A2LConversionBySchmittTrigger); + conversion_cb_->addItem(tr("none"), + SignalBase::NoConversion); + conversion_cb_->addItem(tr("to logic via threshold"), + SignalBase::A2LConversionByThreshold); + conversion_cb_->addItem(tr("to logic via schmitt-trigger"), + SignalBase::A2LConversionBySchmittTrigger); cur_idx = conversion_cb_->findData(QVariant(base_->get_conversion_type())); conversion_cb_->setCurrentIndex(cur_idx); @@ -799,14 +848,14 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) // Add the display type dropdown display_type_cb_ = new QComboBox(); - display_type_cb_->addItem(tr("Analog"), DisplayAnalog); - display_type_cb_->addItem(tr("Converted"), DisplayConverted); - display_type_cb_->addItem(tr("Analog+Converted"), DisplayBoth); + display_type_cb_->addItem(tr("analog"), DisplayAnalog); + display_type_cb_->addItem(tr("converted"), DisplayConverted); + display_type_cb_->addItem(tr("analog+converted"), DisplayBoth); cur_idx = display_type_cb_->findData(QVariant(display_type_)); display_type_cb_->setCurrentIndex(cur_idx); - layout->addRow(tr("Traces to show:"), display_type_cb_); + layout->addRow(tr("Show traces for"), display_type_cb_); connect(display_type_cb_, SIGNAL(currentIndexChanged(int)), this, SLOT(on_display_type_changed(int))); @@ -921,11 +970,10 @@ void AnalogSignal::on_autoranging_changed(int state) void AnalogSignal::on_conversion_changed(int index) { - data::SignalBase::ConversionType old_conv_type = - base_->get_conversion_type(); + SignalBase::ConversionType old_conv_type = base_->get_conversion_type(); - data::SignalBase::ConversionType conv_type = - (data::SignalBase::ConversionType)(conversion_cb_->itemData(index).toInt()); + SignalBase::ConversionType conv_type = + (SignalBase::ConversionType)(conversion_cb_->itemData(index).toInt()); if (conv_type != old_conv_type) { base_->set_conversion_type(conv_type); @@ -938,7 +986,7 @@ void AnalogSignal::on_conversion_changed(int index) void AnalogSignal::on_conv_threshold_changed(int index) { - data::SignalBase::ConversionType conv_type = base_->get_conversion_type(); + SignalBase::ConversionType conv_type = base_->get_conversion_type(); // Note: index is set to -1 if the text in the combo box matches none of // the entries in the combo box @@ -952,7 +1000,7 @@ void AnalogSignal::on_conv_threshold_changed(int index) const bool use_custom_thr = (index == -1) || (user_data == -1); - if (conv_type == data::SignalBase::A2LConversionByTreshold && use_custom_thr) { + if (conv_type == SignalBase::A2LConversionByThreshold && use_custom_thr) { // Not one of the preset values, try to parse the combo box text // Note: Regex loosely based on // https://txt2re.com/index-c++.php3?s=0.1V&1&-13 @@ -974,7 +1022,7 @@ void AnalogSignal::on_conv_threshold_changed(int index) delayed_conversion_starter_.start(); } - if (conv_type == data::SignalBase::A2LConversionBySchmittTrigger && use_custom_thr) { + if (conv_type == SignalBase::A2LConversionBySchmittTrigger && use_custom_thr) { // Not one of the preset values, try to parse the combo box text // Note: Regex loosely based on // https://txt2re.com/index-c++.php3?s=0.1V/0.2V&2&14&-22&3&15