X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=2712af1200ab12082bb400c50d0e3f493b0ee5c5;hp=e5bf1f6a3dee58a7f15e42005e7cbcaef0ace961;hb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;hpb=326cf6feb8598aa03a35fd6f678e4f536f168149

diff --git a/pv/session.cpp b/pv/session.cpp
index e5bf1f6a..2712af12 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -66,24 +66,29 @@ using boost::shared_lock;
 using boost::shared_mutex;
 using boost::unique_lock;
 
+using std::bad_alloc;
 using std::dynamic_pointer_cast;
+using std::find_if;
 using std::function;
 using std::lock_guard;
 using std::list;
+using std::make_pair;
+using std::make_shared;
 using std::map;
+using std::max;
+using std::move;
 using std::mutex;
 using std::pair;
 using std::recursive_mutex;
+using std::runtime_error;
 using std::set;
 using std::shared_ptr;
-using std::make_shared;
 using std::string;
 using std::unordered_set;
 using std::vector;
 
 using sigrok::Analog;
 using sigrok::Channel;
-using sigrok::ChannelType;
 using sigrok::ConfigKey;
 using sigrok::DatafeedCallbackFunction;
 using sigrok::Error;
@@ -154,17 +159,17 @@ void Session::set_name(QString name)
 	name_changed();
 }
 
-const std::list< std::shared_ptr<views::ViewBase> > Session::views() const
+const list< shared_ptr<views::ViewBase> > Session::views() const
 {
 	return views_;
 }
 
-std::shared_ptr<views::ViewBase> Session::main_view() const
+shared_ptr<views::ViewBase> Session::main_view() const
 {
 	return main_view_;
 }
 
-void Session::set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar)
+void Session::set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar)
 {
 	main_bar_ = main_bar;
 }
@@ -229,7 +234,7 @@ void Session::save_settings(QSettings &settings) const
 			if (base->is_decode_signal()) {
 				shared_ptr<pv::data::DecoderStack> decoder_stack =
 						base->decoder_stack();
-				std::shared_ptr<data::decode::Decoder> top_decoder =
+				shared_ptr<data::decode::Decoder> top_decoder =
 						decoder_stack->stack().front();
 
 				settings.beginGroup("decoder_stack" + QString::number(stacks++));
@@ -290,7 +295,7 @@ void Session::restore_settings(QSettings &settings)
 
 			const string value = settings.value(k).toString().toStdString();
 			if (!value.empty())
-				dev_info.insert(std::make_pair(key, value));
+				dev_info.insert(make_pair(key, value));
 		}
 
 		if (dev_info.count("model") > 0)
@@ -389,7 +394,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	name_changed();
 
 	// Remove all stored data
