Fix #862 by implementing -c / --clean

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 51e6100295d18efc113d825351ee4390a54eb0ba..9c27f7b745d8e81b083025beb3a8bf7b6e364a44 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -21,12 +21,13 @@
 #include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
-#include <stdint.h>
+#include <cstdint>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
 #include <QDebug>
+#include <QSettings>
 
 #ifdef ENABLE_SIGNALS
 #include "signalhandler.hpp"
@@ -67,6 +68,7 @@ void usage()
                "  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
                "  -i, --input-file                Load input from file\n"
                "  -I, --input-format              Input format\n"
+               "  -c, --clean                     Don't restore previous sessions on startup\n"
                "\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
@@ -75,6 +77,7 @@ int main(int argc, char *argv[])
        int ret = 0;
        shared_ptr<sigrok::Context> context;
        string open_file, open_file_format;
+       bool restore_sessions = true;
 
        Application a(argc, argv);
 
@@ -85,18 +88,19 @@ int main(int argc, char *argv[])
 #endif
 
        // Parse arguments
-       while (1) {
+       while (true) {
                static const struct option long_options[] = {
                        {"help", no_argument, nullptr, 'h'},
                        {"version", no_argument, nullptr, 'V'},
                        {"loglevel", required_argument, nullptr, 'l'},
                        {"input-file", required_argument, nullptr, 'i'},
                        {"input-format", required_argument, nullptr, 'I'},
+                       {"clean", no_argument, nullptr, 'c'},
                        {nullptr, 0, nullptr, 0}
                };
 
                const int c = getopt_long(argc, argv,
-                       "l:Vh?i:I:", long_options, nullptr);
+                       "l:Vhc?i:I:", long_options, nullptr);
                if (c == -1)
                        break;
 
@@ -120,6 +124,11 @@ int main(int argc, char *argv[])
                        srd_log_loglevel_set(loglevel);
 #endif
 
+                       if (loglevel >= 5) {
+                               const QSettings settings;
+                               qDebug() << "Settings:" << settings.fileName()
+                                       << "format" << settings.format();
+                       }
                        break;
                }
 
@@ -130,16 +139,21 @@ int main(int argc, char *argv[])
                case 'I':
                        open_file_format = optarg;
                        break;
+
+               case 'c':
+                       restore_sessions = false;
+                       break;
                }
        }
 
        if (argc - optind > 1) {
                fprintf(stderr, "Only one file can be opened.\n");
                return 1;
-       } else if (argc - optind == 1) {
-               open_file = argv[argc - 1];
        }
 
+       if (argc - optind == 1)
+               open_file = argv[argc - 1];
+
        // Initialise libsigrok
        context = sigrok::Context::create();
 #ifdef ANDROID
@@ -163,8 +177,8 @@ int main(int argc, char *argv[])
                        pv::DeviceManager device_manager(context);
 
                        // Initialise the main window
-                       pv::MainWindow w(device_manager,
-                               open_file, open_file_format);
+                       pv::MainWindow w(device_manager, open_file, open_file_format,
+                               restore_sessions);
                        w.show();
 
 #ifdef ENABLE_SIGNALS
@@ -195,7 +209,7 @@ int main(int argc, char *argv[])
                srd_exit();
 #endif
 
-       } while (0);
+       } while (false);
 
        return ret;
 }