this, SLOT(h_scroll_value_changed(int)));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(v_scroll_value_changed(int)));
+
+ connect(&_session, SIGNAL(signals_changed()),
+ this, SLOT(signals_changed()));
connect(&_session, SIGNAL(data_updated()),
this, SLOT(data_updated()));
return _hover_point;
}
+void View::normalize_layout()
+{
+ const 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 = SignalMargin;
- vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+ const vector< shared_ptr<Signal> > sigs(_session.get_signals());
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
+
+ normalize_layout();
}
bool View::eventFilter(QObject *object, QEvent *event)
_viewport->update();
}
+void View::signals_changed()
+{
+ reset_signal_layout();
+}
+
void View::data_updated()
{
// Get the new data length
// Repaint the view
_viewport->update();
-
- /// @todo: Call this only once when the signals are first created.
- reset_signal_layout();
}
void View::marker_time_changed()