Name session tabs "Session 1" per default.

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index df09ff3b2ebc0b924a9158158de9a2362ab385db..c9a569f7f9e9d67fb3288b16a724accf8e761428 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -383,7 +383,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 
        device_.reset();
 
-       // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+       // Revert name back to default name (e.g. "Session 1") as the data is gone
        name_ = default_name_;
        name_changed();
 
@@ -532,7 +532,7 @@ void Session::start_capture(function<void (const QString)> error_handler)
        for (const shared_ptr<data::SignalData> d : all_signal_data_)
                d->clear();
 
-       // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+       // Revert name back to default name (e.g. "Session 1") as the data is gone
        name_ = default_name_;
        name_changed();
 
@@ -954,7 +954,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
                // Create a new data segment
                cur_logic_segment_ = shared_ptr<data::LogicSegment>(
-                       new data::LogicSegment(logic, cur_samplerate_));
+                       new data::LogicSegment(*logic_data_, logic, cur_samplerate_));
                logic_data_->push_segment(cur_logic_segment_);
 
                // @todo Putting this here means that only listeners querying
@@ -997,11 +997,6 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                        // in the sweep containing this segment.
                        sweep_beginning = true;
 
-                       // Create a segment, keep it in the maps of channels
-                       segment = shared_ptr<data::AnalogSegment>(
-                               new data::AnalogSegment(cur_samplerate_));
-                       cur_analog_segments_[channel] = segment;
-
                        // Find the analog data associated with the channel
                        shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
                        assert(base);
@@ -1009,6 +1004,11 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                        shared_ptr<data::Analog> data(base->analog_data());
                        assert(data);
 
+                       // Create a segment, keep it in the maps of channels
+                       segment = shared_ptr<data::AnalogSegment>(
+                               new data::AnalogSegment(*data, cur_samplerate_));
+                       cur_analog_segments_[channel] = segment;
+
                        // Push the segment into the analog data.
                        data->push_segment(segment);
                }