projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made LogicDataSnapshot::get_sample private rather than mutex protecting it
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index e167bffc5c8e38535e82d94692bf96a8193de8f2..5f1de744a1d7e5642d6f364f66672f1020aa7a12 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-63,8
+63,8
@@
boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
const QPoint &pt)
{
const int w = width();
const QPoint &pt)
{
const int w = width();
- const vector< shared_ptr<Signal> >
&sigs =
- _view.session().get_signals();
+ const vector< shared_ptr<Signal> >
sigs(
+ _view.session().get_signals()
)
;
const int v_offset = _view.v_offset();
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
const int v_offset = _view.v_offset();
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@
-85,8
+85,8
@@
boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
void Header::paintEvent(QPaintEvent *event)
{
const int w = width();
void Header::paintEvent(QPaintEvent *event)
{
const int w = width();
- const vector< shared_ptr<Signal> >
&sigs =
- _view.session().get_signals();
+ const vector< shared_ptr<Signal> >
sigs(
+ _view.session().get_signals()
)
;
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
@@
-113,8
+113,8
@@
void Header::mousePressEvent(QMouseEvent *event)
{
assert(event);
{
assert(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) {
_mouse_down_point = event->pos();
if(event->button() & Qt::LeftButton) {
_mouse_down_point = event->pos();
@@
-161,8
+161,10
@@
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();
_drag_sigs.clear();
+ _view.normalize_layout();
+ }
}
void Header::mouseMoveEvent(QMouseEvent *event)
}
void Header::mouseMoveEvent(QMouseEvent *event)