#include "header.h"
#include "ruler.h"
+#include "signal.h"
#include "view.h"
#include "viewport.h"
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
-#include "../sigsession.h"
+#include "pv/sigsession.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
using namespace boost;
using namespace std;
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);
_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))),
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()));
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);
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();
- if(!sig_data)
+ const shared_ptr<data::SignalData> sig_data = _session.get_data();
+ if (!sig_data)
return;
length = _data_length / (sig_data->get_samplerate() * _scale);
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) {
+ if (length < MaxScrollValue) {
horizontalScrollBar()->setRange(0, length);
horizontalScrollBar()->setSliderPosition(offset);
} else {
_offset * MaxScrollValue / (_scale * length));
}
+ _updating_scroll = false;
+
// 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 + SignalHeight;
+ 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)
{
const QEvent::Type type = event->type();
- if(type == QEvent::MouseMove) {
+ if (type == QEvent::MouseMove) {
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
- if(object == _viewport)
+ if (object == _viewport)
_hover_point = mouse_event->pos();
- else if(object == _ruler)
+ else if (object == _ruler)
_hover_point = QPoint(mouse_event->x(), 0);
- else if(object == _header)
+ else if (object == _header)
_hover_point = QPoint(0, mouse_event->y());
else
_hover_point = QPoint(-1, -1);
hover_point_changed();
- } else if(type == QEvent::Leave) {
+ } else if (type == QEvent::Leave) {
_hover_point = QPoint(-1, -1);
hover_point_changed();
}
}
}
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
{
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
void View::h_scroll_value_changed(int value)
{
+ if (_updating_scroll)
+ return;
+
const int range = horizontalScrollBar()->maximum();
- if(range < MaxScrollValue)
+ if (range < MaxScrollValue)
_offset = _scale * value;
else {
double length = 0, offset;
_viewport->update();
}
+void View::signals_changed()
+{
+ reset_signal_layout();
+}
+
void View::data_updated()
{
// Get the new data length
_data_length = 0;
- shared_ptr<LogicData> sig_data = _session.get_data();
- if(sig_data) {
- deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+ shared_ptr<data::Logic> sig_data = _session.get_data();
+ if (sig_data) {
+ deque< shared_ptr<data::LogicSnapshot> > &snapshots =
sig_data->get_snapshots();
- BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
- if(s)
+ BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
+ if (s)
_data_length = max(_data_length,
s->get_sample_count());
}
_viewport->update();
}
+void View::on_signals_moved()
+{
+ update_scroll();
+ signals_moved();
+}
+
} // namespace view
} // namespace pv