projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #849 by making sure no references to the DecodeTrace instance remain
[pulseview.git]
/
pv
/
view
/
flag.cpp
diff --git
a/pv/view/flag.cpp
b/pv/view/flag.cpp
index 380ef3273091b1f4d8d29f1bc68a5dd296e581da..3afd255fc7ac05eba350c331d0731a129c4277e1 100644
(file)
--- a/
pv/view/flag.cpp
+++ b/
pv/view/flag.cpp
@@
-33,7
+33,8
@@
using std::shared_ptr;
namespace pv {
using std::shared_ptr;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor Flag::FillColour(0x73, 0xD2, 0x16);
const QColor Flag::FillColour(0x73, 0xD2, 0x16);
@@
-45,7
+46,7
@@
Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
Flag::Flag(const Flag &flag) :
TimeMarker(flag.view_, FillColour, flag.time_),
Flag::Flag(const Flag &flag) :
TimeMarker(flag.view_, FillColour, flag.time_),
- std::enable_shared_from_this<
pv::view::
Flag>(flag)
+ std::enable_shared_from_this<Flag>(flag)
{
}
{
}
@@
-108,15
+109,6
@@
void Flag::on_text_changed(const QString &text)
view_.time_item_appearance_changed(true, false);
}
view_.time_item_appearance_changed(true, false);
}
-void Flag::drag_by(const QPoint &delta)
-{
- // Treat trigger markers as immovable
- if (text_ == "T")
- return;
-
- TimeMarker::drag_by(delta);
-}
-
-
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv