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 dd3af0b3abc704d339859ecf4449eb23734e04da..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_H
-#define PULSEVIEW_PV_VIEW_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
 
 #include <memory>
 
@@ -28,35 +28,35 @@
 
 #include <stdint.h>
 
+#include "signalscalehandle.hpp"
 #include "trace.hpp"
-
-namespace sigrok {
-       class Channel;
-}
+#include "viewitemowner.hpp"
 
 namespace pv {
 
-class SigSession;
+class Session;
 
 namespace data {
+class SignalBase;
 class SignalData;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
-class Signal : public Trace
+class Signal : public Trace, public ViewItemOwner
 {
        Q_OBJECT
 
 protected:
-       Signal(pv::SigSession &session,
-               std::shared_ptr<sigrok::Channel> channel);
+       Signal(pv::Session &session,
+               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;
 
@@ -65,9 +65,18 @@ public:
         */
        bool enabled() const;
 
-       void enable(bool enable = true);
+       std::shared_ptr<data::SignalBase> base() const;
+
+       virtual void save_settings(QSettings &settings) const;
+
+       virtual void restore_settings(QSettings &settings);
+
+       /**
+        * Returns a list of row items owned by this object.
+        */
+       const item_list& child_items() const;
 
-       std::shared_ptr<sigrok::Channel> channel() const;
+       void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -75,18 +84,40 @@ public:
 
        void delete_pressed();
 
-private Q_SLOTS:
+       /**
+        * Returns the offset to show the drag handle.
+        */
+       virtual int scale_handle_offset() const = 0;
+
+       /**
+        * Handles the scale handle being dragged to an offset.
+        * @param offset the offset the scale handle was dragged to.
+        */
+       virtual void scale_handle_dragged(int offset) = 0;
+
+       /**
+        * Handles the scale handle being being released.
+        */
+       virtual void scale_handle_released() {};
+
+protected Q_SLOTS:
+       virtual void on_name_changed(const QString &text);
+
        void on_disable();
 
+       void on_enabled_changed(bool enabled);
+
 protected:
-       pv::SigSession &session_;
-       std::shared_ptr<sigrok::Channel> channel_;
+       pv::Session &session_;
+
+       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_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP