projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an isnan() issue on (at least) MinGW and Mac OS X.
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 48d2debcf2a9df1ccd204d71b6ad486bc335d585..08a5225fa41f2f35cb4d7406ded8f96fc8727ec2 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-145,13
+145,13
@@
std::pair<int, int> LogicSignal::v_extents() const
return make_pair(-SignalHeight - SignalMargin, SignalMargin);
}
return make_pair(-SignalHeight - SignalMargin, SignalMargin);
}
-void LogicSignal::paint_back(QPainter &p, const
Ro
wItemPaintParams &pp)
+void LogicSignal::paint_back(QPainter &p, const
Vie
wItemPaintParams &pp)
{
if (channel_->enabled())
paint_axis(p, pp, get_visual_y());
}
{
if (channel_->enabled())
paint_axis(p, pp, get_visual_y());
}
-void LogicSignal::paint_mid(QPainter &p, const
Ro
wItemPaintParams &pp)
+void LogicSignal::paint_mid(QPainter &p, const
Vie
wItemPaintParams &pp)
{
QLineF *line;
{
QLineF *line;
@@
-225,7
+225,7
@@
void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
delete[] cap_lines;
}
delete[] cap_lines;
}
-void LogicSignal::paint_fore(QPainter &p, const
Ro
wItemPaintParams &pp)
+void LogicSignal::paint_fore(QPainter &p, const
Vie
wItemPaintParams &pp)
{
// Draw the trigger marker
if (!trigger_match_)
{
// Draw the trigger marker
if (!trigger_match_)
@@
-246,15
+246,15
@@
void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
if (!pixmap)
continue;
if (!pixmap)
continue;
- const
int pad = TriggerMarkerPadding
;
+ const
float pad = TriggerMarkerPadding - 0.5f
;
const QSize size = pixmap->size();
const QPoint point(
pp.right() - size.width() - pad * 2,
y - (SignalHeight + size.height()) / 2);
const QSize size = pixmap->size();
const QPoint point(
pp.right() - size.width() - pad * 2,
y - (SignalHeight + size.height()) / 2);
- p.setPen(QPen(
Qt::NoPen
));
+ p.setPen(QPen(
TriggerMarkerBackgroundColour.darker()
));
p.setBrush(TriggerMarkerBackgroundColour);
p.setBrush(TriggerMarkerBackgroundColour);
- p.drawRoundedRect(QRect(point, size).adjusted(
+ p.drawRoundedRect(QRect
F
(point, size).adjusted(
-pad, -pad, pad, pad), pad, pad);
p.drawPixmap(point, *pixmap);
-pad, -pad, pad, pad), pad, pad);
p.drawPixmap(point, *pixmap);
@@
-422,7
+422,7
@@
void LogicSignal::modify_trigger()
new_trigger->stages().empty() ? nullptr : new_trigger);
if (owner_)
new_trigger->stages().empty() ? nullptr : new_trigger);
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->
row_item_
appearance_changed(false, true);
}
const QIcon* LogicSignal::get_icon(const char *path)
}
const QIcon* LogicSignal::get_icon(const char *path)