X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=589ec333a24c35bfbe02f47b8e393970f4370f42;hb=0ea2cfc5c05e16c4f5cc9e9de975f3f22af28586;hp=79c32947e1f619b43895516d0fb1b0820bdc349e;hpb=db29815836442ac83d453b3de2bf1755e9fd89f0;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 79c32947..589ec333 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -105,6 +105,10 @@ using Gst::ElementFactory;
 using Gst::Pipeline;
 #endif
 
+using pv::views::trace::Signal;
+using pv::views::trace::AnalogSignal;
+using pv::views::trace::LogicSignal;
+
 namespace pv {
 
 shared_ptr<sigrok::Context> Session::sr_context;
@@ -481,6 +485,17 @@ void Session::set_default_device()
 	set_device((iter == devices.end()) ? devices.front() : *iter);
 }
 
+bool Session::using_file_device() const
+{
+	shared_ptr<devices::SessionFile> sessionfile_device =
+		dynamic_pointer_cast<devices::SessionFile>(device_);
+
+	shared_ptr<devices::InputFile> inputfile_device =
+		dynamic_pointer_cast<devices::InputFile>(device_);
+
+	return (sessionfile_device || inputfile_device);
+}
+
 /**
  * Convert generic options to data types that are specific to InputFormat.
  *
@@ -578,7 +593,7 @@ void Session::load_file(QString file_name, QString setup_file_name,
 					device_manager_.context(),
 					file_name.toStdString())));
 	} catch (Error& e) {
-		MainWindow::show_session_error(tr("Failed to load ") + file_name, e.what());
+		MainWindow::show_session_error(tr("Failed to load %1").arg(file_name), e.what());
 		set_default_device();
 		main_bar_->update_device_list();
 		return;
@@ -664,9 +679,8 @@ void Session::stop_capture()
 
 void Session::register_view(shared_ptr<views::ViewBase> view)
 {
-	if (views_.empty()) {
+	if (views_.empty())
 		main_view_ = view;
-	}
 
 	views_.push_back(view);
 
@@ -674,35 +688,29 @@ void Session::register_view(shared_ptr<views::ViewBase> view)
 	update_signals();
 
 	// Add all other signals
-	unordered_set< shared_ptr<data::SignalBase> > view_signalbases =
-		view->signalbases();
-
-	views::trace::View *trace_view =
-		qobject_cast<views::trace::View*>(view.get());
-
-	if (trace_view) {
-		for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
-			const int sb_exists = count_if(
-				view_signalbases.cbegin(), view_signalbases.cend(),
-				[&](const shared_ptr<data::SignalBase> &sb) {
-					return sb == signalbase;
-				});
-			// Add the signal to the view as it doesn't have it yet
-			if (!sb_exists)
-				switch (signalbase->type()) {
-				case data::SignalBase::AnalogChannel:
-				case data::SignalBase::LogicChannel:
-				case data::SignalBase::DecodeChannel:
+	unordered_set< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
+
+	for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
+		const int sb_exists = count_if(
+			view_signalbases.cbegin(), view_signalbases.cend(),
+			[&](const shared_ptr<data::SignalBase> &sb) {
+				return sb == signalbase;
+			});
+
+		// Add the signal to the view if it doesn't have it yet
+		if (!sb_exists)
+			switch (signalbase->type()) {
+			case data::SignalBase::AnalogChannel:
+			case data::SignalBase::LogicChannel:
+			case data::SignalBase::MathChannel:
+				view->add_signalbase(signalbase);
+				break;
+			case data::SignalBase::DecodeChannel:
 #ifdef ENABLE_DECODE
-					trace_view->add_decode_signal(
-						dynamic_pointer_cast<data::DecodeSignal>(signalbase));
+				view->add_decode_signal(dynamic_pointer_cast<data::DecodeSignal>(signalbase));
 #endif
-					break;
-				case data::SignalBase::MathChannel:
-					// TBD
-					break;
-				}
-		}
+				break;
+			}
 	}
 
 	signals_changed();
@@ -896,18 +904,17 @@ void Session::update_signals()
 			qobject_cast<views::trace::View*>(viewbase.get());
 
 		if (trace_view) {
-			unordered_set< shared_ptr<views::trace::Signal> >
-				prev_sigs(trace_view->signals());
+			unordered_set< shared_ptr<Signal> > prev_sigs(trace_view->signals());
 			trace_view->clear_signals();
 
 			for (auto channel : sr_dev->channels()) {
 				shared_ptr<data::SignalBase> signalbase;
-				shared_ptr<views::trace::Signal> signal;
+				shared_ptr<Signal> signal;
 
 				// Find the channel in the old signals
 				const auto iter = find_if(
 					prev_sigs.cbegin(), prev_sigs.cend(),
-					[&](const shared_ptr<views::trace::Signal> &s) {
+					[&](const shared_ptr<Signal> &s) {
 						return s->base()->channel() == channel;
 					});
 				if (iter != prev_sigs.end()) {
@@ -921,6 +928,8 @@ void Session::update_signals()
 						if (b->channel() == channel)
 							signalbase = b;
 
+					shared_ptr<Signal> signal;
+
 					switch(channel->type()->id()) {
 					case SR_CHANNEL_LOGIC:
 						if (!signalbase) {
@@ -935,10 +944,7 @@ void Session::update_signals()
 								signalbase.get(), SLOT(on_capture_state_changed(int)));
 						}
 
-						signal = shared_ptr<views::trace::Signal>(
-							new views::trace::LogicSignal(*this,
-								device_, signalbase));
-						trace_view->add_signal(signal);
+						signal = shared_ptr<Signal>(new LogicSignal(*this, device_, signalbase));
 						break;
 
 					case SR_CHANNEL_ANALOG:
@@ -956,10 +962,7 @@ void Session::update_signals()
 								signalbase.get(), SLOT(on_capture_state_changed(int)));
 						}
 
-						signal = shared_ptr<views::trace::Signal>(
-							new views::trace::AnalogSignal(
-								*this, signalbase));
-						trace_view->add_signal(signal);
+						signal = shared_ptr<Signal>(new AnalogSignal(*this, signalbase));
 						break;
 					}
 
@@ -967,6 +970,17 @@ void Session::update_signals()
 						assert(false);
 						break;
 					}
+
+					// New views take their signal settings from the main view
+					if (!viewbase->is_main_view()) {
+						shared_ptr<pv::views::trace::View> main_tv =
+							dynamic_pointer_cast<pv::views::trace::View>(main_view_);
+						shared_ptr<Signal> main_signal =
+							main_tv->get_signal_by_signalbase(signalbase);
+						signal->restore_settings(main_signal->save_settings());
+					}
+
+					trace_view->add_signal(signal);
 				}
 			}
 		}
@@ -1479,8 +1493,10 @@ void Session::on_new_decoders_selected(vector<const srd_decoder*> decoders)
 	shared_ptr<data::DecodeSignal> signal = add_decode_signal();
 
 	if (signal)
-		for (const srd_decoder* d : decoders)
-			signal->stack_decoder(d);
+		for (unsigned int i = 0; i < decoders.size(); i++) {
+			const srd_decoder* d = decoders[i];
+			signal->stack_decoder(d, !(i < decoders.size() - 1));
+		}
 }
 #endif