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 b0a328c1fc662e195bf66de423aa0f69b7bdd35b..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 {
@@ -47,22 +49,31 @@ private:
        static const QColor SignalColours[10];
 
 public:
-       LogicSignal(pv::SigSession &session, 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();
 
-       void init_context_bar_actions(QWidget *parent);
+       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 signal with a QPainter
+        * 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(QPainter &p, int left, int right);
+       void paint_back(QPainter &p, int left, int right);
+
+       /**
+        * Paints the mid-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_mid(QPainter &p, int left, int right);
 
 private:
 
@@ -71,8 +82,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();
 
@@ -89,8 +104,7 @@ private slots:
 private:
        boost::shared_ptr<pv::data::Logic> _data;
 
-       QAction *_separator;
-
+       QToolBar *_trigger_bar;
        QAction *_trigger_none;
        QAction *_trigger_rising;
        QAction *_trigger_high;
@@ -102,4 +116,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H