projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added DecodeSignal default colours
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 5f1de744a1d7e5642d6f364f66672f1020aa7a12..b85b1bb1c0a03cc5ed11249d0e4dd96df2865d26 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,55
+54,55
@@
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()));
}
-boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
- const QPoint &pt)
+shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
{
const int w = width();
{
const int w = width();
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
- const int v_offset = _view.v_offset();
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
{
- assert(s);
+ assert(t);
+ if (t->pt_in_label_rect(0, w, pt))
+ return t;
+ }
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
+ return shared_ptr<Trace>();
+}
- if(s->pt_in_label_rect(signal_heading_rect, pt))
- return s;
+void Header::clear_selection()
+{
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+ assert(t);
+ t->select(false);
}
}
-
return shared_ptr<Signal>
();
+
update
();
}
}
-void Header::paintEvent(QPaintEvent
*event
)
+void Header::paintEvent(QPaintEvent
*
)
{
const int w = width();
{
const int w = width();
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- const int v_offset = _view.v_offset();
- const bool dragging = !_drag_sigs.empty();
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+ const bool dragging = !_drag_traces.empty();
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
{
- assert(s);
-
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
+ assert(t);
- const bool highlight = !dragging &&
s
->pt_in_label_rect(
-
signal_heading_rect
, _mouse_point);
-
s->paint_label(painter, signal_heading_rect
, highlight);
+ const bool highlight = !dragging &&
t
->pt_in_label_rect(
+
0, w
, _mouse_point);
+
t->paint_label(painter, w
, highlight);
}
painter.end();
}
painter.end();
@@
-113,56
+112,56
@@
void Header::mousePressEvent(QMouseEvent *event)
{
assert(event);
{
assert(event);
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
- if(event->button() & Qt::LeftButton) {
+ if
(event->button() & Qt::LeftButton) {
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
- BOOST_FOREACH(const shared_ptr<
Signal> s, sig
s)
- if
(s
->selected())
- _drag_
sig
s.push_back(
- make_pair(
s, s
->get_v_offset()));
+ BOOST_FOREACH(const shared_ptr<
Trace> t, trace
s)
+ if
(t
->selected())
+ _drag_
trace
s.push_back(
+ make_pair(
t, t
->get_v_offset()));
}
// Select the signal if it has been clicked
}
// Select the signal if it has been clicked
- const shared_ptr<
Signal> mouse_over_signal
=
- get_mouse_over_
signal
(event->pos());
- if
(mouse_over_signal
) {
- if
(mouse_over_signal
->selected())
- mouse_over_
signal
->select(false);
+ const shared_ptr<
Trace> mouse_over_trace
=
+ get_mouse_over_
trace
(event->pos());
+ if
(mouse_over_trace
) {
+ if
(mouse_over_trace
->selected())
+ mouse_over_
trace
->select(false);
else {
else {
- mouse_over_
signal
->select(true);
+ mouse_over_
trace
->select(true);
- if(~QApplication::keyboardModifiers() &
+ if
(~QApplication::keyboardModifiers() &
Qt::ControlModifier)
Qt::ControlModifier)
- _drag_
sig
s.clear();
+ _drag_
trace
s.clear();
// Add the signal to the drag list
// Add the signal to the drag list
- if(event->button() & Qt::LeftButton)
- _drag_
sig
s.push_back(
- make_pair(mouse_over_
signal
,
- mouse_over_
signal
->get_v_offset()));
+ if
(event->button() & Qt::LeftButton)
+ _drag_
trace
s.push_back(
+ make_pair(mouse_over_
trace
,
+ mouse_over_
trace
->get_v_offset()));
}
}
}
}
- if(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
+ if
(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
// Unselect all other signals because the Ctrl is not
// pressed
- BOOST_FOREACH(const shared_ptr<
Signal> s, sig
s)
- if
(s != mouse_over_signal
)
-
s
->select(false);
+ BOOST_FOREACH(const shared_ptr<
Trace> t, trace
s)
+ if
(t != mouse_over_trace
)
+
t
->select(false);
}
}
+ selection_changed();
update();
}
void Header::mouseReleaseEvent(QMouseEvent *event)
{
assert(event);
update();
}
void Header::mouseReleaseEvent(QMouseEvent *event)
{
assert(event);
- if(event->button() == Qt::LeftButton) {
- _drag_
sig
s.clear();
+ if
(event->button() == Qt::LeftButton) {
+ _drag_
trace
s.clear();
_view.normalize_layout();
}
}
_view.normalize_layout();
}
}
@@
-173,23
+172,23
@@
void Header::mouseMoveEvent(QMouseEvent *event)
_mouse_point = event->pos();
// Move the signals if we are dragging
_mouse_point = event->pos();
// Move the signals if we are dragging
- if
(!_drag_sig
s.empty()) {
+ if
(!_drag_trace
s.empty()) {
const int delta = event->pos().y() - _mouse_down_point.y();
const int delta = event->pos().y() - _mouse_down_point.y();
- for
(std::list<std::pair<boost::weak_ptr<Signal
>,
- int> >::iterator i = _drag_
sig
s.begin();
- i != _drag_
sig
s.end(); i++) {
- const boost::shared_ptr<
Signal> sig
((*i).first);
- if
(sig
) {
+ for
(std::list<std::pair<boost::weak_ptr<Trace
>,
+ int> >::iterator i = _drag_
trace
s.begin();
+ i != _drag_
trace
s.end(); i++) {
+ const boost::shared_ptr<
Trace> trace
((*i).first);
+ if
(trace
) {
const int y = (*i).second + delta;
const int y_snap =
((y + View::SignalSnapGridSize / 2) /
View::SignalSnapGridSize) *
View::SignalSnapGridSize;
const int y = (*i).second + delta;
const int y_snap =
((y + View::SignalSnapGridSize / 2) /
View::SignalSnapGridSize) *
View::SignalSnapGridSize;
-
sig
->set_v_offset(y_snap);
+
trace
->set_v_offset(y_snap);
- // Ensure the
signal
is selected
-
sig
->select();
+ // Ensure the
trace
is selected
+
trace
->select();
}
}
}
}
@@
-200,7
+199,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();
@@
-208,44
+207,55
@@
void Header::leaveEvent(QEvent *event)
void Header::contextMenuEvent(QContextMenuEvent *event)
{
void Header::contextMenuEvent(QContextMenuEvent *event)
{
- const shared_ptr<
Signal> s = get_mouse_over_signal
(_mouse_point);
+ const shared_ptr<
Trace> t = get_mouse_over_trace
(_mouse_point);
- if
(!s
)
+ if
(!t
)
return;
QMenu menu(this);
menu.addAction(_action_set_name);
menu.addAction(_action_set_colour);
return;
QMenu menu(this);
menu.addAction(_action_set_name);
menu.addAction(_action_set_colour);
- _context_
signal = s
;
+ _context_
trace = t
;
menu.exec(event->globalPos());
menu.exec(event->globalPos());
- _context_
signal
.reset();
+ _context_
trace
.reset();
}
void Header::on_action_set_name_triggered()
{
}
void Header::on_action_set_name_triggered()
{
- shared_ptr<view::Signal> context_signal = _context_signal;
- if(!context_signal)
+ bool ok = false;
+
+ shared_ptr<view::Trace> context_trace = _context_trace;
+ if (!context_trace)
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
- tr("Name"), QLineEdit::Normal, context_
signal->get_name()
);
+ tr("Name"), QLineEdit::Normal, context_
trace->get_name(), &ok
);
- if
(!new_label.isEmpty()
)
- context_
signal
->set_name(new_label);
+ if
(ok
)
+ context_
trace
->set_name(new_label);
}
void Header::on_action_set_colour_triggered()
{
}
void Header::on_action_set_colour_triggered()
{
- shared_ptr<view::
Signal> context_signal = _context_signal
;
- if
(!context_signal
)
+ shared_ptr<view::
Trace> context_trace = _context_trace
;
+ if
(!context_trace
)
return;
const QColor new_colour = QColorDialog::getColor(
return;
const QColor new_colour = QColorDialog::getColor(
- context_signal->get_colour(), this, tr("Set Colour"));
+ context_trace->get_colour(), this, tr("Set Colour"));
+
+ if (new_colour.isValid())
+ context_trace->set_colour(new_colour);
+}
- if(new_colour.isValid())
- context_signal->set_colour(new_colour);
+void Header::on_signals_changed()
+{
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+ assert(t);
+ connect(t.get(), SIGNAL(text_changed()), this, SLOT(update()));
+ }
}
void Header::on_signals_moved()
}
void Header::on_signals_moved()