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;
display_type_(DisplayBoth),
autoranging_(true)
{
+ axis_pen_ = AxisPen;
+
pv::data::Analog* analog_data =
dynamic_cast<pv::data::Analog*>(data().get());
connect(analog_data, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
this, SLOT(on_samples_added()));
- connect(&delayed_conversion_starter_, SIGNAL(timeout()),
- this, SLOT(on_delayed_conversion_starter()));
- delayed_conversion_starter_.setSingleShot(true);
- delayed_conversion_starter_.setInterval(1000); // 1s timeout
-
GlobalSettings gs;
div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt();
pixels_offset, samples_per_pixel);
}
- if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) {
- const SignalBase::ConversionType conv_type = base_->get_conversion_type();
+ const SignalBase::ConversionType conv_type = base_->get_conversion_type();
- if (((conv_type == SignalBase::A2LConversionByTreshold) ||
- (conv_type == 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);
}
}
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<double> 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;
map < QString, QVariant > options = base_->get_conversion_options();
- if (conv_type == SignalBase::A2LConversionByTreshold) {
+ if (conv_type == SignalBase::A2LConversionByThreshold) {
const vector<double> thresholds = base_->get_conversion_thresholds(
- SignalBase::A2LConversionByTreshold, true);
+ SignalBase::A2LConversionByThreshold, true);
conv_threshold_cb_->addItem(
QString("%1V").arg(QString::number(thresholds[0], 'f', 1)), -1);
}
conversion_cb_->addItem(tr("none"),
SignalBase::NoConversion);
conversion_cb_->addItem(tr("to logic via threshold"),
- SignalBase::A2LConversionByTreshold);
+ SignalBase::A2LConversionByThreshold);
conversion_cb_->addItem(tr("to logic via schmitt-trigger"),
SignalBase::A2LConversionBySchmittTrigger);
const bool use_custom_thr = (index == -1) || (user_data == -1);
- if (conv_type == 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
// For now, we simply assume that the unit is volt without modifiers
const double thr = tokens.at(1).toDouble();
- // Only restart the conversion if the threshold was updated
+ // Only restart the conversion if the threshold was updated.
+ // We're starting a delayed conversion because the user may still be
+ // typing and the UI would lag if we kept on restarting it immediately
if (base_->set_conversion_option("threshold_value", thr))
- delayed_conversion_starter_.start();
+ base_->start_conversion(true);
}
if (conv_type == SignalBase::A2LConversionBySchmittTrigger && use_custom_thr) {
const double low_thr = tokens.at(1).toDouble();
const double high_thr = tokens.at(3).toDouble();
- // Only restart the conversion if one of the options was updated
+ // Only restart the conversion if one of the options was updated.
+ // We're starting a delayed conversion because the user may still be
+ // typing and the UI would lag if we kept on restarting it immediately
bool o1 = base_->set_conversion_option("threshold_value_low", low_thr);
bool o2 = base_->set_conversion_option("threshold_value_high", high_thr);
if (o1 || o2)
- delayed_conversion_starter_.start();
+ base_->start_conversion(true); // Start delayed conversion
}
- 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())
+ // Immediately start the conversion if we're not using custom values
+ // (i.e. we're using one of the presets)
+ if (!use_custom_thr)
base_->start_conversion();
}
projects / pulseview.git / blobdiff