X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.cpp;h=870af9c5fce2caa04dc718afd66209ae7b1c23e9;hp=4a3a80a7255fa7b5cd6a6f1bdb263bfce4bcfd3f;hb=1931b5f932cf068d073bc798f11dd21ede5389a2;hpb=7daebd054e65a244dce36933cbf173b8d7532a09 diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp index 4a3a80a7..870af9c5 100644 --- a/pv/views/trace/logicsignal.cpp +++ b/pv/views/trace/logicsignal.cpp @@ -63,12 +63,12 @@ namespace trace { const float LogicSignal::Oversampling = 2.0f; -const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80); -const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00); -const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00); -const QColor LogicSignal::SamplingPointColour(0x77, 0x77, 0x77); +const QColor LogicSignal::EdgeColor(0x80, 0x80, 0x80); +const QColor LogicSignal::HighColor(0x00, 0xC0, 0x00); +const QColor LogicSignal::LowColor(0xC0, 0x00, 0x00); +const QColor LogicSignal::SamplingPointColor(0x77, 0x77, 0x77); -const QColor LogicSignal::SignalColours[10] = { +const QColor LogicSignal::SignalColors[10] = { QColor(0x16, 0x19, 0x1A), // Black QColor(0x8F, 0x52, 0x02), // Brown QColor(0xCC, 0x00, 0x00), // Red @@ -81,7 +81,7 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -QColor LogicSignal::TriggerMarkerBackgroundColour = QColor(0xED, 0xD4, 0x00); +QColor LogicSignal::TriggerMarkerBackgroundColor = QColor(0xED, 0xD4, 0x00); const int LogicSignal::TriggerMarkerPadding = 2; const char* LogicSignal::TriggerMarkerIcons[8] = { nullptr, @@ -112,7 +112,7 @@ LogicSignal::LogicSignal( { shared_ptr trigger; - base_->set_colour(SignalColours[base->index() % countof(SignalColours)]); + base_->set_color(SignalColors[base->index() % countof(SignalColors)]); GlobalSettings gs; signal_height_ = gs.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt(); @@ -193,7 +193,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) const float low_offset = y + 0.5f; shared_ptr segment = get_logic_segment_to_paint(); - if (!segment) + if (!segment || (segment->get_sample_count() == 0)) return; double samplerate = segment->samplerate(); @@ -204,7 +204,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) const double pixels_offset = pp.pixels_offset(); const pv::util::Timestamp& start_time = segment->start_time(); - const int64_t last_sample = segment->get_sample_count() - 1; + const int64_t last_sample = (int64_t)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); @@ -266,7 +266,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) sampling_point_x += pixels_per_sample; }; - p.setPen(EdgeColour); + p.setPen(EdgeColor); p.drawLines(edge_lines, edge_count); delete[] edge_lines; @@ -274,10 +274,10 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) const unsigned int max_cap_line_count = edges.size(); QLineF *const cap_lines = new QLineF[max_cap_line_count]; - p.setPen(HighColour); + p.setPen(HighColor); paint_caps(p, cap_lines, edges, true, samples_per_pixel, pixels_offset, pp.left(), high_offset); - p.setPen(LowColour); + p.setPen(LowColor); paint_caps(p, cap_lines, edges, false, samples_per_pixel, pixels_offset, pp.left(), low_offset); @@ -285,7 +285,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) // Paint the sampling points if (show_sampling_points) { - p.setPen(SamplingPointColour); + p.setPen(SamplingPointColor); p.drawRects(sampling_points.data(), sampling_points.size()); } } @@ -293,38 +293,41 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) { // Draw the trigger marker - if (!trigger_match_ || !base_->enabled()) - return; + if (base_->enabled() && trigger_match_) { + const int y = get_visual_y(); + const vector trig_types = get_trigger_types(); - const int y = get_visual_y(); - const vector trig_types = get_trigger_types(); - for (int32_t type_id : trig_types) { - const TriggerMatchType *const type = - TriggerMatchType::get(type_id); - if (trigger_match_ != type || type_id < 0 || - (size_t)type_id >= countof(TriggerMarkerIcons) || - !TriggerMarkerIcons[type_id]) - continue; - - const QPixmap *const pixmap = get_pixmap( - TriggerMarkerIcons[type_id]); - if (!pixmap) - continue; - - const float pad = TriggerMarkerPadding - 0.5f; - const QSize size = pixmap->size(); - const QPoint point( - pp.right() - size.width() - pad * 2, - y - (signal_height_ + size.height()) / 2); - - p.setPen(QPen(TriggerMarkerBackgroundColour.darker())); - p.setBrush(TriggerMarkerBackgroundColour); - p.drawRoundedRect(QRectF(point, size).adjusted( - -pad, -pad, pad, pad), pad, pad); - p.drawPixmap(point, *pixmap); - - break; + for (int32_t type_id : trig_types) { + const TriggerMatchType *const type = + TriggerMatchType::get(type_id); + if (trigger_match_ != type || type_id < 0 || + (size_t)type_id >= countof(TriggerMarkerIcons) || + !TriggerMarkerIcons[type_id]) + continue; + + const QPixmap *const pixmap = get_pixmap( + TriggerMarkerIcons[type_id]); + if (!pixmap) + continue; + + const float pad = TriggerMarkerPadding - 0.5f; + const QSize size = pixmap->size(); + const QPoint point( + pp.right() - size.width() - pad * 2, + y - (signal_height_ + size.height()) / 2); + + p.setPen(QPen(TriggerMarkerBackgroundColor.darker())); + p.setBrush(TriggerMarkerBackgroundColor); + p.drawRoundedRect(QRectF(point, size).adjusted( + -pad, -pad, pad, pad), pad, pad); + p.drawPixmap(point, *pixmap); + + break; + } } + + if (show_hover_marker_) + paint_hover_marker(p); } void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, @@ -358,11 +361,12 @@ shared_ptr LogicSignal::get_logic_segment_to_paint() con segment = segments.back(); } - if (segment_display_mode_ == ShowSingleSegmentOnly) { + if ((segment_display_mode_ == ShowSingleSegmentOnly) || + (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { try { segment = segments.at(current_segment_); - } catch (out_of_range) { - qDebug() << "Current logic segment out of range for signal" << base_->name(); + } catch (out_of_range&) { + qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_; } } } @@ -507,6 +511,12 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) trigger_bar_->addAction(action); action->setChecked(trigger_match_ == type); } + + // Only allow triggers to be changed when we're stopped + if (session_.get_capture_state() != Session::Stopped) + for (QAction* action : trigger_bar_->findChildren()) + action->setEnabled(false); + form->addRow(tr("Trigger"), trigger_bar_); } }