Use device::Devices to represent sigrok Devices

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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index c4588903ba83d3a5e6731d0b0a24c778620e4aa8..0705613eb3b9252de57eb566d59505cba297ff1c 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -31,12 +31,15 @@ class QIcon;
 class QToolBar;
 
 namespace sigrok {
-       class Device;
-       class TriggerMatchType;
+class TriggerMatchType;
 }
 
 namespace pv {
 
+namespace devices {
+class Device;
+}
+
 namespace data {
 class Logic;
 }
@@ -65,7 +68,7 @@ private:
 
 public:
        LogicSignal(pv::Session &session,
-               std::shared_ptr<sigrok::Device> device,
+               std::shared_ptr<devices::Device> device,
                std::shared_ptr<sigrok::Channel> channel,
                std::shared_ptr<pv::data::Logic> data);
 
@@ -75,6 +78,8 @@ public:
 
        std::shared_ptr<pv::data::Logic> logic_data() const;
 
+       void set_logic_data(std::shared_ptr<pv::data::Logic> data);
+
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
@@ -86,21 +91,21 @@ public:
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with..
         **/
-       void paint_back(QPainter &p, const RowItemPaintParams &pp);
+       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 pp the painting parameters object to paint with..
         **/
-       void paint_mid(QPainter &p, const RowItemPaintParams &pp);
+       void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * Paints the foreground layer of the signal with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with.
         **/
-       virtual void paint_fore(QPainter &p, const RowItemPaintParams &pp);
+       virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
        void paint_caps(QPainter &p, QLineF *const lines,
@@ -125,7 +130,7 @@ private Q_SLOTS:
        void on_trigger();
 
 private:
-       std::shared_ptr<sigrok::Device> device_;
+       std::shared_ptr<pv::devices::Device> device_;
        std::shared_ptr<pv::data::Logic> data_;
 
        const sigrok::TriggerMatchType *trigger_match_;
@@ -144,4 +149,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP