* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern "C" {
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <stdint.h>
#include <libsigrok/libsigrok.h>
-}
#include <getopt.h>
#include <QtGui/QApplication>
#include <QDebug>
+#include "signalhandler.h"
#include "pv/mainwindow.h"
#include "config.h"
void usage()
{
- fprintf(stderr,
+ fprintf(stdout,
"Usage:\n"
- " %s — %s\n"
+ " %s [OPTION…] [FILE] — %s\n"
"\n"
"Help Options:\n"
+ " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n"
" -V, --version Show release version\n"
" -h, -?, --help Show help option\n"
"\n", PV_BIN_NAME, PV_DESCRIPTION);
{
int ret = 0;
struct sr_context *sr_ctx = NULL;
+ const char *open_file = NULL;
QApplication a(argc, argv);
// Parse arguments
while (1) {
static const struct option long_options[] = {
- {"version", no_argument, 0, 'V'},
- {"help", no_argument, 0, 'h'},
+ {"loglevel", required_argument, 0, 'l'},
+ {"version", no_argument, 0, 'V'},
+ {"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
- const char c = getopt_long(argc, argv,
- "Vh?", long_options, NULL);
+ const int c = getopt_long(argc, argv,
+ "l:Vh?", long_options, NULL);
if (c == -1)
break;
switch (c) {
+ case 'l':
+ {
+ const int loglevel = atoi(optarg);
+ sr_log_loglevel_set(loglevel);
+ srd_log_loglevel_set(loglevel);
+ break;
+ }
+
case 'V':
// Print version info
- fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+ fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
return 0;
case 'h':
}
}
+ if (argc - optind > 1) {
+ fprintf(stderr, "Only one file can be openened.\n");
+ return 1;
+ } else if (argc - optind == 1)
+ open_file = argv[argc - 1];
+
// Initialise libsigrok
if (sr_init(&sr_ctx) != SR_OK) {
qDebug() << "ERROR: libsigrok init failed.";
// Initialize all libsigrok drivers
sr_dev_driver **const drivers = sr_driver_list();
for (sr_dev_driver **driver = drivers; *driver; driver++) {
- if (sr_driver_init(*driver) != SR_OK) {
+ if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
qDebug("Failed to initialize driver %s",
(*driver)->name);
ret = 1;
}
}
- if(ret == 0) {
+ if (ret == 0) {
// Initialise the main window
- pv::MainWindow w;
+ pv::MainWindow w(open_file);
w.show();
+ 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.";
+ }
+
// Run the application
ret = a.exec();
}