projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stopped ruler values colliding at high zoom
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 5f1de744a1d7e5642d6f364f66672f1020aa7a12..e0e280b2826dc3c988c362d1c2eaecaf0a508f29 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-71,18
+71,15
@@
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::paintEvent(QPaintEvent
*
)
{
const int w = width();
const vector< shared_ptr<Signal> > sigs(
{
const int w = width();
const vector< shared_ptr<Signal> > sigs(
@@
-97,13
+94,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();
@@
-116,12
+110,12
@@
void Header::mousePressEvent(QMouseEvent *event)
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
- 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
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
- if(s->selected())
+ if
(s->selected())
_drag_sigs.push_back(
make_pair(s, s->get_v_offset()));
}
_drag_sigs.push_back(
make_pair(s, s->get_v_offset()));
}
@@
-129,29
+123,29
@@
void Header::mousePressEvent(QMouseEvent *event)
// Select the signal if it has been clicked
const shared_ptr<Signal> mouse_over_signal =
get_mouse_over_signal(event->pos());
// 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())
+ if
(mouse_over_signal) {
+ if
(mouse_over_signal->selected())
mouse_over_signal->select(false);
else {
mouse_over_signal->select(true);
mouse_over_signal->select(false);
else {
mouse_over_signal->select(true);
- if(~QApplication::keyboardModifiers() &
+ if
(~QApplication::keyboardModifiers() &
Qt::ControlModifier)
_drag_sigs.clear();
// Add the signal to the drag list
Qt::ControlModifier)
_drag_sigs.clear();
// Add the signal to the drag list
- if(event->button() & Qt::LeftButton)
+ if
(event->button() & Qt::LeftButton)
_drag_sigs.push_back(
make_pair(mouse_over_signal,
mouse_over_signal->get_v_offset()));
}
}
_drag_sigs.push_back(
make_pair(mouse_over_signal,
mouse_over_signal->get_v_offset()));
}
}
- if(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
+ if
(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
// Unselect all other signals because the Ctrl is not
// pressed
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
- if(s != mouse_over_signal)
+ if
(s != mouse_over_signal)
s->select(false);
}
s->select(false);
}
@@
-161,7
+155,7
@@
void Header::mousePressEvent(QMouseEvent *event)
void Header::mouseReleaseEvent(QMouseEvent *event)
{
assert(event);
void Header::mouseReleaseEvent(QMouseEvent *event)
{
assert(event);
- if(event->button() == Qt::LeftButton) {
+ if
(event->button() == Qt::LeftButton) {
_drag_sigs.clear();
_view.normalize_layout();
}
_drag_sigs.clear();
_view.normalize_layout();
}
@@
-173,14
+167,14
@@
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_sigs.empty()) {
+ if
(!_drag_sigs.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>,
+ for
(std::list<std::pair<boost::weak_ptr<Signal>,
int> >::iterator i = _drag_sigs.begin();
i != _drag_sigs.end(); i++) {
const boost::shared_ptr<Signal> sig((*i).first);
int> >::iterator i = _drag_sigs.begin();
i != _drag_sigs.end(); i++) {
const boost::shared_ptr<Signal> sig((*i).first);
- if(sig) {
+ if
(sig) {
const int y = (*i).second + delta;
const int y_snap =
((y + View::SignalSnapGridSize / 2) /
const int y = (*i).second + delta;
const int y_snap =
((y + View::SignalSnapGridSize / 2) /
@@
-200,7
+194,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();
@@
-210,7
+204,7
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
{
const shared_ptr<Signal> s = get_mouse_over_signal(_mouse_point);
{
const shared_ptr<Signal> s = get_mouse_over_signal(_mouse_point);
- if(!s)
+ if
(!s)
return;
QMenu menu(this);
return;
QMenu menu(this);
@@
-225,26
+219,26
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
void Header::on_action_set_name_triggered()
{
shared_ptr<view::Signal> context_signal = _context_signal;
void Header::on_action_set_name_triggered()
{
shared_ptr<view::Signal> context_signal = _context_signal;
- if(!context_signal)
+ if
(!context_signal)
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
tr("Name"), QLineEdit::Normal, context_signal->get_name());
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
tr("Name"), QLineEdit::Normal, context_signal->get_name());
- if(!new_label.isEmpty())
+ if
(!new_label.isEmpty())
context_signal->set_name(new_label);
}
void Header::on_action_set_colour_triggered()
{
shared_ptr<view::Signal> context_signal = _context_signal;
context_signal->set_name(new_label);
}
void Header::on_action_set_colour_triggered()
{
shared_ptr<view::Signal> context_signal = _context_signal;
- if(!context_signal)
+ if
(!context_signal)
return;
const QColor new_colour = QColorDialog::getColor(
context_signal->get_colour(), this, tr("Set Colour"));
return;
const QColor new_colour = QColorDialog::getColor(
context_signal->get_colour(), this, tr("Set Colour"));
- if(new_colour.isValid())
+ if
(new_colour.isValid())
context_signal->set_colour(new_colour);
}
context_signal->set_colour(new_colour);
}