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 4df0f8ce77d99f74fbc1c388c773b625b3810c0e..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>
 
@@ -31,26 +31,27 @@ class QIcon;
 class QToolBar;
 
 namespace sigrok {
-       class Device;
-       class TriggerMatchType;
+class TriggerMatchType;
 }
 
 namespace pv {
 
+namespace devices {
+class Device;
+}
+
 namespace data {
 class Logic;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class LogicSignal : public Signal
 {
        Q_OBJECT
 
 private:
-       static const int SignalHeight;
-       static const int SignalMargin;
-
        static const float Oversampling;
 
        static const QColor EdgeColour;
@@ -65,18 +66,15 @@ private:
 
 public:
        LogicSignal(pv::Session &session,
-               std::shared_ptr<sigrok::Device> device,
-               std::shared_ptr<sigrok::Channel> channel,
-               std::shared_ptr<pv::data::Logic> data);
+               std::shared_ptr<devices::Device> device,
+               std::shared_ptr<data::SignalBase> base);
 
-       virtual ~LogicSignal();
+       virtual ~LogicSignal() = default;
 
        std::shared_ptr<pv::data::SignalData> 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.
@@ -84,24 +82,28 @@ public:
        std::pair<int, int> v_extents() const;
 
        /**
-        * Paints the background 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_back(QPainter &p, const ViewItemPaintParams &pp);
+        * Returns the offset to show the drag handle.
+        */
+       int scale_handle_offset() const;
+
+       /**
+        * Handles the scale handle being dragged to an offset.
+        * @param offset the offset the scale handle was dragged to.
+        */
+       void scale_handle_dragged(int offset);
 
        /**
         * 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 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 ViewItemPaintParams &pp);
 
 private:
@@ -114,7 +116,7 @@ private:
 
        const std::vector<int32_t> get_trigger_types() const;
        QAction* action_from_trigger_type(
-               const sigrok::TriggerMatchType *match);
+               const sigrok::TriggerMatchType *type);
        const sigrok::TriggerMatchType* trigger_type_from_action(
                QAction *action);
        void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -127,8 +129,9 @@ private Q_SLOTS:
        void on_trigger();
 
 private:
-       std::shared_ptr<sigrok::Device> device_;
-       std::shared_ptr<pv::data::Logic> data_;
+       int signal_height_;
+
+       std::shared_ptr<pv::devices::Device> device_;
 
        const sigrok::TriggerMatchType *trigger_match_;
        QToolBar *trigger_bar_;
@@ -143,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