projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrated decode
[pulseview.git]
/
pv
/
view
/
decodesignal.h
diff --git
a/pv/view/decodesignal.h
b/pv/view/decodesignal.h
index 7e1410e8e5fe335d3c403ca9fbb231d49bd28d59..95459d68fd7da43faa97474610f94a6a89d0aa7b 100644
(file)
--- a/
pv/view/decodesignal.h
+++ b/
pv/view/decodesignal.h
@@
-26,27
+26,34
@@
#include <boost/shared_ptr.hpp>
namespace pv {
#include <boost/shared_ptr.hpp>
namespace pv {
+
+namespace data {
+class Decoder;
+}
+
namespace view {
class DecodeSignal : public Trace
{
namespace view {
class DecodeSignal : public Trace
{
+ Q_OBJECT
+
public:
public:
- DecodeSignal(pv::SigSession &session, srd_decoder *const dec);
+ DecodeSignal(pv::SigSession &session,
+ boost::shared_ptr<pv::data::Decoder> decoder);
+
+ void init_context_bar_actions(QWidget *parent);
bool enabled() const;
bool enabled() const;
+ void set_view(pv::view::View *view);
+
/**
* Paints the trace with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the trace with a QPainter
* @param p the QPainter to paint into.
- * @param y the y-coordinate to draw the signal at
* @param left the x-coordinate of the left edge of the signal
* @param right the x-coordinate of the right edge of the signal
* @param left the x-coordinate of the left edge of the signal
* @param right the x-coordinate of the right edge of the signal
- * @param scale the scale in seconds per pixel.
- * @param offset the time to show at the left hand edge of
- * the view in seconds.
**/
**/
- void paint(QPainter &p, int y, int left, int right,
- double scale, double offset);
+ void paint(QPainter &p, int left, int right);
const std::list<QAction*> get_context_bar_actions();
const std::list<QAction*> get_context_bar_actions();
@@
-59,7
+66,9
@@
private:
int get_nominal_offset(const QRect &rect) const;
private:
int get_nominal_offset(const QRect &rect) const;
private:
- srd_decoder *const _decoder;
+ boost::shared_ptr<pv::data::Decoder> _decoder;
+
+ uint64_t _decode_start, _decode_end;
};
} // namespace view
};
} // namespace view