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 26e01d05828858e1e1e1e00df28ee3162f5c3018..5aec9ba884677e924cb8e0d1d533a62c4ef467b2 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -81,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_)
@@ -542,13 +550,19 @@ void SignalBase::conversion_thread_proc()
        if (conversion_is_a2l()) {
                analog_data = dynamic_pointer_cast<Analog>(data_);
 
-               if (analog_data->analog_segments().size() == 0)
-                       return;
+               if (analog_data->analog_segments().size() == 0) {
+                       unique_lock<mutex> input_lock(conversion_input_mutex_);
+                       conversion_input_cond_.wait(input_lock);
+               }
 
        } else
                // Currently, we only handle A2L conversions
                return;
 
+       // If we had to wait for input data, we may have been notified to terminate
+       if (conversion_interrupt_)
+               return;
+
        uint32_t segment_id = 0;
 
        AnalogSegment *asegment = analog_data->analog_segments().front().get();
@@ -560,7 +574,7 @@ void SignalBase::conversion_thread_proc()
        // 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(), 1, asegment->samplerate());
+                       make_shared<LogicSegment>(*logic_data.get(), 0, 1, asegment->samplerate());
                logic_data->push_segment(new_segment);
        }
 
@@ -582,8 +596,8 @@ void SignalBase::conversion_thread_proc()
                                return;
                        }
 
-                       shared_ptr<LogicSegment> new_segment =
-                               make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
+                       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();