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
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,
shared_ptr<data::SignalBase> base) :
Signal(session, base),
device_(device),
+ trigger_types_(get_trigger_types()),
trigger_none_(nullptr),
trigger_rising_(nullptr),
trigger_high_(nullptr),
{
shared_ptr<Trigger> 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();
return make_pair(-signal_height_ - signal_margin, signal_margin);
}
-int LogicSignal::scale_handle_offset() const
-{
- return -signal_height_;
-}
-
-void LogicSignal::scale_handle_dragged(int offset)
-{
- const int font_height = QFontMetrics(QApplication::font()).height();
- const int units = (-offset / font_height);
- signal_height_ = ((units < 1) ? 1 : units) * font_height;
-}
-
void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
{
QLineF *line;
const float low_offset = y + 0.5f;
shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
- if (!segment)
+ if (!segment || (segment->get_sample_count() == 0))
return;
double samplerate = segment->samplerate();
sampling_point_x += pixels_per_sample;
};
- p.setPen(EdgeColour);
+ p.setPen(EdgeColor);
p.drawLines(edge_lines, edge_count);
delete[] edge_lines;
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);
// Paint the sampling points
if (show_sampling_points) {
- p.setPen(SamplingPointColour);
+ p.setPen(SamplingPointColor);
p.drawRects(sampling_points.data(), sampling_points.size());
}
}
void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
{
- // Draw the trigger marker
- if (!trigger_match_ || !base_->enabled())
- return;
+ if (base_->enabled()) {
+ if (trigger_match_) {
+ // Draw the trigger marker
+ const int y = get_visual_y();
+
+ for (int32_t type_id : trigger_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 int y = get_visual_y();
- const vector<int32_t> 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;
+ 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);
}
}
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<QAction*>())
+ action->setEnabled(false);
+
form->addRow(tr("Trigger"), trigger_bar_);
}
}