Fix #685 by adding a special T marker when SR_DT_TRIGGER arrives

[pulseview.git] / pv / view / flag.cpp

diff --git a/pv/view/flag.cpp b/pv/view/flag.cpp
index 53b0feefa07b77c4ecce071b99358490a4fe6012..380ef3273091b1f4d8d29f1bc68a5dd296e581da 100644 (file)
--- a/pv/view/flag.cpp
+++ b/pv/view/flag.cpp
@@ -24,8 +24,9 @@
 #include <QColor>
 #include <QFormLayout>
 #include <QLineEdit>
+#include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <pv/widgets/popup.hpp>
 
@@ -36,14 +37,15 @@ namespace view {
 
 const QColor Flag::FillColour(0x73, 0xD2, 0x16);
 
-Flag::Flag(View &view, double time, const QString &text) :
+Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
        TimeMarker(view, FillColour, time),
        text_(text)
 {
 }
 
 Flag::Flag(const Flag &flag) :
-       TimeMarker(flag.view_, FillColour, flag.time_)
+       TimeMarker(flag.view_, FillColour, flag.time_),
+       std::enable_shared_from_this<pv::view::Flag>(flag)
 {
 }
 
@@ -59,7 +61,12 @@ QString Flag::get_text() const
 
 pv::widgets::Popup* Flag::create_popup(QWidget *parent)
 {
-       pv::widgets::Popup *const popup = TimeMarker::create_popup(parent);
+       using pv::widgets::Popup;
+
+       Popup *const popup = TimeMarker::create_popup(parent);
+       popup->set_position(parent->mapToGlobal(
+               point(parent->rect())), Popup::Bottom);
+
        QFormLayout *const form = (QFormLayout*)popup->layout();
 
        QLineEdit *const text_edit = new QLineEdit(popup);
@@ -73,11 +80,43 @@ pv::widgets::Popup* Flag::create_popup(QWidget *parent)
        return popup;
 }
 
+QMenu* Flag::create_context_menu(QWidget *parent)
+{
+       QMenu *const menu = new QMenu(parent);
+
+       QAction *const del = new QAction(tr("Delete"), this);
+       del->setShortcuts(QKeySequence::Delete);
+       connect(del, SIGNAL(triggered()), this, SLOT(on_delete()));
+       menu->addAction(del);
+
+       return menu;
+}
+
+void Flag::delete_pressed()
+{
+       on_delete();
+}
+
+void Flag::on_delete()
+{
+       view_.remove_flag(shared_ptr<Flag>(shared_from_this()));
+}
+
 void Flag::on_text_changed(const QString &text)
 {
        text_ = text;
        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 pv