X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=4f6bc41d551c4182919539cb3810882f9e10e60d;hp=272dac234374c9f4e69e825100520e81010644d4;hb=add091eb7183fb399db139f29f3a0b4c85bd4273;hpb=0fb9d6454c286869d71621b69515802903735057

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 272dac23..4f6bc41d 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -74,6 +74,7 @@ using std::cerr;
 using std::endl;
 using std::list;
 using std::map;
+using std::max;
 using std::pair;
 using std::shared_ptr;
 using std::string;
@@ -177,6 +178,11 @@ QAction* MainWindow::action_view_sticky_scrolling() const
 	return action_view_sticky_scrolling_;
 }
 
+QAction* MainWindow::action_view_coloured_bg() const
+{
+	return action_view_coloured_bg_;
+}
+
 QAction* MainWindow::action_view_show_cursors() const
 {
 	return action_view_show_cursors_;
@@ -252,7 +258,8 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
 		const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
 		const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
 
-		const uint64_t start_sample = start_time.convert_to<double>() * samplerate;
+		const uint64_t start_sample =
+			std::max((double)0, start_time.convert_to<double>() * samplerate);
 		const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
 
 		sample_range = std::make_pair(start_sample, end_sample);
@@ -269,7 +276,7 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
 		filter += "(*.*)";
 	else
 		filter += QString("(*.%1);;%2 (*.*)").arg(
-			QString::fromStdString(join(exts, ", *."))).arg(
+			QString::fromStdString(join(exts, ", *.")),
 			tr("All Files"));
 
 	// Show the file dialog
@@ -310,7 +317,7 @@ void MainWindow::import_file(shared_ptr<InputFormat> format)
 	const vector<string> exts = format->extensions();
 	const QString filter = exts.empty() ? "" :
 		tr("%1 files (*.%2)").arg(
-			QString::fromStdString(format->description())).arg(
+			QString::fromStdString(format->description()),
 			QString::fromStdString(join(exts, ", *.")));
 
 	// Show the file dialog
@@ -476,12 +483,14 @@ void MainWindow::setup_ui()
 
 	action_view_coloured_bg_->setCheckable(true);
 	action_view_coloured_bg_->setChecked(true);
-	action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_S));
+	action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
 	action_view_coloured_bg_->setObjectName(
 		QString::fromUtf8("actionViewColouredBg"));
 	action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
 	menu_view->addAction(action_view_coloured_bg_);
 
+	view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+
 	menu_view->addSeparator();
 
 	action_view_show_cursors_->setCheckable(true);
@@ -560,8 +569,9 @@ void MainWindow::select_init_device()
 	QSettings settings;
 	map<string, string> dev_info;
 	list<string> key_list;
+	shared_ptr<devices::HardwareDevice> device;
 
-	// Re-select last used device if possible.
+	// Re-select last used device if possible but only if it's not demo
 	settings.beginGroup("Device");
 	key_list.push_back("vendor");
 	key_list.push_back("model");
@@ -579,8 +589,24 @@ void MainWindow::select_init_device()
 			dev_info.insert(std::make_pair(key, value));
 	}
 
-	const shared_ptr<devices::HardwareDevice> device =
-		device_manager_.find_device_from_info(dev_info);
+	if (dev_info.count("model") > 0)
+		if (dev_info.at("model").find("Demo device") == std::string::npos)
+			device = device_manager_.find_device_from_info(dev_info);
+
+	// When we can't find a device similar to the one we used last
+	// time and there is at least one device aside from demo, use it
+	if (!device) {
+		for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
+			dev_info = device_manager_.get_device_info(dev);
+
+			if (dev_info.count("model") > 0)
+				if (dev_info.at("model").find("Demo device") == std::string::npos) {
+					device = dev;
+					break;
+				}
+		}
+	}
+
 	select_device(device);
 	update_device_list();
 
@@ -807,6 +833,7 @@ void MainWindow::on_actionViewStickyScrolling_triggered()
 
 void MainWindow::on_actionViewColouredBg_triggered()
 {
+	view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
 }
 
 void MainWindow::on_actionViewShowCursors_triggered()