projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix segfault in connect device dialog
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index d55bcf1fe5205386ef8165be34b020232d496def..86d2f38007a5b14455c95caca358aec759f89c12 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.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_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_
VIEW_
SIGNAL_H
+#define PULSEVIEW_PV_
VIEW_
SIGNAL_H
#include <QComboBox>
#include <QWidgetAction>
#include <QComboBox>
#include <QWidgetAction>
@@
-43,11
+43,9
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(pv::SigSession &session,
const
sr_probe *const probe);
+ Signal(pv::SigSession &session, sr_probe *const probe);
public:
public:
- virtual void init_context_bar_actions(QWidget *parent);
-
/**
* Sets the name of the signal.
*/
/**
* Sets the name of the signal.
*/
@@
-58,15
+56,15
@@
public:
*/
bool enabled() const;
*/
bool enabled() const;
+ void enable(bool enable = true);
+
const sr_probe* probe() const;
const sr_probe* probe() const;
-private slots:
- void on_text_changed(const QString &text);
+ virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
protected:
protected:
-
const
sr_probe *const _probe;
+ sr_probe *const _probe;
- QWidgetAction *_name_action;
QComboBox *_name_widget;
bool _updating_name_widget;
};
QComboBox *_name_widget;
bool _updating_name_widget;
};
@@
-74,4
+72,4
@@
protected:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_
VIEW_
SIGNAL_H