projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #971: Allow saving/restoring of session setups
[pulseview.git]
/
pv
/
views
/
trace
/
tracegroup.cpp
diff --git
a/pv/views/trace/tracegroup.cpp
b/pv/views/trace/tracegroup.cpp
index daf0c6705c9861a5cabf0f02612cac2dce7eb18d..3cbca90934d68a8417e17d5feb6bc70fd79bb3a6 100644
(file)
--- a/
pv/views/trace/tracegroup.cpp
+++ b/
pv/views/trace/tracegroup.cpp
@@
-39,7
+39,7
@@
namespace trace {
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
const int TraceGroup::LineThickness = 5;
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
const int TraceGroup::LineThickness = 5;
-const QColor TraceGroup::LineColo
u
r(QColor(0x55, 0x57, 0x53));
+const QColor TraceGroup::LineColor(QColor(0x55, 0x57, 0x53));
TraceGroup::~TraceGroup()
{
TraceGroup::~TraceGroup()
{
@@
-85,8
+85,8
@@
pair<int, int> TraceGroup::v_extents() const
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
{
const QRectF r = label_rect(rect).adjusted(
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
{
const QRectF r = label_rect(rect).adjusted(
- LineThickness / 2
, LineThickness / 2
,
- -LineThickness / 2
, -LineThickness / 2
);
+ LineThickness / 2
.0, LineThickness / 2.0
,
+ -LineThickness / 2
.0, -LineThickness / 2.0
);
// Paint the label
const QPointF points[] = {
// Paint the label
const QPointF points[] = {
@@
-104,10
+104,10
@@
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
p.drawPolyline(points, countof(points));
}
p.drawPolyline(points, countof(points));
}
- p.setPen(QPen(QBrush(LineColo
u
r.darker()), LineThickness,
+ p.setPen(QPen(QBrush(LineColor.darker()), LineThickness,
Qt::SolidLine, Qt::SquareCap, Qt::RoundJoin));
p.drawPolyline(points, countof(points));
Qt::SolidLine, Qt::SquareCap, Qt::RoundJoin));
p.drawPolyline(points, countof(points));
- p.setPen(QPen(QBrush(hover ? LineColo
ur.lighter() : LineColou
r),
+ p.setPen(QPen(QBrush(hover ? LineColo
r.lighter() : LineColo
r),
LineThickness - 2, Qt::SolidLine, Qt::SquareCap,
Qt::RoundJoin));
p.drawPolyline(points, countof(points));
LineThickness - 2, Qt::SolidLine, Qt::SquareCap,
Qt::RoundJoin));
p.drawPolyline(points, countof(points));
@@
-116,7
+116,7
@@
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
QRectF TraceGroup::label_rect(const QRectF &rect) const
{
QRectF child_rect;
QRectF TraceGroup::label_rect(const QRectF &rect) const
{
QRectF child_rect;
- for (const shared_ptr<ViewItem> r : child_items())
+ for (const shared_ptr<ViewItem>
&
r : child_items())
if (r && r->enabled())
child_rect = child_rect.united(r->label_rect(rect));
if (r && r->enabled())
child_rect = child_rect.united(r->label_rect(rect));
@@
-133,7
+133,7
@@
bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)
return false;
}
return false;
}
-QMenu* TraceGroup::create_context_menu(QWidget *parent)
+QMenu* TraceGroup::create_
header_
context_menu(QWidget *parent)
{
QMenu *const menu = new QMenu(parent);
{
QMenu *const menu = new QMenu(parent);
@@
-166,7
+166,7
@@
void TraceGroup::ungroup()
const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
clear_child_items();
const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
clear_child_items();
- for (
shared_ptr<TraceTreeItem>
r : items)
+ for (
const shared_ptr<TraceTreeItem>&
r : items)
owner_->add_child_item(r);
owner_->remove_child_item(shared_from_this());
owner_->add_child_item(r);
owner_->remove_child_item(shared_from_this());