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 4241f80138705359e7df2b4cde134bcace28ee99..99e470dba6951b26e26f30f8128b9804fe3b3bfb 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -25,14 +25,20 @@
 
 #include <boost/shared_ptr.hpp>
 
+class QToolBar;
+
 namespace pv {
 
-class LogicData;
+namespace data {
+class Logic;
+}
 
 namespace view {
 
 class LogicSignal : public Signal
 {
+       Q_OBJECT
+
 private:
        static const float Oversampling;
 
@@ -40,22 +46,31 @@ private:
        static const QColor HighColour;
        static const QColor LowColour;
 
-       static const QColor LogicSignalColours[10];
+       static const QColor SignalColours[10];
 
 public:
-       LogicSignal(QString name,
-               boost::shared_ptr<pv::LogicData> data,
-               int probe_index);
+       LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+               boost::shared_ptr<pv::data::Logic> data);
+
+       virtual ~LogicSignal();
+
+       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 rect the rectangular area to draw the trace into.
-        * @param scale the scale in seconds per pixel.
-        * @param offset the time to show at the left hand edge of
-        *   the view in seconds.
+        * @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(QPainter &p, const QRect &rect, double scale, double offset);
+       void paint_mid(QPainter &p, int left, int right);
 
 private:
 
@@ -64,15 +79,35 @@ private:
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 
-       /**
-        * When painting into the rectangle, calculate the y
-        * offset of the zero point.
-        **/
-       int get_nominal_offset(const QRect &rect) const;
+       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);
+
+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();
 
 private:
-       int _probe_index;
-       boost::shared_ptr<pv::LogicData> _data;
+       boost::shared_ptr<pv::data::Logic> _data;
+
+       QToolBar *_trigger_bar;
+       QAction *_trigger_none;
+       QAction *_trigger_rising;
+       QAction *_trigger_high;
+       QAction *_trigger_falling;
+       QAction *_trigger_low;
+       QAction *_trigger_change;
 };
 
 } // namespace view