#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;
Cursor(*this, 1.0))),
_hover_point(-1, -1)
{
- connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(h_scroll_value_changed(int)));
+ connect(horizontalScrollBar(), SIGNAL(sliderMoved(int)),
+ this, SLOT(h_scroll_moved(int)));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(v_scroll_value_changed(int)));
void View::get_scroll_layout(double &length, double &offset) const
{
- const shared_ptr<SignalData> sig_data = _session.get_data();
+ const shared_ptr<data::SignalData> sig_data = _session.get_data();
if (!sig_data)
return;
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);
}
}
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
{
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
update_scroll();
}
-void View::h_scroll_value_changed(int value)
+void View::h_scroll_moved(int value)
{
const int range = horizontalScrollBar()->maximum();
if (range < MaxScrollValue)
{
// Get the new data length
_data_length = 0;
- shared_ptr<LogicData> sig_data = _session.get_data();
+ shared_ptr<data::Logic> sig_data = _session.get_data();
if (sig_data) {
- deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+ deque< shared_ptr<data::LogicSnapshot> > &snapshots =
sig_data->get_snapshots();
- BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
+ BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
if (s)
_data_length = max(_data_length,
s->get_sample_count());