projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved all srd commands into decode thread, implemented error messages
[pulseview.git]
/
pv
/
view
/
decodesignal.h
diff --git
a/pv/view/decodesignal.h
b/pv/view/decodesignal.h
index 271937b831d87410d202776f83bfd5c6bc0e0033..e95c982225f92e9e126d0c40b0850f5dbeaed1fd 100644
(file)
--- a/
pv/view/decodesignal.h
+++ b/
pv/view/decodesignal.h
@@
-18,8
+18,8
@@
* 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_DECODESIGNAL_H
-#define PULSEVIEW_PV_DECODESIGNAL_H
+#ifndef PULSEVIEW_PV_
VIEW_
DECODESIGNAL_H
+#define PULSEVIEW_PV_
VIEW_
DECODESIGNAL_H
#include "trace.h"
#include "trace.h"
@@
-37,14
+37,17
@@
class DecodeSignal : public Trace
{
Q_OBJECT
{
Q_OBJECT
+private:
+ static const QColor DecodeColours[4];
+
public:
DecodeSignal(pv::SigSession &session,
public:
DecodeSignal(pv::SigSession &session,
- boost::shared_ptr<pv::data::Decoder> decoder);
-
- void init_context_bar_actions(QWidget *parent);
+ boost::shared_ptr<pv::data::Decoder> decoder, int index);
bool enabled() const;
bool enabled() const;
+ const boost::shared_ptr<pv::data::Decoder>& decoder() const;
+
void set_view(pv::view::View *view);
/**
void set_view(pv::view::View *view);
/**
@@
-63,7
+66,9
@@
public:
**/
void paint_mid(QPainter &p, int left, int right);
**/
void paint_mid(QPainter &p, int left, int right);
- const std::list<QAction*> get_context_bar_actions();
+ QMenu* create_context_menu(QWidget *parent);
+
+ void delete_pressed();
private:
private:
@@
-73,6
+78,11
@@
private:
**/
int get_nominal_offset(const QRect &rect) const;
**/
int get_nominal_offset(const QRect &rect) const;
+private slots:
+ void on_new_decode_data();
+
+ void on_delete();
+
private:
boost::shared_ptr<pv::data::Decoder> _decoder;
private:
boost::shared_ptr<pv::data::Decoder> _decoder;
@@
-82,4
+92,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_DECODESIGNAL_H
+#endif // PULSEVIEW_PV_
VIEW_
DECODESIGNAL_H