X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=de1f2ec8e50b4a24da231843bd47d5e44c85c6fa;hp=34a307c919dca35ef7bccd35761ac4003cbf5169;hb=b1e8c93d824986328a34d1c36273cb534fd65307;hpb=512bfc565937c0c1b07ec0e6486831526a6e1eee diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h index 34a307c..de1f2ec 100644 --- a/pv/view/logicsignal.h +++ b/pv/view/logicsignal.h @@ -76,7 +76,6 @@ public: void paint_mid(QPainter &p, int left, int right); private: - void paint_caps(QPainter &p, QLineF *const lines, std::vector< std::pair > &edges, bool level, double samples_per_pixel, double pixels_offset, @@ -84,26 +83,17 @@ private: void init_trigger_actions(QWidget *parent); + QAction* match_action(int match); + int action_match(QAction *action); 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); private slots: - void on_trigger_none(); - void on_trigger_rising(); - void on_trigger_high(); - void on_trigger_falling(); - void on_trigger_low(); - void on_trigger_change(); + void on_trigger(); private: std::shared_ptr _data; + int _trigger_match; QToolBar *_trigger_bar; QAction *_trigger_none; QAction *_trigger_rising;