Fix random clazy warnings

[pulseview.git] / pv / data / signalbase.hpp

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index aa734165f8d91eb419a47b4b1d56cb880f0df825..c3e0d3d64ef56d02b289451c7cb3d54ca89c44f9 100644 (file)
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -30,6 +30,7 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QTimer>
 #include <QVariant>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -50,8 +51,10 @@ namespace pv {
 namespace data {
 
 class Analog;
+class AnalogSegment;
 class DecoderStack;
 class Logic;
+class LogicSegment;
 class SignalData;
 
 class SignalBase : public QObject
@@ -63,19 +66,29 @@ public:
                AnalogChannel = 1, ///< Analog data
                LogicChannel,  ///< Logic data
                DecodeChannel, ///< Protocol Decoder channel using libsigrokdecode
-               A2LChannel,    ///< Analog converted to logic, joint representation
                MathChannel    ///< Virtual channel generated by math operations
        };
 
        enum ConversionType {
                NoConversion = 0,
-               A2LConversionByTreshold = 1,
+               A2LConversionByThreshold = 1,
                A2LConversionBySchmittTrigger = 2
        };
 
+       /**
+        * Conversion presets range from -1 to n, where 1..n are dependent on
+        * the conversion these presets apply to. -1 and 0 have fixed meanings,
+        * however.
+        */
+       enum ConversionPreset {
+               NoPreset = -1,     ///< Conversion uses custom values
+               DynamicPreset = 0  ///< Conversion uses calculated values
+       };
+
 private:
-       static const int ColourBGAlpha;
+       static const int ColorBGAlpha;
        static const uint64_t ConversionBlockSize;
+       static const uint32_t ConversionDelay;
 
 public:
        SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type);
@@ -127,25 +140,31 @@ public:
         */
        QString internal_name() const;
 
+       /**
+        * Produces a string for this signal that can be used for display,
+        * i.e. it contains one or both of the signal/internal names.
+        */
+       QString display_name() const;
+
        /**
         * Sets the name of the signal.
         */
        virtual void set_name(QString name);
 
        /**
-        * Get the colour of the signal.
+        * Get the color of the signal.
         */
-       QColor colour() const;
+       QColor color() const;
 
        /**
-        * Set the colour of the signal.
+        * Set the color of the signal.
         */
-       void set_colour(QColor colour);
+       void set_color(QColor color);
 
        /**
-        * Get the background colour of the signal.
+        * Get the background color of the signal.
         */
-       QColor bgcolour() const;
+       QColor bgcolor() const;
 
        /**
         * Sets the internal data object.
@@ -162,6 +181,22 @@ public:
         */
        shared_ptr<pv::data::Logic> logic_data() const;
 
+       /**
+        * Determines whether a given segment is complete (i.e. end-of-frame has
+        * been seen). It only considers the original data, not the converted data.
+        */
+       bool segment_is_complete(uint32_t segment_id) const;
+
+       /**
+        * Determines whether this signal has any sample data at all.
+        */
+       bool has_samples() const;
+
+       /**
+        * Returns the sample rate for this signal.
+        */
+       double get_samplerate() const;
+
        /**
         * Queries the kind of conversion performed on this channel.
         */
@@ -227,7 +262,7 @@ public:
         * @return the ID of the currently used conversion preset. -1 if no preset
         *         is used. In that case, a user setting is used instead.
         */
-       int get_current_conversion_preset() const;
+       ConversionPreset get_current_conversion_preset() const;
 
        /**
         * Sets the conversion preset to be used.
@@ -236,7 +271,7 @@ public:
         *
         * @param id the id of the preset to use
         */
-       void set_conversion_preset(int id);
+       void set_conversion_preset(ConversionPreset id);
 
 #ifdef ENABLE_DECODE
        bool is_decode_signal() const;
@@ -246,7 +281,7 @@ public:
 
        virtual void restore_settings(QSettings &settings);
 
-       void start_conversion();
+       void start_conversion(bool delayed_start=false);
 
 private:
        bool conversion_is_a2l() const;
@@ -255,7 +290,11 @@ private:
        uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
                float value, uint8_t &state);
 
-       void conversion_thread_proc(QObject* segment);
+       void convert_single_segment_range(AnalogSegment *asegment,
+               LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample);
+       void convert_single_segment(pv::data::AnalogSegment *asegment,
+               pv::data::LogicSegment *lsegment);
+       void conversion_thread_proc();
 
        void stop_conversion();
 
@@ -264,23 +303,29 @@ Q_SIGNALS:
 
        void name_changed(const QString &name);
 
-       void colour_changed(const QColor &colour);
+       void color_changed(const QColor &color);
 
        void conversion_type_changed(const ConversionType t);
 
        void samples_cleared();
 
-       void samples_added(QObject* segment, uint64_t start_sample,
+       void samples_added(uint64_t segment_id, uint64_t start_sample,
                uint64_t end_sample);
 
+       void min_max_changed(float min, float max);
+
 private Q_SLOTS:
        void on_samples_cleared();
 
        void on_samples_added(QObject* segment, uint64_t start_sample,
                uint64_t end_sample);
 
+       void on_min_max_changed(float min, float max);
+
        void on_capture_state_changed(int state);
 
+       void on_delayed_conversion_start();
+
 protected:
        shared_ptr<sigrok::Channel> channel_;
        ChannelType channel_type_;
@@ -295,9 +340,10 @@ protected:
        atomic<bool> conversion_interrupt_;
        mutex conversion_input_mutex_;
        condition_variable conversion_input_cond_;
+       QTimer delayed_conversion_starter_;
 
        QString internal_name_, name_;
-       QColor colour_, bgcolour_;
+       QColor color_, bgcolor_;
 };
 
 } // namespace data