DecoderStack: Force a viewport update more frequently

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 912ed607f200bc431e9772c2514b8d186dd3917b..4f6bc41d551c4182919539cb3810882f9e10e60d 100644 (file)
--- 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;
@@ -257,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);
@@ -274,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
@@ -315,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
@@ -567,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");
@@ -586,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();