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);
this, SLOT(marker_time_changed()));
connect(_header, SIGNAL(signals_moved()),
- this, SLOT(signals_moved()));
+ this, SLOT(on_signals_moved()));
setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
setViewport(_viewport);
return _hover_point;
}
+void View::normalize_layout()
+{
+ vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+
+ int v_min = INT_MAX;
+ BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+ v_min = min(s->get_v_offset(), v_min);
+
+ const int delta = -min(v_min, 0);
+ BOOST_FOREACH(shared_ptr<Signal> s, sigs)
+ s->set_v_offset(s->get_v_offset() + delta);
+
+ verticalScrollBar()->setSliderPosition(_v_offset + delta);
+ v_scroll_value_changed(verticalScrollBar()->sliderPosition());
+}
+
void View::get_scroll_layout(double &length, double &offset) const
{
const shared_ptr<SignalData> sig_data = _session.get_data();
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
verticalScrollBar()->setRange(0,
- _viewport->get_total_height() - areaSize.height());
+ _viewport->get_total_height() + SignalMargin -
+ areaSize.height());
}
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);
- offset += SignalHeight;
+ offset += SignalHeight + 2 * SignalMargin;
}
+
+ normalize_layout();
}
bool View::eventFilter(QObject *object, QEvent *event)
_viewport->update();
}
-void View::signals_moved()
+void View::on_signals_moved()
{
- _header->update();
- _viewport->update();
+ update_scroll();
+ signals_moved();
}
} // namespace view