Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / views / trace / logicsignal.hpp

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 10ede729d1b53b630613d56740ec6243339b9649..eee6b9c4ce081f4b74d6ccf30ffe206e6aa6965b 100644 (file)
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -17,10 +17,11 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
 
 #include <QCache>
+#include <QColor>
 #include <QDebug>
 #include <QSpinBox>
 
@@ -64,37 +65,29 @@ public:
        static const QColor LowColor;
        static const QColor SamplingPointColor;
 
-       static const QColor SignalColors[10];
-
        static QColor TriggerMarkerBackgroundColor;
        static const int TriggerMarkerPadding;
        static const char* TriggerMarkerIcons[8];
 
-       LogicSignal(pv::Session &session,
-               shared_ptr<devices::Device> device,
-               shared_ptr<data::SignalBase> base);
+       LogicSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
        virtual ~LogicSignal() = default;
 
-       shared_ptr<pv::data::SignalData> data() const;
-
-       shared_ptr<pv::data::Logic> logic_data() const;
-
-       virtual void save_settings(QSettings &settings) const;
-       virtual void restore_settings(QSettings &settings);
+       virtual std::map<QString, QVariant> save_settings() const;
+       virtual void restore_settings(std::map<QString, QVariant> settings);
 
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
         */
-       pair<int, int> v_extents() const;
+       virtual pair<int, int> v_extents() const;
 
        /**
         * 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, ViewItemPaintParams &pp);
+       virtual void paint_mid(QPainter &p, ViewItemPaintParams &pp);
 
        /**
         * Paints the foreground layer of the signal with a QPainter
@@ -112,7 +105,7 @@ public:
         */
        virtual vector<data::LogicSegment::EdgePair> get_nearest_level_changes(uint64_t sample_pos);
 
-private:
+protected:
        void paint_caps(QPainter &p, QLineF *const lines,
                vector< pair<int64_t, bool> > &edges,
                bool level, double samples_per_pixel, double pixels_offset,
@@ -132,15 +125,19 @@ private:
        static const QIcon* get_icon(const char *path);
        static const QPixmap* get_pixmap(const char *path);
 
-private Q_SLOTS:
+       virtual void update_logic_level_offsets();
+
+protected Q_SLOTS:
+       void on_setting_changed(const QString &key, const QVariant &value);
+
        void on_trigger();
 
        void on_signal_height_changed(int height);
 
-private:
-       int signal_height_;
-
-       shared_ptr<pv::devices::Device> device_;
+protected:
+       QColor high_fill_color_;
+       bool show_sampling_points_, fill_high_areas_;
+       float high_level_offset_, low_level_offset_;  // y offsets relative to trace
 
        QSpinBox *signal_height_sb_;
 
@@ -156,10 +153,15 @@ private:
 
        static QCache<QString, const QIcon> icon_cache_;
        static QCache<QString, const QPixmap> pixmap_cache_;
+
+       // ---------------------------------------------------------------------------
+       // Note: Make sure to update save_settings() and restore_settings() when
+       //       adding a trace-configurable variable here
+       int signal_height_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP