#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;
_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))),
+ _cursors(*this),
_hover_point(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
connect(&_session, SIGNAL(data_updated()),
this, SLOT(data_updated()));
- connect(&_cursors.first, SIGNAL(time_changed()),
+ connect(_cursors.first().get(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
- connect(&_cursors.second, SIGNAL(time_changed()),
+ connect(_cursors.second().get(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
connect(_header, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
+ connect(_header, SIGNAL(selection_changed()),
+ _ruler, SLOT(clear_selection()));
+ connect(_ruler, SIGNAL(selection_changed()),
+ _header, SLOT(clear_selection()));
+
+ connect(_header, SIGNAL(selection_changed()),
+ this, SIGNAL(selection_changed()));
+ connect(_ruler, SIGNAL(selection_changed()),
+ this, SIGNAL(selection_changed()));
+
setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
setViewport(_viewport);
_viewport->update();
}
+list<weak_ptr<SelectableItem> > View::selected_items() const
+{
+ list<weak_ptr<SelectableItem> > items;
+
+ // List the selected signals
+ const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+ BOOST_FOREACH (shared_ptr<Signal> s, sigs) {
+ assert(s);
+ if (s->selected())
+ items.push_back(s);
+ }
+
+ // List the selected cursors
+ if (_cursors.first()->selected())
+ items.push_back(_cursors.first());
+ if (_cursors.second()->selected())
+ items.push_back(_cursors.second());
+
+ return items;
+}
+
bool View::cursors_shown() const
{
return _show_cursors;
_viewport->update();
}
-std::pair<Cursor, Cursor>& View::cursors()
+void View::centre_cursors()
+{
+ const double time_width = _scale * _viewport->width();
+ _cursors.first()->set_time(_offset + time_width * 0.4);
+ _cursors.second()->set_time(_offset + time_width * 0.6);
+ _ruler->update();
+ _viewport->update();
+}
+
+CursorPair& View::cursors()
+{
+ return _cursors;
+}
+
+const CursorPair& View::cursors() const
{
return _cursors;
}
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;
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) {
horizontalScrollBar()->setRange(0, length);
_offset * MaxScrollValue / (_scale * length));
}
+ _updating_scroll = false;
+
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
verticalScrollBar()->setRange(0,
areaSize.height());
}
-void View::reset_signal_layout()
-{
- int offset = SignalMargin;
- 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();
}
}
-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)
_offset = _scale * value;
void View::signals_changed()
{
- reset_signal_layout();
+ int offset = SignalMargin + SignalHeight;
+ const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+ BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+ s->init_context_bar_actions(NULL);
+ s->set_v_offset(offset);
+ offset += SignalHeight + 2 * SignalMargin;
+ }
+
+ normalize_layout();
}
void View::data_updated()
{
// 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());