projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unneeded Cursor::Size constant
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 0f9edb3f39719d53a2d991f2a25383e89386e0e6..9c793bb8e635c4443c7b762186f1969df0752886 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-72,8
+72,7
@@
View::View(SigSession &session, QWidget *parent) :
_v_offset(0),
_updating_scroll(false),
_show_cursors(false),
_v_offset(0),
_updating_scroll(false),
_show_cursors(false),
- _cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
- Cursor(*this, 1.0))),
+ _cursors(*this),
_hover_point(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
_hover_point(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@
-86,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.first, SIGNAL(time_changed()),
+ connect(&_cursors.first
()
, SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
this, SLOT(marker_time_changed()));
- connect(&_cursors.second, SIGNAL(time_changed()),
+ connect(&_cursors.second
()
, SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
connect(_header, SIGNAL(signals_moved()),
this, SLOT(marker_time_changed()));
connect(_header, SIGNAL(signals_moved()),
@@
-162,7
+161,7
@@
void View::show_cursors(bool show)
_viewport->update();
}
_viewport->update();
}
-
std::pair<Cursor, Cursor>
& View::cursors()
+
CursorPair
& View::cursors()
{
return _cursors;
}
{
return _cursors;
}
@@
-209,7
+208,7
@@
void View::update_scroll()
get_scroll_layout(length, offset);
length = max(length - areaSize.width(), 0.0);
get_scroll_layout(length, offset);
length = max(length - areaSize.width(), 0.0);
- horizontalScrollBar()->setPageStep(areaSize.width());
+ horizontalScrollBar()->setPageStep(areaSize.width()
/ 2
);
_updating_scroll = true;
_updating_scroll = true;