Fix #1089 by updating the signal labels and group labels
[pulseview.git] / pv / data / signalbase.cpp
index 0e887b4c8bcd5c38ad2d10a09e3db8a2441cab2e..5aec9ba884677e924cb8e0d1d533a62c4ef467b2 100644 (file)
 #include "signalbase.hpp"
 #include "signaldata.hpp"
 
+#include <QDebug>
+
 #include <pv/binding/decoder.hpp>
 #include <pv/session.hpp>
 
 using std::dynamic_pointer_cast;
 using std::make_shared;
+using std::out_of_range;
 using std::shared_ptr;
 using std::tie;
 using std::unique_lock;
@@ -40,14 +43,22 @@ namespace data {
 
 const int SignalBase::ColourBGAlpha = 8 * 256 / 100;
 const uint64_t SignalBase::ConversionBlockSize = 4096;
+const uint32_t SignalBase::ConversionDelay = 1000;  // 1 second
 
 SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type) :
        channel_(channel),
        channel_type_(channel_type),
-       conversion_type_(NoConversion)
+       conversion_type_(NoConversion),
+       min_value_(0),
+       max_value_(0)
 {
        if (channel_)
                internal_name_ = QString::fromStdString(channel_->name());
+
+       connect(&delayed_conversion_starter_, SIGNAL(timeout()),
+               this, SLOT(on_delayed_conversion_start()));
+       delayed_conversion_starter_.setSingleShot(true);
+       delayed_conversion_starter_.setInterval(ConversionDelay);
 }
 
 SignalBase::~SignalBase()
@@ -70,6 +81,14 @@ QString SignalBase::internal_name() const
        return internal_name_;
 }
 
+QString SignalBase::display_name() const
+{
+       if (name() != internal_name_)
+               return name() + " (" + internal_name_ + ")";
+       else
+               return name();
+}
+
 void SignalBase::set_name(QString name)
 {
        if (channel_)
@@ -138,6 +157,14 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
                        this, SLOT(on_samples_cleared()));
                disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
                        this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
+
+               if (channel_type_ == AnalogChannel) {
+                       shared_ptr<Analog> analog = analog_data();
+                       assert(analog);
+
+                       disconnect(analog.get(), SIGNAL(min_max_changed(float, float)),
+                               this, SLOT(on_min_max_changed(float, float)));
+               }
        }
 
        data_ = data;
@@ -147,6 +174,14 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
                        this, SLOT(on_samples_cleared()));
                connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
                        this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
+
+               if (channel_type_ == AnalogChannel) {
+                       shared_ptr<Analog> analog = analog_data();
+                       assert(analog);
+
+                       connect(analog.get(), SIGNAL(min_max_changed(float, float)),
+                               this, SLOT(on_min_max_changed(float, float)));
+               }
        }
 }
 
@@ -167,13 +202,42 @@ shared_ptr<data::Logic> SignalBase::logic_data() const
        if (channel_type_ == LogicChannel)
                result = dynamic_pointer_cast<Logic>(data_);
 
