projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrapped Cursors in a shared_ptr
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index bc82e0b4c4a6c7ab2b9e9e5c3896c81fac66db92..eca6b8eabce92c05575cbefeb1473ea95e424028 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-85,9
+85,9
@@
View::View(SigSession &session, QWidget *parent) :
connect(&_session, SIGNAL(data_updated()),
this, SLOT(data_updated()));
connect(&_session, SIGNAL(data_updated()),
this, SLOT(data_updated()));
- connect(
&_cursors.firs
t(), SIGNAL(time_changed()),
+ connect(
_cursors.first().ge
t(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
this, SLOT(marker_time_changed()));
- connect(
&_cursors.second
(), SIGNAL(time_changed()),
+ connect(
_cursors.second().get
(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
connect(_header, SIGNAL(signals_moved()),
this, SLOT(marker_time_changed()));
connect(_header, SIGNAL(signals_moved()),
@@
-174,8
+174,8
@@
void View::show_cursors(bool show)
void View::centre_cursors()
{
const double time_width = _scale * _viewport->width();
void View::centre_cursors()
{
const double time_width = _scale * _viewport->width();
- _cursors.first()
.
set_time(_offset + time_width * 0.4);
- _cursors.second()
.
set_time(_offset + time_width * 0.6);
+ _cursors.first()
->
set_time(_offset + time_width * 0.4);
+ _cursors.second()
->
set_time(_offset + time_width * 0.6);
_ruler->update();
_viewport->update();
}
_ruler->update();
_viewport->update();
}
@@
-185,6
+185,11
@@
CursorPair& View::cursors()
return _cursors;
}
return _cursors;
}
+const CursorPair& View::cursors() const
+{
+ return _cursors;
+}
+
const QPoint& View::hover_point() const
{
return _hover_point;
const QPoint& View::hover_point() const
{
return _hover_point;