Rename 'probe' to 'channel' everywhere.

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

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 42c15bb0fdf8d0f1379aeef4a06f009a4f9644b1..934203366dca78b93591402b57fc49d56b996c8e 100644 (file)
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -18,12 +18,12 @@
  * 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 <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace pv {
 
@@ -42,45 +42,51 @@ private:
        static const float EnvelopeThreshold;
 
 public:
-       AnalogSignal(const sr_probe *const probe,
-               boost::shared_ptr<pv::data::Analog> data);
+       AnalogSignal(std::shared_ptr<pv::device::DevInst> dev_inst,
+               const sr_channel *const channel,
+               std::shared_ptr<pv::data::Analog> data);
 
        virtual ~AnalogSignal();
 
-       const std::list<QAction*> get_context_bar_actions();
+       std::shared_ptr<pv::data::SignalData> data() const;
+
+       std::shared_ptr<pv::data::Analog> analog_data() const;
 
        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 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:
        void paint_trace(QPainter &p,
-               const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
        void paint_envelope(QPainter &p,
-               const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
 private:
-       boost::shared_ptr<pv::data::Analog> _data;
+       std::shared_ptr<pv::data::Analog> _data;
        float _scale;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H