Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 4f737aaad640c3226ce365625bcf78e150d30e1a..08edda36f0dcc818135747189dc76ff8ada121c2 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -18,42 +18,51 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
 class Analog;
 class AnalogSegment;
+class SignalBase;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class AnalogSignal : public Signal
 {
+       Q_OBJECT
+
 private:
-       static const int NominalHeight;
        static const QColor SignalColours[4];
+       static const QColor GridMajorColor, GridMinorColor;
 
        static const float EnvelopeThreshold;
 
+       static const int MaximumVDivs;
+       static const int MaxScaleIndex, MinScaleIndex;
+       static const int InfoTextMarginRight, InfoTextMarginBottom;
+
 public:
        AnalogSignal(pv::Session &session,
-               std::shared_ptr<sigrok::Channel> channel,
-               std::shared_ptr<pv::data::Analog> data);
+               std::shared_ptr<data::SignalBase> base);
 
-       virtual ~AnalogSignal();
+       virtual ~AnalogSignal() = default;
 
        std::shared_ptr<pv::data::SignalData> data() const;
 
-       std::shared_ptr<pv::data::Analog> analog_data() const;
+       virtual void save_settings(QSettings &settings) const;
 
-       void set_scale(float scale);
+       virtual void restore_settings(QSettings &settings);
 
        /**
         * Computes the vertical extents of the contents of this row item.
@@ -61,21 +70,46 @@ public:
         */
        std::pair<int, int> v_extents() const;
 
+       /**
+        * 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);
+
+       /**
+        * @copydoc pv::view::Signal::signal_scale_handle_drag_release()
+        */
+       void scale_handle_drag_release();
+
        /**
         * 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);
 
        /**
         * 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 item with a QPainter
+        * @param p the QPainter to paint into.
+        * @param pp the painting parameters object to paint with.
+        */
+       void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+
 private:
+       void paint_grid(QPainter &p, int y, int left, int right);
+
        void paint_trace(QPainter &p,
                const std::shared_ptr<pv::data::AnalogSegment> &segment,
                int y, int left, const int64_t start, const int64_t end,
@@ -86,12 +120,35 @@ private:
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
+       /**
+        * Computes the scale factor from the scale index and vdiv settings.
+        */
+       float get_resolution(int scale_index);
+
+       void update_scale();
+
+protected:
+       void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+       void on_vdivs_changed(int vdivs);
+
+       void on_resolution_changed(int index);
+
 private:
-       std::shared_ptr<pv::data::Analog> data_;
+       QComboBox *resolution_cb_;
+
        float scale_;
+       int scale_index_;
+       int scale_index_drag_offset_;
+
+       int div_height_;
+       int vdivs_;  // divs per positive/negative side
+       float resolution_; // e.g. 10 for 10 V/div
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP