Moved all sr_probe modification into pv::DevInst

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

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index c1b83d0ba5a64259624f21e62271dc3799e4f458..17f6eb26d862eede6bf8c968d7cb5deee8303bb7 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
  */
 
-#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 {
@@ -35,6 +37,8 @@ namespace view {
 
 class LogicSignal : public Signal
 {
+       Q_OBJECT
+
 private:
        static const float Oversampling;
 
@@ -45,25 +49,31 @@ private:
        static const QColor SignalColours[10];
 
 public:
-       LogicSignal(const sr_probe *const probe,
+       LogicSignal(boost::shared_ptr<pv::DevInst> dev_inst,
+               const sr_probe *const probe,
                boost::shared_ptr<pv::data::Logic> data);
 
        virtual ~LogicSignal();
 
-       const std::list<QAction*> get_context_bar_actions();
+       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
+        * @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:
 
@@ -72,26 +82,38 @@ private:
                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);
+
+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:
        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
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H