X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=1e4fe577dc11328b4b07167b3ce1c42d16fdd075;hp=cebeca378c69eaf1001229ff7340ae33d4c4e86b;hb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;hpb=c5d6200c96d6478e2ff0a7be5fddf001d4cc41c1 diff --git a/main.cpp b/main.cpp index cebeca37..1e4fe577 100644 --- a/main.cpp +++ b/main.cpp @@ -24,6 +24,12 @@ #include #include #include +#include + +#ifdef ENABLE_FLOW +#include +#include +#endif #include @@ -35,6 +41,8 @@ #include #include +#include "config.h" + #ifdef ENABLE_SIGNALS #include "signalhandler.hpp" #endif @@ -51,6 +59,7 @@ #include "pv/logging.hpp" #include "pv/mainwindow.hpp" #include "pv/session.hpp" +#include "pv/util.hpp" #ifdef ANDROID #include @@ -58,8 +67,6 @@ #include "android/loghandler.hpp" #endif -#include "config.h" - #ifdef _WIN32 #include Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) @@ -150,11 +157,11 @@ void usage() " -V, --version Show release version\n" " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n" " -d, --driver Specify the device driver to use\n" - " -D, --no-scan Don't auto-scan for devices, use -d spec only\n" + " -D, --dont-scan Don't auto-scan for devices, use -d spec only\n" " -i, --input-file Load input from file\n" + " -s, --settings Load PulseView session setup from file\n" " -I, --input-format Input format\n" " -c, --clean Don't restore previous sessions on startup\n" - " -s, --log-to-stdout Don't use logging, output to stdout instead\n" "\n", PV_BIN_NAME); } @@ -162,10 +169,19 @@ int main(int argc, char *argv[]) { int ret = 0; shared_ptr context; - string open_file, open_file_format, driver; + string open_file_format, open_setup_file, driver; + vector open_files; bool restore_sessions = true; bool do_scan = true; - bool do_logging = true; + bool show_version = false; + +#ifdef ENABLE_FLOW + // Initialise gstreamermm. Must be called before any other GLib stuff. + Gst::init(); + + // Initialize libsigrokflow. Must be called after Gst::init(). + Srf::init(); +#endif Application a(argc, argv); @@ -182,8 +198,9 @@ int main(int argc, char *argv[]) {"version", no_argument, nullptr, 'V'}, {"loglevel", required_argument, nullptr, 'l'}, {"driver", required_argument, nullptr, 'd'}, - {"no-scan", no_argument, nullptr, 'D'}, + {"dont-scan", no_argument, nullptr, 'D'}, {"input-file", required_argument, nullptr, 'i'}, + {"settings", required_argument, nullptr, 's'}, {"input-format", required_argument, nullptr, 'I'}, {"clean", no_argument, nullptr, 'c'}, {"log-to-stdout", no_argument, nullptr, 's'}, @@ -191,7 +208,7 @@ int main(int argc, char *argv[]) }; const int c = getopt_long(argc, argv, - "h?VDcsl:d:i:I:", long_options, nullptr); + "h?VDcl:d:i:s:I:", long_options, nullptr); if (c == -1) break; @@ -202,9 +219,8 @@ int main(int argc, char *argv[]) return 0; case 'V': - // Print version info - fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING); - return 0; + show_version = true; + break; case 'l': { @@ -236,7 +252,11 @@ int main(int argc, char *argv[]) break; case 'i': - open_file = optarg; + open_files.emplace_back(optarg); + break; + + case 's': + open_setup_file = optarg; break; case 'I': @@ -246,27 +266,24 @@ int main(int argc, char *argv[]) case 'c': restore_sessions = false; break; - - case 's': - do_logging = false; - break; } } + argc -= optind; + argv += optind; - if (argc - optind > 1) { - fprintf(stderr, "Only one file can be opened.\n"); - return 1; - } + for (int i = 0; i < argc; i++) + open_files.emplace_back(argv[i]); - if (argc - optind == 1) - open_file = argv[argc - 1]; + qRegisterMetaType("util::Timestamp"); + qRegisterMetaType("uint64_t"); // Prepare the global settings since logging needs them early on pv::GlobalSettings settings; + settings.save_internal_defaults(); settings.set_defaults_where_needed(); + settings.apply_theme(); - if (do_logging) - pv::logging.init(); + pv::logging.init(); // Initialise libsigrok context = sigrok::Context::create(); @@ -308,31 +325,38 @@ int main(int argc, char *argv[]) // Create the device manager, initialise the drivers pv::DeviceManager device_manager(context, driver, do_scan); - // Initialise the main window - pv::MainWindow w(device_manager); - w.show(); + a.collect_version_info(context); + if (show_version) { + a.print_version_info(); + } else { + // Initialise the main window + pv::MainWindow w(device_manager); + w.show(); - if (restore_sessions) - w.restore_sessions(); + if (restore_sessions) + w.restore_sessions(); - if (!open_file.empty()) - w.add_session_with_file(open_file, open_file_format); - else - w.add_default_session(); + if (open_files.empty()) + w.add_default_session(); + else + for (string& open_file : open_files) + w.add_session_with_file(open_file, open_file_format, + open_setup_file); #ifdef ENABLE_SIGNALS - if (SignalHandler::prepare_signals()) { - SignalHandler *const handler = new SignalHandler(&w); - QObject::connect(handler, SIGNAL(int_received()), - &w, SLOT(close())); - QObject::connect(handler, SIGNAL(term_received()), - &w, SLOT(close())); - } else - qWarning() << "Could not prepare signal handler."; + if (SignalHandler::prepare_signals()) { + SignalHandler *const handler = new SignalHandler(&w); + QObject::connect(handler, SIGNAL(int_received()), + &w, SLOT(close())); + QObject::connect(handler, SIGNAL(term_received()), + &w, SLOT(close())); + } else + qWarning() << "Could not prepare signal handler."; #endif - // Run the application - ret = a.exec(); + // Run the application + ret = a.exec(); + } #ifndef ENABLE_STACKTRACE } catch (exception& e) {