projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeTrace: Remove unnecessary parameters
[pulseview.git]
/
pv
/
view
/
decodetrace.hpp
diff --git
a/pv/view/decodetrace.hpp
b/pv/view/decodetrace.hpp
index edf3205b530479993cd96209af523ea48eea6353..eb011e74367df36951046beb5c582a8dd06ef8c1 100644
(file)
--- a/
pv/view/decodetrace.hpp
+++ b/
pv/view/decodetrace.hpp
@@
-18,18
+18,19
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
PP
+#define PULSEVIEW_PV_VIEW_DECODETRACE_H
PP
#include "trace.hpp"
#include <list>
#include <map>
#include <memory>
#include "trace.hpp"
#include <list>
#include <map>
#include <memory>
+#include <vector>
#include <QSignalMapper>
#include <QSignalMapper>
-#include <pv/
prop/binding/decoderoptions
.hpp>
+#include <pv/
binding/decoder
.hpp>
#include <pv/data/decode/row.hpp>
struct srd_channel;
#include <pv/data/decode/row.hpp>
struct srd_channel;
@@
-76,6
+77,7
@@
private:
static const int ArrowSize;
static const double EndCapWidth;
static const int ArrowSize;
static const double EndCapWidth;
+ static const int RowTitleMargin;
static const int DrawPadding;
static const QColor Colours[16];
static const int DrawPadding;
static const QColor Colours[16];
@@
-100,21
+102,21
@@
public:
* Paints the background layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
* Paints the background layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
- *
*
/
+ */
void paint_back(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
void paint_back(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- *
*
/
+ */
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- *
*
/
+ */
void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
void populate_popup_form(QWidget *parent, QFormLayout *form);
void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-124,16
+126,23
@@
public:
void delete_pressed();
private:
void delete_pressed();
private:
+ void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour, int row_title_width);
+
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
int text_height, const ViewItemPaintParams &pp, int y,
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
int text_height, const ViewItemPaintParams &pp, int y,
- size_t base_colour) const;
+ size_t base_colour, int row_title_width) const;
+
+ void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
+ QPainter &p, int h, int y, size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-
QColor fill, QColor outline,
int h, double x, int y) const;
+ int h, double x, int y) const;
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-
QColor fill, QColor outline, int h, double start
,
-
double end, int y
) const;
+
int h, double start, double end, int y, const ViewItemPaintParams &pp
,
+
int row_title_width
) const;
void draw_error(QPainter &p, const QString &message,
const ViewItemPaintParams &pp);
void draw_error(QPainter &p, const QString &message,
const ViewItemPaintParams &pp);
@@
-191,14
+200,15
@@
private:
uint64_t decode_start_, decode_end_;
uint64_t decode_start_, decode_end_;
- std::list< std::shared_ptr<pv::
prop::binding::DecoderOptions
> >
+ std::list< std::shared_ptr<pv::
binding::Decoder
> >
bindings_;
std::list<ChannelSelector> channel_selectors_;
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
std::vector<data::decode::Row> visible_rows_;
bindings_;
std::list<ChannelSelector> channel_selectors_;
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
std::vector<data::decode::Row> visible_rows_;
- int text_height_, row_height_;
+ std::map<data::decode::Row, int> row_title_widths_;
+ int row_height_, max_visible_rows_;
QSignalMapper delete_mapper_, show_hide_mapper_;
};
QSignalMapper delete_mapper_, show_hide_mapper_;
};
@@
-206,4
+216,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
PP