projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MarginWidget: Moved in contextMenuEvent
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 71fbaa85c613d29dab29400edc5fe3d17c76c8c5..be2dadf11a0023a5cc1bce1204b71ad1a7a43d8f 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-129,7
+129,6
@@
DecodeTrace::DecodeTrace(pv::Session &session,
decoder_stack->stack().front()->decoder()->name)),
session_(session),
decoder_stack_(decoder_stack),
decoder_stack->stack().front()->decoder()->name)),
session_(session),
decoder_stack_(decoder_stack),
- text_height_(0),
row_height_(0),
delete_mapper_(this),
show_hide_mapper_(this)
row_height_(0),
delete_mapper_(this),
show_hide_mapper_(this)
@@
-160,23
+159,23
@@
pair<int, int> DecodeTrace::v_extents() const
{
/// @todo Replace this with an implementation that knows the true
/// height of the trace
{
/// @todo Replace this with an implementation that knows the true
/// height of the trace
- const int row_height = (
Ro
wItemPaintParams::text_height() * 6) / 4;
+ const int row_height = (
Vie
wItemPaintParams::text_height() * 6) / 4;
return make_pair(-row_height / 2, row_height * 7 / 2);
}
return make_pair(-row_height / 2, row_height * 7 / 2);
}
-void DecodeTrace::paint_back(QPainter &p, const
Ro
wItemPaintParams &pp)
+void DecodeTrace::paint_back(QPainter &p, const
Vie
wItemPaintParams &pp)
{
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
{
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
-void DecodeTrace::paint_mid(QPainter &p, const
Ro
wItemPaintParams &pp)
+void DecodeTrace::paint_mid(QPainter &p, const
Vie
wItemPaintParams &pp)
{
using namespace pv::data::decode;
{
using namespace pv::data::decode;
-
text_height_ = Ro
wItemPaintParams::text_height();
- row_height_ = (text_height
_
* 6) / 4;
- const int annotation_height = (text_height
_
* 5) / 4;
+
const int text_height = Vie
wItemPaintParams::text_height();
+ row_height_ = (text_height * 6) / 4;
+ const int annotation_height = (text_height * 5) / 4;
assert(decoder_stack_);
const QString err = decoder_stack_->error_message();
assert(decoder_stack_);
const QString err = decoder_stack_->error_message();
@@
-224,7
+223,7
@@
void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
}
draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
}
-void DecodeTrace::paint_fore(QPainter &p, const
Ro
wItemPaintParams &pp)
+void DecodeTrace::paint_fore(QPainter &p, const
Vie
wItemPaintParams &pp)
{
using namespace pv::data::decode;
{
using namespace pv::data::decode;
@@
-333,7
+332,7
@@
QMenu* DecodeTrace::create_context_menu(QWidget *parent)
}
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
}
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
- QPainter &p, int h, const
Ro
wItemPaintParams &pp, int y,
+ QPainter &p, int h, const
Vie
wItemPaintParams &pp, int y,
size_t base_colour) const
{
double samples_per_pixel, pixels_offset;
size_t base_colour) const
{
double samples_per_pixel, pixels_offset;
@@
-435,7
+434,7
@@
void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
}
void DecodeTrace::draw_error(QPainter &p, const QString &message,
}
void DecodeTrace::draw_error(QPainter &p, const QString &message,
- const
Ro
wItemPaintParams &pp)
+ const
Vie
wItemPaintParams &pp)
{
const int y = get_visual_y();
{
const int y = get_visual_y();
@@
-774,7
+773,7
@@
void DecodeTrace::commit_channels()
void DecodeTrace::on_new_decode_data()
{
if (owner_)
void DecodeTrace::on_new_decode_data()
{
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->
row_item_
appearance_changed(false, true);
}
void DecodeTrace::delete_pressed()
}
void DecodeTrace::delete_pressed()
@@
-834,7
+833,7
@@
void DecodeTrace::on_show_hide_decoder(int index)
decoder_forms_[index]->set_decoder_visible(show);
if (owner_)
decoder_forms_[index]->set_decoder_visible(show);
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->
row_item_
appearance_changed(false, true);
}
} // namespace view
}
} // namespace view