-       if (((conversion_type_ == A2LConversionByTreshold) ||
+       if (((conversion_type_ == A2LConversionByThreshold) ||
                (conversion_type_ == A2LConversionBySchmittTrigger)))
                result = dynamic_pointer_cast<Logic>(converted_data_);
 
        return result;
 }
 
+bool SignalBase::segment_is_complete(uint32_t segment_id) const
+{
+       bool result = true;
+
+       if (channel_type_ == AnalogChannel)
+       {
+               shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+               auto segments = data->analog_segments();
+               try {
+                       result = segments.at(segment_id)->is_complete();
+               } catch (out_of_range) {
+                       // Do nothing
+               }
+       }
+
+       if (channel_type_ == LogicChannel)
+       {
+               shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+               auto segments = data->logic_segments();
+               try {
+                       result = segments.at(segment_id)->is_complete();
+               } catch (out_of_range) {
+                       // Do nothing
+               }
+       }
+
+       return result;
+}
+
 SignalBase::ConversionType SignalBase::get_conversion_type() const
 {
        return conversion_type_;
@@ -203,6 +267,131 @@ void SignalBase::set_conversion_type(ConversionType t)
        conversion_type_changed(t);
 }
 
+map<QString, QVariant> SignalBase::get_conversion_options() const
+{
+       return conversion_options_;
+}
+
+bool SignalBase::set_conversion_option(QString key, QVariant value)
+{
+       QVariant old_value;
+
+       auto key_iter = conversion_options_.find(key);
+       if (key_iter != conversion_options_.end())
+               old_value = key_iter->second;
+
+       conversion_options_[key] = value;
+
+       return (value != old_value);
+}
+
+vector<double> SignalBase::get_conversion_thresholds(const ConversionType t,
+       const bool always_custom) const
+{
+       vector<double> result;
+       ConversionType conv_type = t;
+       ConversionPreset preset;
+
+       // Use currently active conversion if no conversion type was supplied
+       if (conv_type == NoConversion)
+               conv_type = conversion_type_;
+
+       if (always_custom)
+               preset = NoPreset;
+       else
+               preset = get_current_conversion_preset();
+
+       if (conv_type == A2LConversionByThreshold) {
+               double thr = 0;
+
+               if (preset == NoPreset) {
+                       auto thr_iter = conversion_options_.find("threshold_value");
+                       if (thr_iter != conversion_options_.end())
+                               thr = (thr_iter->second).toDouble();
+               }
+
+               if (preset == DynamicPreset)
+                       thr = (min_value_ + max_value_) * 0.5;  // middle between min and max
+
+               if ((int)preset == 1) thr = 0.9;
+               if ((int)preset == 2) thr = 1.8;
+               if ((int)preset == 3) thr = 2.5;
+               if ((int)preset == 4) thr = 1.5;
+
+               result.push_back(thr);
+       }
+
+       if (conv_type == A2LConversionBySchmittTrigger) {
+               double thr_lo = 0, thr_hi = 0;
+
+               if (preset == NoPreset) {
+                       auto thr_lo_iter = conversion_options_.find("threshold_value_low");
+                       if (thr_lo_iter != conversion_options_.end())
+                               thr_lo = (thr_lo_iter->second).toDouble();
+
+                       auto thr_hi_iter = conversion_options_.find("threshold_value_high");
+                       if (thr_hi_iter != conversion_options_.end())
+                               thr_hi = (thr_hi_iter->second).toDouble();
+               }
+
+               if (preset == DynamicPreset) {
+                       const double amplitude = max_value_ - min_value_;
+                       const double center = min_value_ + (amplitude / 2);
+                       thr_lo = center - (amplitude * 0.15);  // 15% margin
+                       thr_hi = center + (amplitude * 0.15);  // 15% margin
+               }
+
+               if ((int)preset == 1) { thr_lo = 0.3; thr_hi = 1.2; }
+               if ((int)preset == 2) { thr_lo = 0.7; thr_hi = 2.5; }
+               if ((int)preset == 3) { thr_lo = 1.3; thr_hi = 3.7; }
+               if ((int)preset == 4) { thr_lo = 0.8; thr_hi = 2.0; }
+
+               result.push_back(thr_lo);
+               result.push_back(thr_hi);
+       }
+
+       return result;
+}
+
+vector< pair<QString, int> > SignalBase::get_conversion_presets() const
+{
+       vector< pair<QString, int> > presets;
+
+       if (conversion_type_ == A2LConversionByThreshold) {
+               // Source: http://www.interfacebus.com/voltage_threshold.html
+               presets.emplace_back(tr("Signal average"), 0);
+               presets.emplace_back(tr("0.9V (for 1.8V CMOS)"), 1);
+               presets.emplace_back(tr("1.8V (for 3.3V CMOS)"), 2);
+               presets.emplace_back(tr("2.5V (for 5.0V CMOS)"), 3);
+               presets.emplace_back(tr("1.5V (for TTL)"), 4);
+       }
+
+       if (conversion_type_ == A2LConversionBySchmittTrigger) {
+               // Source: http://www.interfacebus.com/voltage_threshold.html
+               presets.emplace_back(tr("Signal average +/- 15%"), 0);
+               presets.emplace_back(tr("0.3V/1.2V (for 1.8V CMOS)"), 1);
+               presets.emplace_back(tr("0.7V/2.5V (for 3.3V CMOS)"), 2);
+               presets.emplace_back(tr("1.3V/3.7V (for 5.0V CMOS)"), 3);
+               presets.emplace_back(tr("0.8V/2.0V (for TTL)"), 4);
+       }
+
+       return presets;
+}
+
+SignalBase::ConversionPreset SignalBase::get_current_conversion_preset() const
+{
+       auto preset = conversion_options_.find("preset");
+       if (preset != conversion_options_.end())
+               return (ConversionPreset)((preset->second).toInt());
+
+       return DynamicPreset;
+}
+
+void SignalBase::set_conversion_preset(ConversionPreset id)
+{
+       conversion_options_["preset"] = (int)id;
+}
+
 #ifdef ENABLE_DECODE
 bool SignalBase::is_decode_signal() const
 {
@@ -216,6 +405,14 @@ void SignalBase::save_settings(QSettings &settings) const
        settings.setValue("enabled", enabled());
        settings.setValue("colour", colour());
        settings.setValue("conversion_type", (int)conversion_type_);
+
+       settings.setValue("conv_options", (int)(conversion_options_.size()));
+       int i = 0;
+       for (auto kvp : conversion_options_) {
+               settings.setValue(QString("conv_option%1_key").arg(i), kvp.first);
+               settings.setValue(QString("conv_option%1_value").arg(i), kvp.second);
+               i++;
+       }
 }
 
 void SignalBase::restore_settings(QSettings &settings)
@@ -224,161 +421,212 @@ void SignalBase::restore_settings(QSettings &settings)
        set_enabled(settings.value("enabled").toBool());
        set_colour(settings.value("colour").value<QColor>());
        set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
+
+       int conv_options = settings.value("conv_options").toInt();
+
+       if (conv_options)
+               for (int i = 0; i < conv_options; i++) {
+                       QString key = settings.value(QString("conv_option%1_key").arg(i)).toString();
+                       QVariant value = settings.value(QString("conv_option%1_value").arg(i));
+                       conversion_options_[key] = value;
+               }
 }
 
 bool SignalBase::conversion_is_a2l() const
 {
        return ((channel_type_ == AnalogChannel) &&
-               ((conversion_type_ == A2LConversionByTreshold) ||
+               ((conversion_type_ == A2LConversionByThreshold) ||
                (conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
-void SignalBase::conversion_thread_proc(QObject* segment)
+void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
 {
-       // TODO Support for multiple segments is missing
-
        uint64_t start_sample, end_sample;
        start_sample = end_sample = 0;
 
-       do {
-               if (conversion_is_a2l()) {
+       start_sample = lsegment->get_sample_count();
+       end_sample = asegment->get_sample_count();
 
-                       AnalogSegment *asegment = qobject_cast<AnalogSegment*>(segment);
+       if (end_sample > start_sample) {
+               tie(min_value_, max_value_) = asegment->get_min_max();
 
-                       const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
+               // Create sigrok::Analog instance
+               float *asamples = new float[ConversionBlockSize];
+               uint8_t *lsamples = new uint8_t[ConversionBlockSize];
 
-                       // Create the initial logic data segment if needed
-                       if (logic_data->segments().size() == 0) {
-                               shared_ptr<LogicSegment> lsegment =
-                                       make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
-                               logic_data->push_segment(lsegment);
-                       }
+               vector<shared_ptr<sigrok::Channel> > channels;
+               channels.push_back(channel_);
+
+               vector<const sigrok::QuantityFlag*> mq_flags;
+               const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
+               const sigrok::Unit * const unit = sigrok::Unit::VOLT;
+
+               shared_ptr<sigrok::Packet> packet =
+                       Session::sr_context->create_analog_packet(channels,
+                       asamples, ConversionBlockSize, mq, unit, mq_flags);
+
+               shared_ptr<sigrok::Analog> analog =
+                       dynamic_pointer_cast<sigrok::Analog>(packet->payload());
 
-                       LogicSegment *lsegment = dynamic_cast<LogicSegment*>(logic_data->segments().front().get());
+               // Convert
+               uint64_t i = start_sample;
 
-                       start_sample = lsegment->get_sample_count();
-                       end_sample = asegment->get_sample_count();
+               if (conversion_type_ == A2LConversionByThreshold) {
+                       const double threshold = get_conversion_thresholds()[0];
 
-                       if (end_sample > start_sample) {
-                               float min_v, max_v;
-                               tie(min_v, max_v) = asegment->get_min_max();
+                       // Convert as many sample blocks as we can
+                       while ((end_sample - i) > ConversionBlockSize) {
+                               asegment->get_samples(i, i + ConversionBlockSize, asamples);
 
-                               // Create sigrok::Analog instance
-                               float *asamples = new float[ConversionBlockSize];
-                               uint8_t *lsamples = new uint8_t[ConversionBlockSize];
+                               shared_ptr<sigrok::Logic> logic =
+                                       analog->get_logic_via_threshold(threshold, lsamples);
 
-                               vector<shared_ptr<sigrok::Channel> > channels;
-                               channels.push_back(channel_);
+                               lsegment->append_payload(logic->data_pointer(), logic->data_length());
 
-                               vector<const sigrok::QuantityFlag*> mq_flags;
-                               const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
-                               const sigrok::Unit * const unit = sigrok::Unit::VOLT;
+                               samples_added(lsegment, i, i + ConversionBlockSize);
+                               i += ConversionBlockSize;
+                       }
+
+                       // Re-create sigrok::Analog and convert remaining samples
+                       packet = Session::sr_context->create_analog_packet(channels,
+                               asamples, end_sample - i, mq, unit, mq_flags);
 
-                               shared_ptr<sigrok::Packet> packet =
-                                       Session::sr_context->create_analog_packet(channels,
-                                       asamples, ConversionBlockSize, mq, unit, mq_flags);
+                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
 
-                               shared_ptr<sigrok::Analog> analog =
-                                       dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+                       asegment->get_samples(i, end_sample, asamples);
+                       shared_ptr<sigrok::Logic> logic =
+                               analog->get_logic_via_threshold(threshold, lsamples);
+                       lsegment->append_payload(logic->data_pointer(), logic->data_length());
+                       samples_added(lsegment, i, end_sample);
+               }
 
-                               // Convert
-                               uint64_t i = start_sample;
+               if (conversion_type_ == A2LConversionBySchmittTrigger) {
+                       const vector<double> thresholds = get_conversion_thresholds();
+                       const double lo_thr = thresholds[0];
+                       const double hi_thr = thresholds[1];
 
-                               if (conversion_type_ == A2LConversionByTreshold) {
-                                       const float threshold = (min_v + max_v) * 0.5;  // middle between min and max
+                       uint8_t state = 0;  // TODO Use value of logic sample n-1 instead of 0
 
-                                       // Convert as many sample blocks as we can
-                                       while ((end_sample - i) > ConversionBlockSize) {
-                                               asegment->get_samples(i, i + ConversionBlockSize, asamples);
+                       // Convert as many sample blocks as we can
+                       while ((end_sample - i) > ConversionBlockSize) {
+                               asegment->get_samples(i, i + ConversionBlockSize, asamples);
 
-                                               shared_ptr<sigrok::Logic> logic =
-                                                       analog->get_logic_via_threshold(threshold, lsamples);
+                               shared_ptr<sigrok::Logic> logic =
+                                       analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+                                               &state, lsamples);
 
-                                               lsegment->append_payload(logic->data_pointer(), logic->data_length());
+                               lsegment->append_payload(logic->data_pointer(), logic->data_length());
 
-                                               samples_added(lsegment, i, i + ConversionBlockSize);
-                                               i += ConversionBlockSize;
-                                       }
+                               samples_added(lsegment, i, i + ConversionBlockSize);
+                               i += ConversionBlockSize;
+                       }
 
-                                       // Re-create sigrok::Analog and convert remaining samples
-                                       packet = Session::sr_context->create_analog_packet(channels,
-                                               asamples, end_sample - i, mq, unit, mq_flags);
+                       // Re-create sigrok::Analog and convert remaining samples
+                       packet = Session::sr_context->create_analog_packet(channels,
+                               asamples, end_sample - i, mq, unit, mq_flags);
 
-                                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
 
-                                       asegment->get_samples(i, end_sample, asamples);
-                                       shared_ptr<sigrok::Logic> logic =
-                                               analog->get_logic_via_threshold(threshold, lsamples);
-                                       lsegment->append_payload(logic->data_pointer(), logic->data_length());
-                                       samples_added(lsegment, i, end_sample);
-                               }
+                       asegment->get_samples(i, end_sample, asamples);
+                       shared_ptr<sigrok::Logic> logic =
+                               analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+                                       &state, lsamples);
+                       lsegment->append_payload(logic->data_pointer(), logic->data_length());
+                       samples_added(lsegment, i, end_sample);
+               }
+
+               // If acquisition is ongoing, start-/endsample may have changed
+               end_sample = asegment->get_sample_count();
+
+               delete[] lsamples;
+               delete[] asamples;
+       }
+}
+
+void SignalBase::conversion_thread_proc()
+{
+       shared_ptr<Analog> analog_data;
 
-                               if (conversion_type_ == A2LConversionBySchmittTrigger) {
-                                       const float amplitude = max_v - min_v;
-                                       const float center = min_v + (amplitude / 2);
-                                       const float lo_thr = center - (amplitude * 0.15); // 15% margin
-                                       const float hi_thr = center + (amplitude * 0.15); // 15% margin
-                                       uint8_t state = 0;  // TODO Use value of logic sample n-1 instead of 0
+       if (conversion_is_a2l()) {
+               analog_data = dynamic_pointer_cast<Analog>(data_);
 
-                                       // Convert as many sample blocks as we can
-                                       while ((end_sample - i) > ConversionBlockSize) {
-                                               asegment->get_samples(i, i + ConversionBlockSize, asamples);
+               if (analog_data->analog_segments().size() == 0) {
+                       unique_lock<mutex> input_lock(conversion_input_mutex_);
+                       conversion_input_cond_.wait(input_lock);
+               }
 
-                                               shared_ptr<sigrok::Logic> logic =
-                                                       analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
-                                                               &state, lsamples);
+       } else
+               // Currently, we only handle A2L conversions
+               return;
 
-                                               lsegment->append_payload(logic->data_pointer(), logic->data_length());
+       // If we had to wait for input data, we may have been notified to terminate
+       if (conversion_interrupt_)
+               return;
 
-                                               samples_added(lsegment, i, i + ConversionBlockSize);
-                                               i += ConversionBlockSize;
-                                       }
+       uint32_t segment_id = 0;
 
-                                       // Re-create sigrok::Analog and convert remaining samples
-                                       packet = Session::sr_context->create_analog_packet(channels,
-                                               asamples, end_sample - i, mq, unit, mq_flags);
+       AnalogSegment *asegment = analog_data->analog_segments().front().get();
+       assert(asegment);
 
-                                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+       const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
+       assert(logic_data);
 
-                                       asegment->get_samples(i, end_sample, asamples);
-                                       shared_ptr<sigrok::Logic> logic =
-                                               analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
-                                                       &state, lsamples);
-                                       lsegment->append_payload(logic->data_pointer(), logic->data_length());
-                                       samples_added(lsegment, i, end_sample);
-                               }
+       // Create the initial logic data segment if needed
+       if (logic_data->logic_segments().size() == 0) {
+               shared_ptr<LogicSegment> new_segment =
+                       make_shared<LogicSegment>(*logic_data.get(), 0, 1, asegment->samplerate());
+               logic_data->push_segment(new_segment);
+       }
 
-                               // If acquisition is ongoing, start-/endsample may have changed
-                               end_sample = asegment->get_sample_count();
+       LogicSegment *lsegment = logic_data->logic_segments().front().get();
+       assert(lsegment);
 
-                               delete[] lsamples;
-                               delete[] asamples;
+       do {
+               convert_single_segment(asegment, lsegment);
+
+               if (analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+                       // There are more segments to process
+                       segment_id++;
+
+                       try {
+                               asegment = analog_data->analog_segments().at(segment_id).get();
+                       } catch (out_of_range) {
+                               qDebug() << "Conversion error for" << name() << ": no analog segment" \
+                                       << segment_id << ", segments size is" << analog_data->analog_segments().size();
+                               return;
                        }
-               }
 
-               if (!conversion_interrupt_ && (start_sample == end_sample)) {
-                       unique_lock<mutex> input_lock(conversion_input_mutex_);
-                       conversion_input_cond_.wait(input_lock);
+                       shared_ptr<LogicSegment> new_segment = make_shared<LogicSegment>(
+                               *logic_data.get(), segment_id, 1, asegment->samplerate());
+                       logic_data->push_segment(new_segment);
+
+                       lsegment = logic_data->logic_segments().back().get();
+               } else {
+                       // No more segments to process, wait for data or interrupt
+                       if (!conversion_interrupt_) {
+                               unique_lock<mutex> input_lock(conversion_input_mutex_);
+                               conversion_input_cond_.wait(input_lock);
+                       }
                }
        } while (!conversion_interrupt_);
 }
 
-void SignalBase::start_conversion()
+void SignalBase::start_conversion(bool delayed_start)
 {
-       stop_conversion();
+       if (delayed_start) {
+               delayed_conversion_starter_.start();
+               return;
+       }
 
-       if (conversion_is_a2l()) {
-               shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
+       stop_conversion();
 
-               if (analog_data->analog_segments().size() > 0) {
-                       // TODO Support for multiple segments is missing
-                       AnalogSegment *asegment = analog_data->analog_segments().front().get();
+       if (converted_data_)
+               converted_data_->clear();
+       samples_cleared();
 
-                       conversion_interrupt_ = false;
-                       conversion_thread_ = std::thread(
-                               &SignalBase::conversion_thread_proc, this, asegment);
-               }
-       }
+       conversion_interrupt_ = false;
+       conversion_thread_ = std::thread(
+               &SignalBase::conversion_thread_proc, this);
 }
 
 void SignalBase::stop_conversion()
@@ -406,24 +654,38 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
                        // Notify the conversion thread since it's running
                        conversion_input_cond_.notify_one();
                } else {
-                       // Start the conversion thread
-                       start_conversion();
+                       // Start the conversion thread unless the delay timer is running
+                       if (!delayed_conversion_starter_.isActive())
+                               start_conversion();
                }
        }
 
        samples_added(segment, start_sample, end_sample);
 }
 
+void SignalBase::on_min_max_changed(float min, float max)
+{
+       // Restart conversion if one is enabled and uses a calculated threshold
+       if ((conversion_type_ != NoConversion) &&
+               (get_current_conversion_preset() == DynamicPreset))
+               start_conversion(true);
+
+       min_max_changed(min, max);
+}
+
 void SignalBase::on_capture_state_changed(int state)
 {
        if (state == Session::Running) {
-               if (conversion_type_ != NoConversion) {
-                       // Restart conversion
-                       stop_conversion();
+               // Restart conversion if one is enabled
+               if (conversion_type_ != NoConversion)
                        start_conversion();
-               }
        }
 }
 
+void SignalBase::on_delayed_conversion_start()
+{
+       start_conversion();
+}
+
 } // namespace data
 } // namespace pv