Removed context bar

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

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index b0a328c1fc662e195bf66de423aa0f69b7bdd35b..8b977ae285b5dd3098637db533a6e78abd25b0e2 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -52,17 +52,23 @@ public:
 
        virtual ~LogicSignal();
 
 
        virtual ~LogicSignal();
 

-       void init_context_bar_actions(QWidget *parent);
+       boost::shared_ptr<pv::data::Logic> data() const;

 
 

-       const std::list<QAction*> get_context_bar_actions();
+       /**
+        * 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 left the x-coordinate of the left edge of the signal.
         * @param right the x-coordinate of the right edge of the signal.
         **/
         * @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_mid(QPainter &p, int left, int right);

 
 private:
 
 
 private:
 


@@ -71,9 +77,6 @@ private:
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 
                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 update_trigger_actions();
 
        void set_trigger(char type);
        void update_trigger_actions();
 
        void set_trigger(char type);


@@ -89,8 +92,6 @@ private slots:
 private:
        boost::shared_ptr<pv::data::Logic> _data;
 
 private:
        boost::shared_ptr<pv::data::Logic> _data;
 

-       QAction *_separator;
-

        QAction *_trigger_none;
        QAction *_trigger_rising;
        QAction *_trigger_high;
        QAction *_trigger_none;
        QAction *_trigger_rising;
        QAction *_trigger_high;