Remove SignalBase::A2LChannel

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

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index aa734165f8d91eb419a47b4b1d56cb880f0df825..fd7c38f5ea627d768830170db4768d46ad81fd69 100644 (file)
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -63,16 +63,25 @@ 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 uint64_t ConversionBlockSize;
@@ -227,7 +236,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 +245,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;
@@ -279,6 +288,8 @@ private Q_SLOTS:
        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);
 
 protected: