projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace View ownership of traces with RowItemOwner
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 1d55e14f7c91f20f55d09bffc1d4540d8819ddb6..7a55bbb3fd2776fc7c38afae05864a5e2649b683 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-43,6
+43,7
@@
#include "pv/data/logicsnapshot.h"
using pv::data::SignalData;
#include "pv/data/logicsnapshot.h"
using pv::data::SignalData;
+using std::back_inserter;
using std::deque;
using std::list;
using std::max;
using std::deque;
using std::list;
using std::max;
@@
-92,6
+93,8
@@
View::View(SigSession &session, QWidget *parent) :
connect(&_session, SIGNAL(signals_changed()),
this, SLOT(signals_changed()));
connect(&_session, SIGNAL(signals_changed()),
this, SLOT(signals_changed()));
+ connect(&_session, SIGNAL(capture_state_changed(int)),
+ this, SLOT(data_updated()));
connect(&_session, SIGNAL(data_received()),
this, SLOT(data_updated()));
connect(&_session, SIGNAL(frame_ended()),
connect(&_session, SIGNAL(data_received()),
this, SLOT(data_updated()));
connect(&_session, SIGNAL(frame_ended()),
@@
-117,6
+120,9
@@
View::View(SigSession &session, QWidget *parent) :
connect(_cursorheader, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
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);
setViewport(_viewport);
_viewport->installEventFilter(this);
@@
-143,6
+149,26
@@
const SigSession& View::session() const
return _session;
}
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;
double View::scale() const
{
return _scale;
@@
-153,9
+179,9
@@
double View::offset() const
return _offset;
}
return _offset;
}
-int View::v_offset() const
+int View::
owner_
v_offset() const
{
{
- return _v_offset;
+ return
-
_v_offset;
}
void View::zoom(double steps)
}
void View::zoom(double steps)
@@
-225,27
+251,25
@@
void View::set_scale_offset(double scale, double offset)
scale_offset_changed();
}
scale_offset_changed();
}
-vector< shared_ptr<
Trace> > View::get_trace
s() const
+vector< shared_ptr<
RowItem> > View::child_item
s() const
{
{
+ vector< shared_ptr<RowItem> > row_items;
+
const vector< shared_ptr<Signal> > sigs(
session().get_signals());
const vector< shared_ptr<Signal> > sigs(
session().get_signals());
+ copy(sigs.begin(), sigs.end(), back_inserter(row_items));
+
#ifdef ENABLE_DECODE
const vector< shared_ptr<DecodeTrace> > decode_sigs(
session().get_decode_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());
+ copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(row_items));
#endif
#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(row_items.begin(), row_items.end(),
+ [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+ return a->v_offset() < b->v_offset(); });
- stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
- return traces;
+ return row_items;
}
list<weak_ptr<SelectableItem> > View::selected_items() const
}
list<weak_ptr<SelectableItem> > View::selected_items() const
@@
-253,11
+277,11
@@
list<weak_ptr<SelectableItem> > View::selected_items() const
list<weak_ptr<SelectableItem> > items;
// List the selected signals
list<weak_ptr<SelectableItem> > items;
// List the selected signals
- const vector< shared_ptr<
Trace> > traces(get_trace
s());
- for (shared_ptr<
Trace> t : trace
s) {
- assert(
t
);
- if (
t
->selected())
- items.push_back(
t
);
+ const vector< shared_ptr<
RowItem> > row_items(child_item
s());
+ for (shared_ptr<
RowItem> r : row_item
s) {
+ assert(
r
);
+ if (
r
->selected())
+ items.push_back(
r
);
}
// List the selected cursors
}
// List the selected cursors
@@
-343,15
+367,15
@@
const QPoint& View::hover_point() const
void View::normalize_layout()
{
void View::normalize_layout()
{
- const vector< shared_ptr<
Trace> > traces(get_trace
s());
+ const vector< shared_ptr<
RowItem> > row_items(child_item
s());
int v_min = INT_MAX;
int v_min = INT_MAX;
- for (const shared_ptr<
Trace> t : trace
s)
- v_min = min(
t->get_
v_offset(), v_min);
+ for (const shared_ptr<
RowItem> r : row_item
s)
+ v_min = min(
r->
v_offset(), v_min);
const int delta = -min(v_min, 0);
const int delta = -min(v_min, 0);
- for (shared_ptr<
Trace> t : trace
s)
-
t->set_v_offset(t->get_
v_offset() + delta);
+ for (shared_ptr<
RowItem> r : row_item
s)
+
r->set_v_offset(r->
v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
v_scroll_value_changed(verticalScrollBar()->sliderPosition());
verticalScrollBar()->setSliderPosition(_v_offset + delta);
v_scroll_value_changed(verticalScrollBar()->sliderPosition());
@@
-427,12
+451,17
@@
void View::update_layout()
update_scroll();
}
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)
{
{
- assert(a);
- assert(b);
- return a->get_v_offset() < b->get_v_offset();
+ (void)p;
+ (void)right;
+ (void)hover;
+}
+
+QRectF View::label_rect(int right)
+{
+ (void)right;
+ return QRectF();
}
bool View::eventFilter(QObject *object, QEvent *event)
}
bool View::eventFilter(QObject *object, QEvent *event)
@@
-513,10
+542,10
@@
void View::v_scroll_value_changed(int value)
void View::signals_changed()
{
int offset = SignalMargin + SignalHeight;
void View::signals_changed()
{
int offset = SignalMargin + SignalHeight;
- const vector< shared_ptr<
Trace> > traces(get_trace
s());
- for (shared_ptr<
Trace> t : trace
s) {
-
t->set_view
(this);
-
t
->set_v_offset(offset);
+ const vector< shared_ptr<
RowItem> > row_items(child_item
s());
+ for (shared_ptr<
RowItem> r : row_item
s) {
+
r->set_owner
(this);
+
r
->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
offset += SignalHeight + 2 * SignalMargin;
}
@@
-550,5
+579,12
@@
void View::on_geometry_updated()
update_layout();
}
update_layout();
}
+void View::on_hover_point_changed()
+{
+ const vector< shared_ptr<RowItem> > row_items(child_items());
+ for (shared_ptr<RowItem> r : row_items)
+ r->hover_point_changed();
+}
+
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv