projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added TimeMarker popups
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 06cd1b1540ba3dca171d2cd286cdc35f66d1fd86..ad7082e63bf35a62d7c785ebfe3395db0d58b5db 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-34,6
+34,8
@@
#include <QPainter>
#include <QTextStream>
#include <QPainter>
#include <QTextStream>
+#include <pv/widgets/popup.h>
+
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-225,6
+227,16
@@
void Ruler::mousePressEvent(QMouseEvent *e)
void Ruler::mouseReleaseEvent(QMouseEvent *)
{
void Ruler::mouseReleaseEvent(QMouseEvent *)
{
+ using pv::widgets::Popup;
+
+ if (!_dragging)
+ if (shared_ptr<TimeMarker> m = _grabbed_marker.lock()) {
+ Popup *const p = m->create_popup(&_view);
+ p->set_position(mapToGlobal(QPoint(m->get_x(),
+ height())), Popup::Bottom);
+ p->show();
+ }
+
_dragging = false;
_grabbed_marker.reset();
}
_dragging = false;
_grabbed_marker.reset();
}