mirror of git://sigrok.org/pulseview
Move row/annotation color management out of DecodeTrace
This commit is contained in:
parent
1dcd9b1818
commit
ae30ff422a
|
@ -66,8 +66,9 @@ Annotation& Annotation::operator=(Annotation&& a)
|
|||
return *this;
|
||||
}
|
||||
|
||||
Annotation::~Annotation()
|
||||
const Row* Annotation::row() const
|
||||
{
|
||||
return data_->row();
|
||||
}
|
||||
|
||||
uint64_t Annotation::start_sample() const
|
||||
|
@ -103,9 +104,19 @@ const QString Annotation::longest_annotation() const
|
|||
return texts_->front();
|
||||
}
|
||||
|
||||
const Row* Annotation::row() const
|
||||
const QColor Annotation::color() const
|
||||
{
|
||||
return data_->row();
|
||||
return data_->row()->get_class_color(ann_class_id_);
|
||||
}
|
||||
|
||||
const QColor Annotation::bright_color() const
|
||||
{
|
||||
return data_->row()->get_bright_class_color(ann_class_id_);
|
||||
}
|
||||
|
||||
const QColor Annotation::dark_color() const
|
||||
{
|
||||
return data_->row()->get_dark_class_color(ann_class_id_);
|
||||
}
|
||||
|
||||
bool Annotation::operator<(const Annotation &other) const
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
#include <QColor>
|
||||
#include <QString>
|
||||
|
||||
using std::vector;
|
||||
|
@ -46,7 +47,8 @@ public:
|
|||
const vector<QString>* texts, Class ann_class_id, const RowData *data);
|
||||
Annotation(Annotation&& a);
|
||||
Annotation& operator=(Annotation&& a);
|
||||
~Annotation();
|
||||
|
||||
const Row* row() const;
|
||||
|
||||
uint64_t start_sample() const;
|
||||
uint64_t end_sample() const;
|
||||
|
@ -56,7 +58,10 @@ public:
|
|||
|
||||
const vector<QString>* annotations() const;
|
||||
const QString longest_annotation() const;
|
||||
const Row* row() const;
|
||||
|
||||
const QColor color() const;
|
||||
const QColor bright_color() const;
|
||||
const QColor dark_color() const;
|
||||
|
||||
bool operator<(const Annotation &other) const;
|
||||
|
||||
|
|
|
@ -112,6 +112,54 @@ void Row::set_visible(bool visible)
|
|||
visible_ = visible;
|
||||
}
|
||||
|
||||
void Row::set_base_color(QColor base_color)
|
||||
{
|
||||
// For the row color, use the base color hue and add an offset that's
|
||||
// not a dividend of 360
|
||||
|
||||
const int h = (base_color.toHsv().hue() + 20 * index_) % 360;
|
||||
const int s = DECODE_COLOR_SATURATION;
|
||||
const int v = DECODE_COLOR_VALUE;
|
||||
color_.setHsl(h, s, v);
|
||||
|
||||
vector<AnnotationClass*> classes = ann_classes();
|
||||
for (const AnnotationClass* ann_class : classes) {
|
||||
|
||||
// For each class color, use the row color hue and add an offset that's
|
||||
// not a dividend of 360 and not a multiple of the row offset
|
||||
|
||||
QColor ann_color(color_);
|
||||
const int h = (ann_color.toHsv().hue() + 55 * ann_class->id) % 360;
|
||||
const int s = DECODE_COLOR_SATURATION;
|
||||
const int v = DECODE_COLOR_VALUE;
|
||||
ann_color.setHsl(h, s, v);
|
||||
|
||||
ann_class_color_[ann_class->id] = ann_color;
|
||||
ann_bright_class_color_[ann_class->id] = ann_color.lighter();
|
||||
ann_dark_class_color_[ann_class->id] = ann_color.darker();
|
||||
}
|
||||
}
|
||||
|
||||
const QColor Row::color() const
|
||||
{
|
||||
return color_;
|
||||
}
|
||||
|
||||
const QColor Row::get_class_color(uint32_t ann_class_id) const
|
||||
{
|
||||
return ann_class_color_.at(ann_class_id);
|
||||
}
|
||||
|
||||
const QColor Row::get_bright_class_color(uint32_t ann_class_id) const
|
||||
{
|
||||
return ann_bright_class_color_.at(ann_class_id);
|
||||
}
|
||||
|
||||
const QColor Row::get_dark_class_color(uint32_t ann_class_id) const
|
||||
{
|
||||
return ann_dark_class_color_.at(ann_class_id);
|
||||
}
|
||||
|
||||
bool Row::has_hidden_classes() const
|
||||
{
|
||||
for (const AnnotationClass* c : ann_classes())
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#include <QColor>
|
||||
|
||||
#include <pv/data/decode/annotation.hpp>
|
||||
#include <pv/data/decode/decoder.hpp>
|
||||
|
||||
|
@ -32,6 +34,9 @@ namespace pv {
|
|||
namespace data {
|
||||
namespace decode {
|
||||
|
||||
#define DECODE_COLOR_SATURATION (180) /* 0-255 */
|
||||
#define DECODE_COLOR_VALUE (170) /* 0-255 */
|
||||
|
||||
struct AnnotationClass;
|
||||
class Decoder;
|
||||
|
||||
|
@ -54,6 +59,12 @@ public:
|
|||
bool visible() const;
|
||||
void set_visible(bool visible);
|
||||
|
||||
void set_base_color(QColor base_color);
|
||||
const QColor color() const;
|
||||
const QColor get_class_color(uint32_t ann_class_id) const;
|
||||
const QColor get_bright_class_color(uint32_t ann_class_id) const;
|
||||
const QColor get_dark_class_color(uint32_t ann_class_id) const;
|
||||
|
||||
bool has_hidden_classes() const;
|
||||
|
||||
bool operator<(const Row& other) const;
|
||||
|
@ -64,6 +75,11 @@ private:
|
|||
Decoder* decoder_;
|
||||
const srd_decoder_annotation_row* srd_row_;
|
||||
bool visible_;
|
||||
|
||||
QColor color_;
|
||||
map<uint32_t, QColor> ann_class_color_;
|
||||
map<uint32_t, QColor> ann_bright_class_color_;
|
||||
map<uint32_t, QColor> ann_dark_class_color_;
|
||||
};
|
||||
|
||||
} // namespace decode
|
||||
|
|
|
@ -82,9 +82,6 @@ namespace pv {
|
|||
namespace views {
|
||||
namespace trace {
|
||||
|
||||
#define DECODETRACE_COLOR_SATURATION (180) /* 0-255 */
|
||||
#define DECODETRACE_COLOR_VALUE (170) /* 0-255 */
|
||||
|
||||
const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29);
|
||||
const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85);
|
||||
const QColor DecodeTrace::ExpandMarkerWarnColor = QColor(0xFF, 0xA5, 0x00); // QColorConstants::Svg::orange
|
||||
|
@ -175,11 +172,14 @@ DecodeTrace::DecodeTrace(pv::Session &session,
|
|||
// Note: The offset equals the color of the first annotation
|
||||
QColor color;
|
||||
const int h = (120 + 160 * index) % 360;
|
||||
const int s = DECODETRACE_COLOR_SATURATION;
|
||||
const int v = DECODETRACE_COLOR_VALUE;
|
||||
const int s = DECODE_COLOR_SATURATION;
|
||||
const int v = DECODE_COLOR_VALUE;
|
||||
color.setHsv(h, s, v);
|
||||
base_->set_color(color);
|
||||
|
||||
connect(decode_signal_.get(), SIGNAL(color_changed(QColor)),
|
||||
this, SLOT(on_color_changed(QColor)));
|
||||
|
||||
connect(decode_signal_.get(), SIGNAL(new_annotations()),
|
||||
this, SLOT(on_new_annotations()));
|
||||
connect(decode_signal_.get(), SIGNAL(decode_reset()),
|
||||
|
@ -789,8 +789,8 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p,
|
|||
const double start = a->start_sample() / samples_per_pixel - pixels_offset;
|
||||
const double end = a->end_sample() / samples_per_pixel - pixels_offset;
|
||||
|
||||
p.setPen(row.ann_class_dark_color.at(a->ann_class_id()));
|
||||
p.setBrush(row.ann_class_color.at(a->ann_class_id()));
|
||||
p.setPen(a->dark_color());
|
||||
p.setBrush(a->color());
|
||||
|
||||
if ((start > (pp.right() + DrawPadding)) || (end < (pp.left() - DrawPadding)))
|
||||
return;
|
||||
|
@ -813,8 +813,8 @@ void DecodeTrace::draw_annotation_block(qreal start, qreal end,
|
|||
// one format that all of these annotations have. Otherwise, we should use
|
||||
// a neutral color (i.e. gray)
|
||||
if (use_ann_format) {
|
||||
p.setPen(row.ann_class_dark_color.at(ann_class));
|
||||
p.setBrush(QBrush(row.ann_class_color.at(ann_class), Qt::Dense4Pattern));
|
||||
p.setPen(row.decode_row->get_dark_class_color(ann_class));
|
||||
p.setBrush(QBrush(row.decode_row->get_class_color(ann_class), Qt::Dense4Pattern));
|
||||
} else {
|
||||
p.setPen(QColor(Qt::darkGray));
|
||||
p.setBrush(QBrush(Qt::gray, Qt::Dense4Pattern));
|
||||
|
@ -995,34 +995,6 @@ pair<uint64_t, uint64_t> DecodeTrace::get_view_sample_range(
|
|||
return make_pair(start, end);
|
||||
}
|
||||
|
||||
QColor DecodeTrace::get_row_color(int row_index) const
|
||||
{
|
||||
// For each row color, use the base color hue and add an offset that's
|
||||
// not a dividend of 360
|
||||
|
||||
QColor color;
|
||||
const int h = (base_->color().toHsv().hue() + 20 * row_index) % 360;
|
||||
const int s = DECODETRACE_COLOR_SATURATION;
|
||||
const int v = DECODETRACE_COLOR_VALUE;
|
||||
color.setHsl(h, s, v);
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
QColor DecodeTrace::get_annotation_color(QColor row_color, int annotation_index) const
|
||||
{
|
||||
// For each row color, use the base color hue and add an offset that's
|
||||
// not a dividend of 360 and not a multiple of the row offset
|
||||
|
||||
QColor color(row_color);
|
||||
const int h = (color.toHsv().hue() + 55 * annotation_index) % 360;
|
||||
const int s = DECODETRACE_COLOR_SATURATION;
|
||||
const int v = DECODETRACE_COLOR_VALUE;
|
||||
color.setHsl(h, s, v);
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
unsigned int DecodeTrace::get_row_y(const DecodeTraceRow* row) const
|
||||
{
|
||||
assert(row);
|
||||
|
@ -1372,7 +1344,7 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id)
|
|||
|
||||
int dim = ViewItemPaintParams::text_height() - 2;
|
||||
QPixmap pixmap(dim, dim);
|
||||
pixmap.fill(r->ann_class_color[ann_class->id]);
|
||||
pixmap.fill(r->decode_row->get_class_color(ann_class->id));
|
||||
cb->setIcon(pixmap);
|
||||
|
||||
r->selector_container->layout()->addWidget(cb);
|
||||
|
@ -1408,6 +1380,7 @@ void DecodeTrace::update_rows()
|
|||
// Row doesn't exist yet, create and append it
|
||||
DecodeTraceRow nr;
|
||||
nr.decode_row = decode_row;
|
||||
nr.decode_row->set_base_color(base_->color());
|
||||
nr.height = default_row_height_;
|
||||
nr.expanded_height = default_row_height_;
|
||||
nr.currently_visible = false;
|
||||
|
@ -1421,16 +1394,6 @@ void DecodeTrace::update_rows()
|
|||
nr.header_container = new QWidget(nr.container);
|
||||
nr.selector_container = new QWidget(nr.container);
|
||||
|
||||
nr.row_color = get_row_color(decode_row->index());
|
||||
|
||||
vector<AnnotationClass*> ann_classes = decode_row->ann_classes();
|
||||
for (const AnnotationClass* ann_class : ann_classes) {
|
||||
nr.ann_class_color[ann_class->id] =
|
||||
get_annotation_color(nr.row_color, ann_class->id);
|
||||
nr.ann_class_dark_color[ann_class->id] =
|
||||
nr.ann_class_color[ann_class->id].darker();
|
||||
}
|
||||
|
||||
rows_.push_back(nr);
|
||||
r = &rows_.back();
|
||||
initialize_row_widgets(r, row_id);
|
||||
|
@ -1526,6 +1489,12 @@ void DecodeTrace::on_setting_changed(const QString &key, const QVariant &value)
|
|||
always_show_all_rows_ = value.toBool();
|
||||
}
|
||||
|
||||
void DecodeTrace::on_color_changed(const QColor &color)
|
||||
{
|
||||
for (DecodeTraceRow& r : rows_)
|
||||
r.decode_row->set_base_color(color);
|
||||
}
|
||||
|
||||
void DecodeTrace::on_new_annotations()
|
||||
{
|
||||
if (!delayed_trace_updater_.isActive())
|
||||
|
|
|
@ -100,10 +100,6 @@ struct DecodeTraceRow {
|
|||
QWidget* selector_container;
|
||||
QCheckBox* row_visibility_checkbox;
|
||||
vector<QCheckBox*> selectors;
|
||||
|
||||
QColor row_color;
|
||||
map<uint32_t, QColor> ann_class_color;
|
||||
map<uint32_t, QColor> ann_class_dark_color;
|
||||
};
|
||||
|
||||
class ContainerWidget : public QWidget
|
||||
|
@ -225,9 +221,6 @@ private:
|
|||
*/
|
||||
pair<uint64_t, uint64_t> get_view_sample_range(int x_start, int x_end) const;
|
||||
|
||||
QColor get_row_color(int row_index) const;
|
||||
QColor get_annotation_color(QColor row_color, int annotation_index) const;
|
||||
|
||||
unsigned int get_row_y(const DecodeTraceRow* row) const;
|
||||
|
||||
DecodeTraceRow* get_row_at_point(const QPoint &point);
|
||||
|
@ -264,6 +257,8 @@ private:
|
|||
private Q_SLOTS:
|
||||
void on_setting_changed(const QString &key, const QVariant &value);
|
||||
|
||||
void on_color_changed(const QColor &color);
|
||||
|
||||
void on_new_annotations();
|
||||
void on_delayed_trace_update();
|
||||
void on_decode_reset();
|
||||
|
|
Loading…
Reference in New Issue