projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Use a QTabWidget to display the QDockWidgets
[pulseview.git]
/
pv
/
view
/
flag.cpp
diff --git
a/pv/view/flag.cpp
b/pv/view/flag.cpp
index 81cfae873eb82365f355b109c15cc54b0d390e4a..3afd255fc7ac05eba350c331d0731a129c4277e1 100644
(file)
--- a/
pv/view/flag.cpp
+++ b/
pv/view/flag.cpp
@@
-26,18
+26,19
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <pv/widgets/popup.hpp>
using std::shared_ptr;
namespace pv {
#include <pv/widgets/popup.hpp>
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);
-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)
{
TimeMarker(view, FillColour, time),
text_(text)
{
@@
-45,7
+46,7
@@
Flag::Flag(View &view, double 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)
{
}
{
}
@@
-61,7
+62,12
@@
QString Flag::get_text() const
pv::widgets::Popup* Flag::create_popup(QWidget *parent)
{
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);
QFormLayout *const form = (QFormLayout*)popup->layout();
QLineEdit *const text_edit = new QLineEdit(popup);
@@
-103,5
+109,6
@@
void Flag::on_text_changed(const QString &text)
view_.time_item_appearance_changed(true, false);
}
view_.time_item_appearance_changed(true, false);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv