Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index bcd4e2eb617eef83a46a5c1e98bf308751b48d8e..35081cdedd006fd561a31ccb1991ea69c5300d21 100644 (file)
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
 
 #include <memory>
 
@@ -32,19 +32,17 @@
 #include "trace.hpp"
 #include "viewitemowner.hpp"
 
-namespace sigrok {
-       class Channel;
-}
-
 namespace pv {
 
 class Session;
 
 namespace data {
+class SignalBase;
 class SignalData;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Signal : public Trace, public ViewItemOwner
 {
@@ -52,13 +50,13 @@ class Signal : public Trace, public ViewItemOwner
 
 protected:
        Signal(pv::Session &session,
-               std::shared_ptr<sigrok::Channel> channel);
+               std::shared_ptr<data::SignalBase> channel);
 
 public:
        /**
         * Sets the name of the signal.
         */
-       void set_name(QString name);
+       virtual void set_name(QString name);
 
        virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
 
@@ -67,9 +65,11 @@ public:
         */
        bool enabled() const;
 
-       void enable(bool enable = true);
+       std::shared_ptr<data::SignalBase> base() const;
+
+       virtual void save_settings(QSettings &settings) const;
 
-       std::shared_ptr<sigrok::Channel> channel() const;
+       virtual void restore_settings(QSettings &settings);
 
        /**
         * Returns a list of row items owned by this object.
@@ -100,21 +100,24 @@ public:
         */
        virtual void scale_handle_released() {};
 
-private Q_SLOTS:
+protected Q_SLOTS:
+       virtual void on_name_changed(const QString &text);
+
        void on_disable();
 
+       void on_enabled_changed(bool enabled);
+
 protected:
        pv::Session &session_;
-       std::shared_ptr<sigrok::Channel> channel_;
 
        const std::shared_ptr<SignalScaleHandle> scale_handle_;
        const item_list items_;
 
        QComboBox *name_widget_;
-       bool updating_name_widget_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP