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
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 2773297197fa304e9561e6bb0ab009b9421a378f..899de3b238743f320d638c87308719f9f961ddc7 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-505,14
+505,17
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
- assert(_
view
);
+ assert(_
owner
);
assert(_decoder_stack);
assert(_decoder_stack);
- const double scale = _view->scale();
+ const View *view = _owner->view();
+ assert(view);
+
+ const double scale = view->scale();
assert(scale > 0);
const double pixels_offset =
assert(scale > 0);
const double pixels_offset =
- (
_
view->offset() - _decoder_stack->get_start_time()) / scale;
+ (view->offset() - _decoder_stack->get_start_time()) / scale;
double samplerate = _decoder_stack->samplerate();
double samplerate = _decoder_stack->samplerate();
@@
-580,10
+583,15
@@
void DecodeTrace::hide_hover_annotation()
void DecodeTrace::hover_point_changed()
{
void DecodeTrace::hover_point_changed()
{
- QPoint hp = _view->hover_point();
+ assert(_owner);
+
+ const View *const view = _owner->view();
+ assert(view);
+
+ QPoint hp = view->hover_point();
QString ann = get_annotation_at_point(hp);
QString ann = get_annotation_at_point(hp);
- assert(
_
view);
+ assert(view);
assert(_row_height);
if (ann.isEmpty()) {
assert(_row_height);
if (ann.isEmpty()) {
@@
-609,7
+617,7
@@
void DecodeTrace::hover_point_changed()
hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
- _row_height - text_size.height());
hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
- _row_height - text_size.height());
- QToolTip::showText(
_
view->viewport()->mapToGlobal(hp), ann);
+ QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
}
void DecodeTrace::create_decoder_form(int index,
}
void DecodeTrace::create_decoder_form(int index,
@@
-702,7
+710,7
@@
QComboBox* DecodeTrace::create_channel_selector(
if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
{
if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
{
- selector->addItem(s->
get_
name(),
+ selector->addItem(s->name(),
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
selector->setCurrentIndex(i + 1);
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
selector->setCurrentIndex(i + 1);
@@
-750,8
+758,8
@@
void DecodeTrace::commit_channels()
void DecodeTrace::on_new_decode_data()
{
void DecodeTrace::on_new_decode_data()
{
- if (_
view
)
- _
view
->update_viewport();
+ if (_
owner
)
+ _
owner
->update_viewport();
}
void DecodeTrace::delete_pressed()
}
void DecodeTrace::delete_pressed()
@@
-810,7
+818,7
@@
void DecodeTrace::on_show_hide_decoder(int index)
assert(index < (int)_decoder_forms.size());
_decoder_forms[index]->set_decoder_visible(show);
assert(index < (int)_decoder_forms.size());
_decoder_forms[index]->set_decoder_visible(show);
- _
view
->update_viewport();
+ _
owner
->update_viewport();
}
} // namespace view
}
} // namespace view