AnalogSignal: Implement info text for V/div display

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 2a794f0fb0c4af8a79b662e12b810ffdb28b510d..ebef90cbb6590fb9961fad97f73047e56e8acc79 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -138,16 +138,21 @@ void Session::set_device(shared_ptr<devices::Device> device)
        if (device_)
                device_->close();
 
+       device_.reset();
+
+       // Remove all traces
+       signals_.clear();
+       decode_traces_.clear();
+       signals_changed();
+
        device_ = std::move(device);
        device_->open();
        device_->session()->add_datafeed_callback([=]
                (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
                        data_feed_in(device, packet);
                });
-       update_signals();
-
-       decode_traces_.clear();
 
+       update_signals();
        device_selected();
 }
 
@@ -253,8 +258,7 @@ bool Session::add_decoder(srd_decoder *const dec)
        map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
        shared_ptr<data::DecoderStack> decoder_stack;
 
-       try
-       {
+       try {
                lock_guard<boost::shared_mutex> lock(signals_mutex_);
 
                // Create the decoder
@@ -270,8 +274,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 
                // Auto select the initial channels
                for (const srd_channel *pdch : all_channels)
-                       for (shared_ptr<view::Signal> s : signals_)
-                       {
+                       for (shared_ptr<view::Signal> s : signals_) {
                                shared_ptr<view::LogicSignal> l =
                                        dynamic_pointer_cast<view::LogicSignal>(s);
                                if (l && QString::fromUtf8(pdch->name).
@@ -290,9 +293,7 @@ bool Session::add_decoder(srd_decoder *const dec)
                        new view::DecodeTrace(*this, decoder_stack,
                                decode_traces_.size()));
                decode_traces_.push_back(d);
-       }
-       catch(std::runtime_error e)
-       {
+       } catch (std::runtime_error e) {
                return false;
        }
 
@@ -313,8 +314,7 @@ vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
 void Session::remove_decode_signal(view::DecodeTrace *signal)
 {
        for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
-               if ((*i).get() == signal)
-               {
+               if ((*i).get() == signal) {
                        decode_traces_.erase(i);
                        signals_changed();
                        return;
@@ -338,7 +338,11 @@ void Session::set_capture_state(capture_state state)
 
 void Session::update_signals()
 {
-       assert(device_);
+       if (!device_) {
+               signals_.clear();
+               logic_data_.reset();
+               return;
+       }
 
        lock_guard<recursive_mutex> lock(data_mutex_);
 
@@ -454,7 +458,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 
        try {
                device_->start();
-       } catch(Error e) {
+       } catch (Error e) {
                error_handler(e.what());
                return;
        }
@@ -466,8 +470,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
        set_capture_state(Stopped);
 
        // Confirm that SR_DF_END was received
-       if (cur_logic_segment_)
-       {
+       if (cur_logic_segment_) {
                qDebug("SR_DF_END was not received.");
                assert(0);
        }
@@ -486,6 +489,11 @@ void Session::feed_in_meta(shared_ptr<Meta> meta)
        for (auto entry : meta->config()) {
                switch (entry.first->id()) {
                case SR_CONF_SAMPLERATE:
+                       // We can't rely on the header to always contain the sample rate,
+                       // so in case it's supplied via a meta packet, we use it.
+                       if (!cur_samplerate_)
+                               cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
+
                        /// @todo handle samplerate changes
                        break;
                default:
@@ -530,16 +538,14 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
        const size_t sample_count = logic->data_length() / logic->unit_size();
 
-       if (!logic_data_)
-       {
+       if (!logic_data_) {
                // The only reason logic_data_ would not have been created is
                // if it was not possible to determine the signals when the
                // device was created.
                update_signals();
        }
 
-       if (!cur_logic_segment_)
-       {
+       if (!cur_logic_segment_) {
                // This could be the first packet after a trigger
                set_capture_state(Running);
 
@@ -554,9 +560,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
                // frame_began is DecoderStack, but in future we need to signal
                // this after both analog and logic sweeps have begun.
                frame_began();
-       }
-       else
-       {
+       } else {
                // Append to the existing data segment
                cur_logic_segment_->append_payload(logic);
        }
@@ -574,8 +578,10 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
        const float *data = static_cast<const float *>(analog->data_pointer());
        bool sweep_beginning = false;
 
-       for (auto channel : channels)
-       {
+       if (signals_.empty())
+               update_signals();
+
+       for (auto channel : channels) {
                shared_ptr<data::AnalogSegment> segment;
 
                // Try to get the segment of the channel
@@ -583,9 +589,8 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                        iterator iter = cur_analog_segments_.find(channel);
                if (iter != cur_analog_segments_.end())
                        segment = (*iter).second;
-               else
-               {
-                       // If no segment was found, this means we havn't
+               else {
+                       // If no segment was found, this means we haven't
                        // created one yet. i.e. this is the first packet
                        // in the sweep containing this segment.
                        sweep_beginning = true;