Fix #1089 by updating the signal labels and group labels

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

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index da05f1079597bb2e708d587bb9f3789594baeb82..5aec9ba884677e924cb8e0d1d533a62c4ef467b2 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -26,11 +26,14 @@
 #include "signalbase.hpp"
 #include "signaldata.hpp"
 
 #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;
 #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;
 using std::shared_ptr;
 using std::tie;
 using std::unique_lock;


@@ -78,6 +81,14 @@ QString SignalBase::internal_name() const
        return internal_name_;
 }
 
        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_)
 void SignalBase::set_name(QString name)
 {
        if (channel_)


@@ -198,6 +209,35 @@ shared_ptr<data::Logic> SignalBase::logic_data() const
        return result;
 }
 
        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_;
 SignalBase::ConversionType SignalBase::get_conversion_type() const
 {
        return conversion_type_;


@@ -344,7 +384,7 @@ SignalBase::ConversionPreset SignalBase::get_current_conversion_preset() const
        if (preset != conversion_options_.end())
                return (ConversionPreset)((preset->second).toInt());
 
        if (preset != conversion_options_.end())
                return (ConversionPreset)((preset->second).toInt());
 

-       return NoPreset;
+       return DynamicPreset;

 }
 
 void SignalBase::set_conversion_preset(ConversionPreset id)
 }
 
 void SignalBase::set_conversion_preset(ConversionPreset id)


@@ -399,131 +439,174 @@ bool SignalBase::conversion_is_a2l() const
                (conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
                (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;
 
        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_);

 
 

-                       LogicSegment *lsegment = dynamic_cast<LogicSegment*>(logic_data->segments().front().get());
+               vector<const sigrok::QuantityFlag*> mq_flags;
+               const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
+               const sigrok::Unit * const unit = sigrok::Unit::VOLT;

 
 

-                       start_sample = lsegment->get_sample_count();
-                       end_sample = asegment->get_sample_count();
+               shared_ptr<sigrok::Packet> packet =
+                       Session::sr_context->create_analog_packet(channels,
+                       asamples, ConversionBlockSize, mq, unit, mq_flags);

 
 

-                       if (end_sample > start_sample) {
-                               tie(min_value_, max_value_) = asegment->get_min_max();
+               shared_ptr<sigrok::Analog> analog =
+                       dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+
+               // Convert
+               uint64_t i = start_sample;
+
+               if (conversion_type_ == A2LConversionByThreshold) {
+                       const double threshold = get_conversion_thresholds()[0];
+
+                       // 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);
+
+                               lsegment->append_payload(logic->data_pointer(), logic->data_length());
+
+                               samples_added(lsegment, i, i + ConversionBlockSize);
+                               i += ConversionBlockSize;
+                       }

 
 

-                               // Create sigrok::Analog instance
-                               float *asamples = new float[ConversionBlockSize];
-                               uint8_t *lsamples = new uint8_t[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);

 
 

-                               vector<shared_ptr<sigrok::Channel> > channels;
-                               channels.push_back(channel_);
+                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());

 
 

-                               vector<const sigrok::QuantityFlag*> mq_flags;
-                               const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
-                               const sigrok::Unit * const unit = sigrok::Unit::VOLT;
+                       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);
+               }

 
 

-                               shared_ptr<sigrok::Packet> packet =
-                                       Session::sr_context->create_analog_packet(channels,
-                                       asamples, ConversionBlockSize, mq, unit, mq_flags);
+               if (conversion_type_ == A2LConversionBySchmittTrigger) {
+                       const vector<double> thresholds = get_conversion_thresholds();
+                       const double lo_thr = thresholds[0];
+                       const double hi_thr = thresholds[1];

 
 

-                               shared_ptr<sigrok::Analog> analog =
-                                       dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+                       uint8_t state = 0;  // TODO Use value of logic sample n-1 instead of 0

 
 

-                               // Convert
-                               uint64_t i = start_sample;
+                       // Convert as many sample blocks as we can
+                       while ((end_sample - i) > ConversionBlockSize) {
+                               asegment->get_samples(i, i + ConversionBlockSize, asamples);

 
 

-                               if (conversion_type_ == A2LConversionByThreshold) {
-                                       const double threshold = get_conversion_thresholds()[0];
+                               shared_ptr<sigrok::Logic> logic =
+                                       analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+                                               &state, lsamples);

 
 

-                                       // Convert as many sample blocks as we can
-                                       while ((end_sample - i) > ConversionBlockSize) {
-                                               asegment->get_samples(i, i + ConversionBlockSize, asamples);
+                               lsegment->append_payload(logic->data_pointer(), logic->data_length());

 
 

-                                               shared_ptr<sigrok::Logic> logic =
-                                                       analog->get_logic_via_threshold(threshold, lsamples);
+                               samples_added(lsegment, i, i + ConversionBlockSize);
+                               i += ConversionBlockSize;
+                       }

 
 

-                                               lsegment->append_payload(logic->data_pointer(), logic->data_length());
+                       // Re-create sigrok::Analog and convert remaining samples
+                       packet = Session::sr_context->create_analog_packet(channels,
+                               asamples, end_sample - i, mq, unit, mq_flags);

 
 

-                                               samples_added(lsegment, i, i + ConversionBlockSize);
-                                               i += ConversionBlockSize;
-                                       }
+                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());

 
 

-                                       // Re-create sigrok::Analog and convert remaining samples
-                                       packet = Session::sr_context->create_analog_packet(channels,
-                                               asamples, end_sample - i, mq, unit, mq_flags);
+                       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);
+               }

 
 

-                                       analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+               // If acquisition is ongoing, start-/endsample may have changed
+               end_sample = asegment->get_sample_count();

 
 

-                                       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);
-                               }
+               delete[] lsamples;
+               delete[] asamples;
+       }
+}

 
 

-                               if (conversion_type_ == A2LConversionBySchmittTrigger) {
-                                       const vector<double> thresholds = get_conversion_thresholds();
-                                       const double lo_thr = thresholds[0];
-                                       const double hi_thr = thresholds[1];
+void SignalBase::conversion_thread_proc()
+{
+       shared_ptr<Analog> analog_data;

 
 

-                                       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_);
 }
                }
        } while (!conversion_interrupt_);
 }


@@ -539,19 +622,11 @@ void SignalBase::start_conversion(bool delayed_start)
 
        if (converted_data_)
                converted_data_->clear();
 
        if (converted_data_)
                converted_data_->clear();

+       samples_cleared();

 
 

-       if (conversion_is_a2l()) {
-               shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
-               if (analog_data->analog_segments().size() > 0) {
-                       // TODO Support for multiple segments is missing
-                       AnalogSegment *asegment = analog_data->analog_segments().front().get();
-
-                       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()
 }
 
 void SignalBase::stop_conversion()


@@ -590,13 +665,12 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
 
 void SignalBase::on_min_max_changed(float min, float max)
 {
 
 void SignalBase::on_min_max_changed(float min, float max)
 {

-       (void)min;
-       (void)max;
-

        // Restart conversion if one is enabled and uses a calculated threshold
        if ((conversion_type_ != NoConversion) &&
                (get_current_conversion_preset() == DynamicPreset))
                start_conversion(true);
        // 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)
 }
 
 void SignalBase::on_capture_state_changed(int state)