Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index fc0dcabb26c15233eb4cce4f7b88fd2995f4045a..ce843df9af37ad2d4df189435943733847a7546b 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_HPP
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -44,7 +44,8 @@ namespace data {
 class Logic;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class LogicSignal : public Signal
 {
@@ -66,8 +67,7 @@ private:
 public:
        LogicSignal(pv::Session &session,
                std::shared_ptr<devices::Device> device,
-               std::shared_ptr<sigrok::Channel> channel,
-               std::shared_ptr<pv::data::Logic> data);
+               std::shared_ptr<data::SignalBase> base);
 
        virtual ~LogicSignal() = default;
 
@@ -75,8 +75,6 @@ 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.
@@ -134,7 +132,6 @@ private:
        int signal_height_;
 
        std::shared_ptr<pv::devices::Device> device_;
-       std::shared_ptr<pv::data::Logic> data_;
 
        const sigrok::TriggerMatchType *trigger_match_;
        QToolBar *trigger_bar_;
@@ -149,7 +146,8 @@ private:
        static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP