* 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>
+class QToolBar;
+
namespace pv {
namespace data {
static const QColor SignalColours[10];
public:
- LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+ LogicSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_probe *const probe,
boost::shared_ptr<pv::data::Logic> data);
virtual ~LogicSignal();
- void init_context_bar_actions(QWidget *parent);
-
- boost::shared_ptr<pv::data::Logic> data() const;
+ boost::shared_ptr<pv::data::SignalData> data() const;
- const std::list<QAction*> get_context_bar_actions();
+ boost::shared_ptr<pv::data::Logic> logic_data() const;
/**
* Paints the background layer of the signal with a QPainter
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
- static void add_trigger_action(const char *trig_types, char type,
- QAction *action, std::list<QAction*> &actions);
+ 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();
private:
boost::shared_ptr<pv::data::Logic> _data;
- QAction *_separator;
-
+ QToolBar *_trigger_bar;
QAction *_trigger_none;
QAction *_trigger_rising;
QAction *_trigger_high;
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H