Moved all sr_probe modification into pv::DevInst

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

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 42c15bb0fdf8d0f1379aeef4a06f009a4f9644b1..3b6f7f4f6ef240bfa0bee86202ab67593cd3ae46 100644 (file)
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-#ifndef PULSEVIEW_PV_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H

 
 #include "signal.h"
 
 
 #include "signal.h"
 


@@ -42,27 +42,33 @@ private:
        static const float EnvelopeThreshold;
 
 public:
        static const float EnvelopeThreshold;
 
 public:

-       AnalogSignal(const sr_probe *const probe,
+       AnalogSignal(boost::shared_ptr<pv::DevInst> dev_inst,
+               const sr_probe *const probe,

                boost::shared_ptr<pv::data::Analog> data);
 
        virtual ~AnalogSignal();
 
                boost::shared_ptr<pv::data::Analog> data);
 
        virtual ~AnalogSignal();
 

-       const std::list<QAction*> get_context_bar_actions();
+       boost::shared_ptr<pv::data::SignalData> data() const;
+
+       boost::shared_ptr<pv::data::Analog> analog_data() const;

 
        void set_scale(float scale);
 
        /**
 
        void set_scale(float scale);
 
        /**

-        * 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_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 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 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:
        void paint_trace(QPainter &p,
 
 private:
        void paint_trace(QPainter &p,


@@ -83,4 +89,4 @@ private:
 } // namespace view
 } // namespace pv
 
 } // namespace view
 } // namespace pv
 

-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H