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 018e4a2733fca8f813efeff6f9b9c0fd1dd6a9f6..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_;
 }
 
        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_)


@@ -566,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 =
        // 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);
        }
 
                logic_data->push_segment(new_segment);
        }
 


@@ -588,8 +596,8 @@ void SignalBase::conversion_thread_proc()
                                return;
                        }
 
                                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();
                        logic_data->push_segment(new_segment);
 
                        lsegment = logic_data->logic_segments().back().get();