projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved signal margin out of signal rendering into initial layout
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index e36072ef78ce0d76b88547a32616a5f9a110f9b0..98b5c65dd1fc37f8b3084e5363bb936b4fc1611a 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-52,7
+52,9
@@
const int View::RulerHeight = 30;
const int View::MaxScrollValue = INT_MAX / 2;
const int View::MaxScrollValue = INT_MAX / 2;
-const int View::SignalHeight = 50;
+const int View::SignalHeight = 30;
+const int View::SignalMargin = 10;
+const int View::SignalSnapGridSize = 10;
const QColor View::CursorAreaColour(220, 231, 243);
const QColor View::CursorAreaColour(220, 231, 243);
@@
-85,6
+87,9
@@
View::View(SigSession &session, QWidget *parent) :
connect(&_cursors.second, SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
connect(&_cursors.second, SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
+ connect(_header, SIGNAL(signals_moved()),
+ this, SLOT(on_signals_moved()));
+
setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
setViewport(_viewport);
setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
setViewport(_viewport);
@@
-203,11
+208,11
@@
void View::update_scroll()
void View::reset_signal_layout()
{
void View::reset_signal_layout()
{
- int offset =
0
;
+ int offset =
SignalMargin
;
vector< shared_ptr<Signal> > &sigs = _session.get_signals();
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
vector< shared_ptr<Signal> > &sigs = _session.get_signals();
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
- offset += SignalHeight;
+ offset += SignalHeight
+ 2 * SignalMargin
;
}
}
}
}
@@
-313,5
+318,11
@@
void View::marker_time_changed()
_viewport->update();
}
_viewport->update();
}
+void View::on_signals_moved()
+{
+ update_scroll();
+ signals_moved();
+}
+
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv