projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Invoke signals_changed outside locked region
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 63679012a52947d92b7d1fc67f40948a042f339b..fd40e216e196f0bd6b7a2fb09c52bf70061edcf3 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-43,8
+43,7
@@
namespace pv {
namespace view {
Header::Header(View &parent) :
namespace view {
Header::Header(View &parent) :
- QWidget(&parent),
- _view(parent),
+ MarginWidget(parent),
_action_set_name(new QAction(tr("Set &Name..."), this)),
_action_set_colour(new QAction(tr("Set &Colour..."), this))
{
_action_set_name(new QAction(tr("Set &Name..."), this)),
_action_set_colour(new QAction(tr("Set &Colour..."), this))
{
@@
-55,6
+54,9
@@
Header::Header(View &parent) :
connect(_action_set_colour, SIGNAL(triggered()),
this, SLOT(on_action_set_colour_triggered()));
connect(_action_set_colour, SIGNAL(triggered()),
this, SLOT(on_action_set_colour_triggered()));
+ connect(&_view.session(), SIGNAL(signals_changed()),
+ this, SLOT(on_signals_changed()));
+
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
@@
-71,18
+73,27
@@
boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
{
assert(s);
{
assert(s);
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
-
- if (s->pt_in_label_rect(signal_heading_rect, pt))
+ if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
+ 0, w, pt))
return s;
}
return shared_ptr<Signal>();
}
return s;
}
return shared_ptr<Signal>();
}
-void Header::paintEvent(QPaintEvent *event)
+void Header::clear_selection()
+{
+ const vector< shared_ptr<Signal> > sigs(
+ _view.session().get_signals());
+ BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
+ assert(s);
+ s->select(false);
+ }
+
+ update();
+}
+
+void Header::paintEvent(QPaintEvent*)
{
const int w = width();
const vector< shared_ptr<Signal> > sigs(
{
const int w = width();
const vector< shared_ptr<Signal> > sigs(
@@
-97,13
+108,10
@@
void Header::paintEvent(QPaintEvent *event)
{
assert(s);
{
assert(s);
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
-
+ const int y = s->get_v_offset() - v_offset;
const bool highlight = !dragging && s->pt_in_label_rect(
const bool highlight = !dragging && s->pt_in_label_rect(
-
signal_heading_rect
, _mouse_point);
- s->paint_label(painter,
signal_heading_rect
, highlight);
+
y, 0, w
, _mouse_point);
+ s->paint_label(painter,
y, w
, highlight);
}
painter.end();
}
painter.end();
@@
-155,6
+163,7
@@
void Header::mousePressEvent(QMouseEvent *event)
s->select(false);
}
s->select(false);
}
+ selection_changed();
update();
}
update();
}
@@
-200,7
+209,7
@@
void Header::mouseMoveEvent(QMouseEvent *event)
update();
}
update();
}
-void Header::leaveEvent(QEvent
*event
)
+void Header::leaveEvent(QEvent
*
)
{
_mouse_point = QPoint(-1, -1);
update();
{
_mouse_point = QPoint(-1, -1);
update();
@@
-224,14
+233,16
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
void Header::on_action_set_name_triggered()
{
void Header::on_action_set_name_triggered()
{
+ bool ok = false;
+
shared_ptr<view::Signal> context_signal = _context_signal;
if (!context_signal)
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
shared_ptr<view::Signal> context_signal = _context_signal;
if (!context_signal)
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
- tr("Name"), QLineEdit::Normal, context_signal->get_name());
+ tr("Name"), QLineEdit::Normal, context_signal->get_name()
, &ok
);
- if (
!new_label.isEmpty()
)
+ if (
ok
)
context_signal->set_name(new_label);
}
context_signal->set_name(new_label);
}
@@
-248,6
+259,15
@@
void Header::on_action_set_colour_triggered()
context_signal->set_colour(new_colour);
}
context_signal->set_colour(new_colour);
}
+void Header::on_signals_changed()
+{
+ const vector< shared_ptr<Signal> > sigs(_view.session().get_signals());
+ BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+ assert(s);
+ connect(s.get(), SIGNAL(text_changed()), this, SLOT(update()));
+ }
+}
+
void Header::on_signals_moved()
{
update();
void Header::on_signals_moved()
{
update();