const pv::util::Timestamp& start_time = segment->start_time();
const int64_t last_sample = segment->get_sample_count() - 1;
const double samples_per_pixel = samplerate * pp.scale();
+ const double pixels_per_sample = 1 / samples_per_pixel;
const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
samples_per_pixel / LogicSignal::Oversampling, 0);
assert(edges.size() >= 2);
+ // Check whether we need to paint the sampling points
+ GlobalSettings settings;
+ const bool show_sampling_points =
+ settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
+ (samples_per_pixel < 0.25);
+
+ vector<QRectF> sampling_points;
+ float sampling_point_x = 0.0f;
+ int64_t sampling_point_sample = start_sample;
+ const int w = 2;
+
+ if (show_sampling_points) {
+ sampling_points.reserve(end_sample - start_sample + 1);
+ sampling_point_x = (edges.cbegin()->first / samples_per_pixel - pixels_offset) + pp.left();
+ }
+
// Paint the edges
const unsigned int edge_count = edges.size() - 2;
QLineF *const edge_lines = new QLineF[edge_count];
const float x = ((*i).first / samples_per_pixel -
pixels_offset) + pp.left();
*line++ = QLineF(x, high_offset, x, low_offset);
+
+ if (show_sampling_points)
+ while (sampling_point_sample < (*i).first) {
+ const float y = (*i).second ? low_offset : high_offset;
+ sampling_points.emplace_back(
+ QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+ sampling_point_sample++;
+ sampling_point_x += pixels_per_sample;
+ };
}
+ // Calculate the sample points from the last edge to the end of the trace
+ if (show_sampling_points)
+ while ((uint64_t)sampling_point_sample <= end_sample) {
+ // Signal changed after the last edge, so the level is inverted
+ const float y = (edges.cend() - 1)->second ? high_offset : low_offset;
+ sampling_points.emplace_back(
+ QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+ sampling_point_sample++;
+ sampling_point_x += pixels_per_sample;
+ };
+
p.setPen(LogicSignal::EdgeColour);
p.drawLines(edge_lines, edge_count);
delete[] edge_lines;
delete[] cap_lines;
- // Return if we don't need to paint the sampling points
- GlobalSettings settings;
- const bool show_sampling_points =
- settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
-
- if (!show_sampling_points || (samples_per_pixel >= 0.25))
- return;
-
// Paint the sampling points
- const uint64_t sampling_points_count = end_sample - start_sample + 1;
- QRectF *const sampling_points = new QRectF[sampling_points_count];
- QRectF *sampling_point = sampling_points;
-
- const int w = 1;
- const float y_middle = high_offset - ((high_offset - low_offset) / 2);
- for (uint64_t i = start_sample; i < end_sample + 1; ++i) {
- const float x = (i / samples_per_pixel - pixels_offset) + pp.left();
- *sampling_point++ = QRectF(x - (w / 2), y_middle - (w / 2), w, w);
+ if (show_sampling_points) {
+ p.setPen(SamplingPointColour);
+ p.drawRects(sampling_points.data(), sampling_points.size());
}
-
- p.setPen(SamplingPointColour);
- p.drawRects(sampling_points, sampling_points_count);
- delete[] sampling_points;
}
void AnalogSignal::paint_logic_caps(QPainter &p, QLineF *const lines,
// If there is still no positive div when we need it, add one
// (this can happen when pos_vdivs==neg_vdivs==0)
- if ((max > 0) && (pos_vdivs_ == 0))
+ if ((max > 0) && (pos_vdivs_ == 0)) {
pos_vdivs_ = 1;
+ owner_->extents_changed(false, true);
+ }
// If there is still no negative div when we need it, add one
// (this can happen when pos_vdivs was 0 or 1 when trying to split)
- if ((min < 0) && (neg_vdivs_ == 0))
+ if ((min < 0) && (neg_vdivs_ == 0)) {
neg_vdivs_ = 1;
+ owner_->extents_changed(false, true);
+ }
double min_value_per_div;
if ((pos_vdivs_ > 0) && (neg_vdivs_ > 0))
cur_idx = conversion_cb_->findData(QVariant(conversion_type_));
conversion_cb_->setCurrentIndex(cur_idx);
- layout->addRow(tr("Conversion"), conversion_cb_);
+// layout->addRow(tr("Conversion"), conversion_cb_);
connect(conversion_cb_, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_conversion_changed(int)));
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("Traces to show:"), display_type_cb_);
connect(display_type_cb_, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_display_type_changed(int)));
void AnalogSignal::on_samples_added()
{
perform_autoranging(false, false);
-
- if (owner_) {
- // Call order is important, otherwise the lazy event handler won't work
- owner_->extents_changed(false, true);
- owner_->row_item_appearance_changed(false, true);
- }
}
void AnalogSignal::on_pos_vdivs_changed(int vdivs)
pos_vdivs_ = vdivs;
+ // There has to be at least one div, positive or negative
+ if ((neg_vdivs_ == 0) && (pos_vdivs_ == 0)) {
+ pos_vdivs_ = 1;
+ if (pvdiv_sb_)
+ pvdiv_sb_->setValue(pos_vdivs_);
+ }
+
if (autoranging_) {
perform_autoranging(true, true);
neg_vdivs_ = vdivs;
+ // There has to be at least one div, positive or negative
+ if ((neg_vdivs_ == 0) && (pos_vdivs_ == 0)) {
+ pos_vdivs_ = 1;
+ if (pvdiv_sb_)
+ pvdiv_sb_->setValue(pos_vdivs_);
+ }
+
if (autoranging_) {
perform_autoranging(true, true);
projects / pulseview.git / blobdiff