Added trigger actions in LogicSignal popup

[pulseview.git] / pv / view / logicsignal.h

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 37870be6ed23928115f1462802d51057e05e3b31..99e470dba6951b26e26f30f8128b9804fe3b3bfb 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -25,6 +25,8 @@
 
 #include <boost/shared_ptr.hpp>
 
+class QToolBar;
+
 namespace pv {
 
 namespace data {
@@ -52,20 +54,23 @@ public:
 
        virtual ~LogicSignal();
 
-       const std::list<QAction*> get_context_bar_actions();
+       boost::shared_ptr<pv::data::Logic> data() const;
+
+       /**
+        * Paints the background layer of the signal with a QPainter
+        * @param p the QPainter to paint into.
+        * @param left the x-coordinate of the left edge of the signal.
+        * @param right the x-coordinate of the right edge of the signal.
+        **/
+       void paint_back(QPainter &p, int left, int right);
 
        /**
-        * Paints the signal with a QPainter
+        * Paints the mid-layer of the signal with a QPainter
         * @param p the QPainter to paint into.
-        * @param y the y-coordinate to draw the signal at.
         * @param left the x-coordinate of the left edge of the signal.
         * @param right the x-coordinate of the right edge of the signal.
-        * @param scale the scale in seconds per pixel.
-        * @param offset the time to show at the left hand edge of
-        *   the view in seconds.
         **/
-       void paint(QPainter &p, int y, int left, int right, double scale,
-               double offset);
+       void paint_mid(QPainter &p, int left, int right);
 
 private:
 
@@ -74,8 +79,12 @@ private:
                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();
 
@@ -92,20 +101,13 @@ private slots:
 private:
        boost::shared_ptr<pv::data::Logic> _data;
 
-       QAction _separator;
-
-       QIcon _icon_trigger_none;
-       QAction _trigger_none;
-       QIcon _icon_trigger_rising;
-       QAction _trigger_rising;
-       QIcon _icon_trigger_high;
-       QAction _trigger_high;
-       QIcon _icon_trigger_falling;
-       QAction _trigger_falling;
-       QIcon _icon_trigger_low;
-       QAction _trigger_low;
-       QIcon _icon_trigger_change;
-       QAction _trigger_change;
+       QToolBar *_trigger_bar;
+       QAction *_trigger_none;
+       QAction *_trigger_rising;
+       QAction *_trigger_high;
+       QAction *_trigger_falling;
+       QAction *_trigger_low;
+       QAction *_trigger_change;
 };
 
 } // namespace view