Remove data_ also for LogicSignal and use SignalBase data instead

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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 14eeed4baf82bbd272e390c46468d8e30d9b1dd8..8274b618a541b565126aa4c67562292957e29cd8 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -66,8 +66,7 @@ private:
 public:
        LogicSignal(pv::Session &session,
                std::shared_ptr<devices::Device> device,
 public:
        LogicSignal(pv::Session &session,
                std::shared_ptr<devices::Device> device,

-               std::shared_ptr<data::SignalBase> base,
-               std::shared_ptr<pv::data::Logic> data);
+               std::shared_ptr<data::SignalBase> base);

 
        virtual ~LogicSignal() = default;
 
 
        virtual ~LogicSignal() = default;
 


@@ -75,8 +74,6 @@ public:
 
        std::shared_ptr<pv::data::Logic> logic_data() const;
 
 
        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.
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.


@@ -134,7 +131,6 @@ private:
        int signal_height_;
 
        std::shared_ptr<pv::devices::Device> device_;
        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_;
 
        const sigrok::TriggerMatchType *trigger_match_;
        QToolBar *trigger_bar_;