projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wait until SDI is set before updating sweep timing widgets.
[pulseview.git]
/
pv
/
view
/
logicsignal.h
diff --git
a/pv/view/logicsignal.h
b/pv/view/logicsignal.h
index 8b977ae285b5dd3098637db533a6e78abd25b0e2..992745eb8e6ff6927ae10bf8db0ddbe952244b82 100644
(file)
--- a/
pv/view/logicsignal.h
+++ b/
pv/view/logicsignal.h
@@
-18,13
+18,15
@@
* 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_LOGICSIGNAL_H
-#define PULSEVIEW_PV_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_
VIEW_
LOGICSIGNAL_H
+#define PULSEVIEW_PV_
VIEW_
LOGICSIGNAL_H
#include "signal.h"
#include <boost/shared_ptr.hpp>
#include "signal.h"
#include <boost/shared_ptr.hpp>
+class QToolBar;
+
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-47,12
+49,14
@@
private:
static const QColor SignalColours[10];
public:
static const QColor SignalColours[10];
public:
- LogicSignal(pv::SigSession &session,
const
sr_probe *const probe,
+ LogicSignal(pv::SigSession &session, sr_probe *const probe,
boost::shared_ptr<pv::data::Logic> data);
virtual ~LogicSignal();
boost::shared_ptr<pv::data::Logic> data);
virtual ~LogicSignal();
- boost::shared_ptr<pv::data::Logic> data() const;
+ boost::shared_ptr<pv::data::SignalData> data() const;
+
+ boost::shared_ptr<pv::data::Logic> logic_data() const;
/**
* Paints the background layer of the signal with a QPainter
/**
* Paints the background layer of the signal with a QPainter
@@
-77,6
+81,13
@@
private:
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
+ void init_trigger_actions(QWidget *parent);
+
+ void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+ void add_trigger_action(const char *trig_types, char type,
+ QAction *action);
+
void update_trigger_actions();
void set_trigger(char type);
void update_trigger_actions();
void set_trigger(char type);
@@
-92,6
+103,7
@@
private slots:
private:
boost::shared_ptr<pv::data::Logic> _data;
private:
boost::shared_ptr<pv::data::Logic> _data;
+ QToolBar *_trigger_bar;
QAction *_trigger_none;
QAction *_trigger_rising;
QAction *_trigger_high;
QAction *_trigger_none;
QAction *_trigger_rising;
QAction *_trigger_high;
@@
-103,4
+115,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_
VIEW_
LOGICSIGNAL_H