projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index 540eb6eda38899b3027a9f3a4baac45ecb39b3ba..b3b591b28352484c1b2dd379763174d4ac2cd9ae 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-18,20
+18,26
@@
* 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_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
+#define PULSEVIEW_PV_VIEW_SIGNAL_H
+
+#include <memory>
#include <QComboBox>
#include <QWidgetAction>
#include <stdint.h>
#include <QComboBox>
#include <QWidgetAction>
#include <stdint.h>
-#include <libsigrok/libsigrok.h>
-
#include "trace.h"
#include "trace.h"
+namespace sigrok {
+ class Channel;
+}
+
namespace pv {
namespace pv {
+class SigSession;
+
namespace data {
class SignalData;
}
namespace data {
class SignalData;
}
@@
-43,7
+49,8
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(pv::SigSession &session, const sr_probe *const probe);
+ Signal(pv::SigSession &session,
+ std::shared_ptr<sigrok::Channel> channel);
public:
/**
public:
/**
@@
-51,26
+58,35
@@
public:
*/
void set_name(QString name);
*/
void set_name(QString name);
+ virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
+
/**
* Returns true if the trace is visible and enabled.
*/
bool enabled() const;
/**
* Returns true if the trace is visible and enabled.
*/
bool enabled() const;
- const sr_probe* probe() const;
+ void enable(bool enable = true);
+
+ std::shared_ptr<sigrok::Channel> channel() const;
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-private slots:
- void on_text_changed(const QString &text);
+ QMenu* create_context_menu(QWidget *parent);
+
+ void delete_pressed();
+
+private Q_SLOTS:
+ void on_disable();
protected:
protected:
- const sr_probe *const _probe;
+ pv::SigSession &session_;
+ std::shared_ptr<sigrok::Channel> channel_;
- QComboBox *
_name_widget
;
- bool
_updating_name_widget
;
+ QComboBox *
name_widget_
;
+ bool
updating_name_widget_
;
};
} // namespace view
} // namespace pv
};
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_
VIEW_
SIGNAL_H