-	for (std::shared_ptr<views::ViewBase> view : views_) {
+	for (shared_ptr<views::ViewBase> view : views_) {
 		view->clear_signals();
 #ifdef ENABLE_DECODE
 		view->clear_decode_signals();
@@ -410,7 +415,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 
 	signals_changed();
 
-	device_ = std::move(device);
+	device_ = move(device);
 
 	try {
 		device_->open();
@@ -439,15 +444,13 @@ void Session::set_default_device()
 		return;
 
 	// Try and find the demo device and select that by default
-	const auto iter = std::find_if(devices.begin(), devices.end(),
+	const auto iter = find_if(devices.begin(), devices.end(),
 		[] (const shared_ptr<devices::HardwareDevice> &d) {
-			return d->hardware_device()->driver()->name() ==
-			"demo";	});
+			return d->hardware_device()->driver()->name() == "demo";	});
 	set_device((iter == devices.end()) ? devices.front() : *iter);
 }
 
-void Session::load_init_file(const std::string &file_name,
-	const std::string &format)
+void Session::load_init_file(const string &file_name, const string &format)
 {
 	shared_ptr<InputFormat> input_format;
 
@@ -470,8 +473,8 @@ void Session::load_init_file(const std::string &file_name,
 }
 
 void Session::load_file(QString file_name,
-	std::shared_ptr<sigrok::InputFormat> format,
-	const std::map<std::string, Glib::VariantBase> &options)
+	shared_ptr<sigrok::InputFormat> format,
+	const map<string, Glib::VariantBase> &options)
 {
 	const QString errorMessage(
 		QString("Failed to load file %1").arg(file_name));
@@ -522,7 +525,7 @@ void Session::start_capture(function<void (const QString)> error_handler)
 	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (sr_dev) {
 		const auto channels = sr_dev->channels();
-		if (!std::any_of(channels.begin(), channels.end(),
+		if (!any_of(channels.begin(), channels.end(),
 			[](shared_ptr<Channel> channel) {
 				return channel->enabled(); })) {
 			error_handler(tr("No channels enabled."));
@@ -534,9 +537,15 @@ 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. "Session 1") as the data is gone
-	name_ = default_name_;
-	name_changed();
+	// Revert name back to default name (e.g. "Session 1") for real devices
+	// as the (possibly saved) data is gone. File devices keep their name.
+	shared_ptr<devices::HardwareDevice> hw_device =
+		dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+	if (hw_device) {
+		name_ = default_name_;
+		name_changed();
+	}
 
 	// Begin the session
 	sampling_thread_ = std::thread(
@@ -553,7 +562,7 @@ void Session::stop_capture()
 		sampling_thread_.join();
 }
 
-void Session::register_view(std::shared_ptr<views::ViewBase> view)
+void Session::register_view(shared_ptr<views::ViewBase> view)
 {
 	if (views_.empty()) {
 		main_view_ = view;
@@ -564,10 +573,9 @@ void Session::register_view(std::shared_ptr<views::ViewBase> view)
 	update_signals();
 }
 
-void Session::deregister_view(std::shared_ptr<views::ViewBase> view)
+void Session::deregister_view(shared_ptr<views::ViewBase> view)
 {
-	views_.remove_if([&](std::shared_ptr<views::ViewBase> v) {
-		return v == view; });
+	views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
 
 	if (views_.empty()) {
 		main_view_.reset();
@@ -577,9 +585,9 @@ void Session::deregister_view(std::shared_ptr<views::ViewBase> view)
 	}
 }
 
-bool Session::has_view(std::shared_ptr<views::ViewBase> view)
+bool Session::has_view(shared_ptr<views::ViewBase> view)
 {
-	for (std::shared_ptr<views::ViewBase> v : views_)
+	for (shared_ptr<views::ViewBase> v : views_)
 		if (v == view)
 			return true;
 
@@ -595,7 +603,7 @@ double Session::get_samplerate() const
 		const vector< shared_ptr<pv::data::Segment> > segments =
 			d->segments();
 		for (const shared_ptr<pv::data::Segment> &s : segments)
-			samplerate = std::max(samplerate, s->samplerate());
+			samplerate = max(samplerate, s->samplerate());
 	}
 	// If there is no sample rate given we use samples as unit
 	if (samplerate == 0.0)
@@ -604,8 +612,7 @@ double Session::get_samplerate() const
 	return samplerate;
 }
 
-const std::unordered_set< std::shared_ptr<data::SignalBase> >
-	Session::signalbases() const
+const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
 {
 	return signalbases_;
 }
@@ -621,7 +628,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 		decoder_stack = make_shared<data::DecoderStack>(*this, dec);
 
 		// Make a list of all the channels
-		std::vector<const srd_channel*> all_channels;
+		vector<const srd_channel*> all_channels;
 		for (const GSList *i = dec->channels; i; i = i->next)
 			all_channels.push_back((const srd_channel*)i->data);
 		for (const GSList *i = dec->opt_channels; i; i = i->next)
@@ -630,7 +637,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 		// Auto select the initial channels
 		for (const srd_channel *pdch : all_channels)
 			for (shared_ptr<data::SignalBase> b : signalbases_) {
-				if (b->type() == ChannelType::LOGIC) {
+				if (b->type() == data::SignalBase::LogicChannel) {
 					if (QString::fromUtf8(pdch->name).toLower().
 						contains(b->name().toLower()))
 						channels[pdch] = b;
@@ -644,14 +651,14 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Create the decode signal
 		shared_ptr<data::SignalBase> signalbase =
-			make_shared<data::SignalBase>(nullptr);
+			make_shared<data::SignalBase>(nullptr, data::SignalBase::DecodeChannel);
 
 		signalbase->set_decoder_stack(decoder_stack);
 		signalbases_.insert(signalbase);
 
-		for (std::shared_ptr<views::ViewBase> view : views_)
+		for (shared_ptr<views::ViewBase> view : views_)
 			view->add_decode_signal(signalbase);
-	} catch (std::runtime_error e) {
+	} catch (runtime_error e) {
 		return false;
 	}
 
@@ -667,7 +674,7 @@ void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
 {
 	signalbases_.erase(signalbase);
 
-	for (std::shared_ptr<views::ViewBase> view : views_)
+	for (shared_ptr<views::ViewBase> view : views_)
 		view->remove_decode_signal(signalbase);
 
 	signals_changed();
@@ -693,7 +700,7 @@ void Session::update_signals()
 	if (!device_) {
 		signalbases_.clear();
 		logic_data_.reset();
-		for (std::shared_ptr<views::ViewBase> view : views_) {
+		for (shared_ptr<views::ViewBase> view : views_) {
 			view->clear_signals();
 #ifdef ENABLE_DECODE
 			view->clear_decode_signals();
@@ -708,7 +715,7 @@ void Session::update_signals()
 	if (!sr_dev) {
 		signalbases_.clear();
 		logic_data_.reset();
-		for (std::shared_ptr<views::ViewBase> view : views_) {
+		for (shared_ptr<views::ViewBase> view : views_) {
 			view->clear_signals();
 #ifdef ENABLE_DECODE
 			view->clear_decode_signals();
@@ -719,10 +726,10 @@ void Session::update_signals()
 
 	// Detect what data types we will receive
 	auto channels = sr_dev->channels();
-	unsigned int logic_channel_count = std::count_if(
+	unsigned int logic_channel_count = count_if(
 		channels.begin(), channels.end(),
 		[] (shared_ptr<Channel> channel) {
-			return channel->type() == ChannelType::LOGIC; });
+			return channel->type() == sigrok::ChannelType::LOGIC; });
 
 	// Create data containers for the logic data segments
 	{
@@ -739,7 +746,7 @@ void Session::update_signals()
 	}
 
 	// Make the signals list
-	for (std::shared_ptr<views::ViewBase> viewbase : views_) {
+	for (shared_ptr<views::ViewBase> viewbase : views_) {
 		views::TraceView::View *trace_view =
 			qobject_cast<views::TraceView::View*>(viewbase.get());
 
@@ -753,7 +760,7 @@ void Session::update_signals()
 				shared_ptr<views::TraceView::Signal> signal;
 
 				// Find the channel in the old signals
-				const auto iter = std::find_if(
+				const auto iter = find_if(
 					prev_sigs.cbegin(), prev_sigs.cend(),
 					[&](const shared_ptr<views::TraceView::Signal> &s) {
 						return s->base()->channel() == channel;
@@ -772,7 +779,8 @@ void Session::update_signals()
 					switch(channel->type()->id()) {
 					case SR_CHANNEL_LOGIC:
 						if (!signalbase) {
-							signalbase = make_shared<data::SignalBase>(channel);
+							signalbase = make_shared<data::SignalBase>(channel,
+								data::SignalBase::LogicChannel);
 							signalbases_.insert(signalbase);
 
 							all_signal_data_.insert(logic_data_);
@@ -788,7 +796,8 @@ void Session::update_signals()
 					case SR_CHANNEL_ANALOG:
 					{
 						if (!signalbase) {
-							signalbase = make_shared<data::SignalBase>(channel);
+							signalbase = make_shared<data::SignalBase>(channel,
+								data::SignalBase::AnalogChannel);
 							signalbases_.insert(signalbase);
 
 							shared_ptr<data::Analog> data(new data::Analog());
@@ -1059,7 +1068,7 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	case SR_DF_LOGIC:
 		try {
 			feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
-		} catch (std::bad_alloc) {
+		} catch (bad_alloc) {
 			out_of_memory_ = true;
 			device_->stop();
 		}
@@ -1068,7 +1077,7 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	case SR_DF_ANALOG:
 		try {
 			feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
-		} catch (std::bad_alloc) {
+		} catch (bad_alloc) {
 			out_of_memory_ = true;
 			device_->stop();
 		}