Modified header guards to match file names

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

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 91a8e5c2810665ea6a4f445b187426d0d66d5343..4f737aaad640c3226ce365625bcf78e150d30e1a 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
@@ -29,7 +29,7 @@ namespace pv {
 
 namespace data {
 class Analog;
-class AnalogSnapshot;
+class AnalogSegment;
 }
 
 namespace view {
@@ -43,7 +43,7 @@ private:
        static const float EnvelopeThreshold;
 
 public:
-       AnalogSignal(pv::SigSession &session,
+       AnalogSignal(pv::Session &session,
                std::shared_ptr<sigrok::Channel> channel,
                std::shared_ptr<pv::data::Analog> data);
 
@@ -64,27 +64,25 @@ public:
        /**
         * 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.
+        * @param pp the painting parameters object to paint with..
         **/
-       void paint_back(QPainter &p, int left, int right);
+       void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * 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 pp the painting parameters object to paint with..
         **/
-       void paint_mid(QPainter &p, int left, int right);
+       void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
        void paint_trace(QPainter &p,
-               const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               const std::shared_ptr<pv::data::AnalogSegment> &segment,
                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 std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               const std::shared_ptr<pv::data::AnalogSegment> &segment,
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
@@ -96,4 +94,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP