#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
+#include <cassert>
+#include <climits>
+#include <cmath>
+#include <mutex>
#include <QEvent>
#include <QMouseEvent>
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
+using boost::shared_lock;
+using boost::shared_mutex;
using pv::data::SignalData;
+using std::back_inserter;
using std::deque;
using std::list;
+using std::lock_guard;
using std::max;
using std::make_pair;
using std::min;
const int View::SignalHeight = 30;
const int View::SignalMargin = 10;
-const int View::SignalSnapGridSize = 10;
const QColor View::CursorAreaColour(220, 231, 243);
connect(_cursorheader, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
+ connect(this, SIGNAL(hover_point_changed()),
+ this, SLOT(on_hover_point_changed()));
+
setViewport(_viewport);
_viewport->installEventFilter(this);
return _session;
}
+View* View::view()
+{
+ return this;
+}
+
+const View* View::view() const
+{
+ return this;
+}
+
+Viewport* View::viewport()
+{
+ return _viewport;
+}
+
+const Viewport* View::viewport() const
+{
+ return _viewport;
+}
+
double View::scale() const
{
return _scale;
return _offset;
}
-int View::v_offset() const
+int View::owner_v_offset() const
{
- return _v_offset;
+ return -_v_offset;
}
void View::zoom(double steps)
{
using pv::data::SignalData;
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
-
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data = get_visible_data();
if (visible_data.empty())
scale_offset_changed();
}
-vector< shared_ptr<Trace> > View::get_traces() const
-{
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
-#ifdef ENABLE_DECODE
- const vector< shared_ptr<DecodeTrace> > decode_sigs(
- session().get_decode_signals());
- vector< shared_ptr<Trace> > traces(
- sigs.size() + decode_sigs.size());
-#else
- vector< shared_ptr<Trace> > traces(sigs.size());
-#endif
-
- auto i = traces.begin();
- i = copy(sigs.begin(), sigs.end(), i);
-#ifdef ENABLE_DECODE
- i = copy(decode_sigs.begin(), decode_sigs.end(), i);
-#endif
-
- stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
- return traces;
-}
-
-list<weak_ptr<SelectableItem> > View::selected_items() const
-{
- list<weak_ptr<SelectableItem> > items;
-
- // List the selected signals
- const vector< shared_ptr<Trace> > traces(get_traces());
- for (shared_ptr<Trace> t : traces) {
- assert(t);
- if (t->selected())
- items.push_back(t);
- }
-
- // List the selected cursors
- if (_cursors.first()->selected())
- items.push_back(_cursors.first());
- if (_cursors.second()->selected())
- items.push_back(_cursors.second());
-
- return items;
-}
-
set< shared_ptr<SignalData> > View::get_visible_data() const
{
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
+ shared_lock<shared_mutex> lock(session().signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session().signals());
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
void View::normalize_layout()
{
- const vector< shared_ptr<Trace> > traces(get_traces());
-
int v_min = INT_MAX;
- for (const shared_ptr<Trace> t : traces)
- v_min = min(t->get_v_offset(), v_min);
+ for (const shared_ptr<RowItem> r : *this)
+ v_min = min(r->v_offset(), v_min);
const int delta = -min(v_min, 0);
- for (shared_ptr<Trace> t : traces)
- t->set_v_offset(t->get_v_offset() + delta);
+ for (shared_ptr<RowItem> r : *this)
+ r->set_v_offset(r->v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
v_scroll_value_changed(verticalScrollBar()->sliderPosition());
update_scroll();
}
-bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
- const shared_ptr<Trace> &b)
+void View::paint_label(QPainter &p, int right, bool hover)
+{
+ (void)p;
+ (void)right;
+ (void)hover;
+}
+
+QRectF View::label_rect(int right)
{
- assert(a);
- assert(b);
- return a->get_v_offset() < b->get_v_offset();
+ (void)right;
+ return QRectF();
}
bool View::eventFilter(QObject *object, QEvent *event)
void View::signals_changed()
{
+ // Populate the traces
+ clear_child_items();
+
+ shared_lock<shared_mutex> lock(session().signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session().signals());
+ for (auto s : sigs)
+ add_child_item(s);
+
+#ifdef ENABLE_DECODE
+ const vector< shared_ptr<DecodeTrace> > decode_sigs(
+ session().get_decode_signals());
+ for (auto s : decode_sigs)
+ add_child_item(s);
+#endif
+
+ // Create the initial layout
int offset = SignalMargin + SignalHeight;
- const vector< shared_ptr<Trace> > traces(get_traces());
- for (shared_ptr<Trace> t : traces) {
- t->set_view(this);
- t->set_v_offset(offset);
+ for (shared_ptr<RowItem> r : *this) {
+ r->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
update_layout();
normalize_layout();
+
+ // Update the child widgets
+ _header->signals_updated();
+ _viewport->signals_updated();
}
void View::data_updated()
update_layout();
}
+void View::on_hover_point_changed()
+{
+ for (shared_ptr<RowItem> r : *this)
+ r->hover_point_changed();
+}
+
} // namespace view
} // namespace pv