projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the H-scroll page width to half a screen rather than a full screen.
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 64ecf83a6079ba4362496077299f26f3f0581233..95b8a5bec9e9f1fde845898ee5ed7a0cf1bfcc58 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-70,6
+70,7
@@
View::View(SigSession &session, QWidget *parent) :
_scale(1e-6),
_offset(0),
_v_offset(0),
_scale(1e-6),
_offset(0),
_v_offset(0),
+ _updating_scroll(false),
_show_cursors(false),
_cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
Cursor(*this, 1.0))),
_show_cursors(false),
_cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
Cursor(*this, 1.0))),
@@
-208,7
+209,9
@@
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;
if (length < MaxScrollValue) {
horizontalScrollBar()->setRange(0, length);
if (length < MaxScrollValue) {
horizontalScrollBar()->setRange(0, length);
@@
-219,6
+222,8
@@
void View::update_scroll()
_offset * MaxScrollValue / (_scale * length));
}
_offset * MaxScrollValue / (_scale * length));
}
+ _updating_scroll = false;
+
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
verticalScrollBar()->setRange(0,
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
verticalScrollBar()->setRange(0,
@@
-228,7
+233,7
@@
void View::update_scroll()
void View::reset_signal_layout()
{
void View::reset_signal_layout()
{
- int offset = SignalMargin;
+ int offset = SignalMargin
+ SignalHeight
;
const vector< shared_ptr<Signal> > sigs(_session.get_signals());
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
const vector< shared_ptr<Signal> > sigs(_session.get_signals());
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
@@
-279,7
+284,7
@@
bool View::viewportEvent(QEvent *e)
}
}
}
}
-void View::resizeEvent(QResizeEvent
*e
)
+void View::resizeEvent(QResizeEvent
*
)
{
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
{
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
@@
-290,6
+295,9
@@
void View::resizeEvent(QResizeEvent *e)
void View::h_scroll_value_changed(int value)
{
void View::h_scroll_value_changed(int value)
{
+ if (_updating_scroll)
+ return;
+
const int range = horizontalScrollBar()->maximum();
if (range < MaxScrollValue)
_offset = _scale * value;
const int range = horizontalScrollBar()->maximum();
if (range < MaxScrollValue)
_offset = _scale * value;