projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Add "toggle mouse hover marker" to context menu
[pulseview.git]
/
pv
/
views
/
trace
/
flag.cpp
diff --git
a/pv/views/trace/flag.cpp
b/pv/views/trace/flag.cpp
index 1db843e08193e5508d8298da841e82389be102fe..64ef1047d03e6b5057753ccca7fe0a468aefee44 100644
(file)
--- a/
pv/views/trace/flag.cpp
+++ b/
pv/views/trace/flag.cpp
@@
-36,16
+36,16
@@
namespace pv {
namespace views {
namespace trace {
namespace views {
namespace trace {
-const QColor Flag::FillColo
u
r(0x73, 0xD2, 0x16);
+const QColor Flag::FillColor(0x73, 0xD2, 0x16);
Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
- TimeMarker(view, FillColo
u
r, time),
+ TimeMarker(view, FillColor, time),
text_(text)
{
}
Flag::Flag(const Flag &flag) :
text_(text)
{
}
Flag::Flag(const Flag &flag) :
- TimeMarker(flag.view_, FillColo
u
r, flag.time_),
+ TimeMarker(flag.view_, FillColor, flag.time_),
enable_shared_from_this<Flag>(flag)
{
}
enable_shared_from_this<Flag>(flag)
{
}
@@
-66,7
+66,7
@@
pv::widgets::Popup* Flag::create_popup(QWidget *parent)
Popup *const popup = TimeMarker::create_popup(parent);
popup->set_position(parent->mapToGlobal(
Popup *const popup = TimeMarker::create_popup(parent);
popup->set_position(parent->mapToGlobal(
- point(parent->rect())), Popup::Bottom);
+
drag_
point(parent->rect())), Popup::Bottom);
QFormLayout *const form = (QFormLayout*)popup->layout();
QFormLayout *const form = (QFormLayout*)popup->layout();
@@
-81,7
+81,7
@@
pv::widgets::Popup* Flag::create_popup(QWidget *parent)
return popup;
}
return popup;
}
-QMenu* Flag::create_context_menu(QWidget *parent)
+QMenu* Flag::create_
header_
context_menu(QWidget *parent)
{
QMenu *const menu = new QMenu(parent);
{
QMenu *const menu = new QMenu(parent);