projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Change calling order and flag usage for sample count, too
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 8fac92340c1326b3aafd38a5d678b69a06b9046a..61ec03a840243be3dd11f4654d8c9f6fa76b6590 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-23,7
+23,7
@@
#endif
#include <stdint.h>
#endif
#include <stdint.h>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <getopt.h>
#include <getopt.h>
@@
-53,12
+53,16
@@
void usage()
{
fprintf(stdout,
"Usage:\n"
{
fprintf(stdout,
"Usage:\n"
- " %s [OPTION…]
[FILE]
— %s\n"
+ " %s [OPTION…] — %s\n"
"\n"
"Help Options:\n"
"\n"
"Help Options:\n"
- " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n"
- " -V, --version Show release version\n"
" -h, -?, --help Show help option\n"
" -h, -?, --help Show help option\n"
+ "\n"
+ "Application Options:\n"
+ " -V, --version Show release version\n"
+ " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n"
+ " -i, --input-file Load input from file\n"
+ " -I, --input-format Input format\n"
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
@@
-66,7
+70,7
@@
int main(int argc, char *argv[])
{
int ret = 0;
std::shared_ptr<sigrok::Context> context;
{
int ret = 0;
std::shared_ptr<sigrok::Context> context;
-
const char *open_file = NULL
;
+
std::string open_file, open_file_format
;
Application a(argc, argv);
Application a(argc, argv);
@@
-78,18
+82,30
@@
int main(int argc, char *argv[])
// Parse arguments
while (1) {
static const struct option long_options[] = {
// Parse arguments
while (1) {
static const struct option long_options[] = {
- {"loglevel", required_argument, 0, 'l'},
- {"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
{"help", no_argument, 0, 'h'},
+ {"version", no_argument, 0, 'V'},
+ {"loglevel", required_argument, 0, 'l'},
+ {"input-file", required_argument, 0, 'i'},
+ {"input-format", required_argument, 0, 'I'},
{0, 0, 0, 0}
};
const int c = getopt_long(argc, argv,
{0, 0, 0, 0}
};
const int c = getopt_long(argc, argv,
- "l:Vh?
", long_options, NULL
);
+ "l:Vh?
i:I:", long_options, nullptr
);
if (c == -1)
break;
switch (c) {
if (c == -1)
break;
switch (c) {
+ case 'h':
+ case '?':
+ usage();
+ return 0;
+
+ case 'V':
+ // Print version info
+ fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+ return 0;
+
case 'l':
{
const int loglevel = atoi(optarg);
case 'l':
{
const int loglevel = atoi(optarg);
@@
-102,23
+118,20
@@
int main(int argc, char *argv[])
break;
}
break;
}
- case 'V':
- // Print version info
- fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
- return 0;
+ case 'i':
+ open_file = optarg;
+ break;
- case 'h':
- case '?':
- usage();
- return 0;
+ case 'I':
+ open_file_format = optarg;
+ break;
}
}
}
}
- if (argc
- optind > 1
) {
- fprintf(stderr, "
Only one file can be openened.\n"
);
+ if (argc
!= optind
) {
+ fprintf(stderr, "
Unexpected argument: %s\n", argv[optind]
);
return 1;
return 1;
- } else if (argc - optind == 1)
- open_file = argv[argc - 1];
+ }
// Initialise libsigrok
context = sigrok::Context::create();
// Initialise libsigrok
context = sigrok::Context::create();
@@
-127,7
+140,7
@@
int main(int argc, char *argv[])
#ifdef ENABLE_DECODE
// Initialise libsigrokdecode
#ifdef ENABLE_DECODE
// Initialise libsigrokdecode
- if (srd_init(
NULL
) != SRD_OK) {
+ if (srd_init(
nullptr
) != SRD_OK) {
qDebug() << "ERROR: libsigrokdecode init failed.";
break;
}
qDebug() << "ERROR: libsigrokdecode init failed.";
break;
}
@@
-141,7
+154,8
@@
int main(int argc, char *argv[])
pv::DeviceManager device_manager(context);
// Initialise the main window
pv::DeviceManager device_manager(context);
// Initialise the main window
- pv::MainWindow w(device_manager, open_file);
+ pv::MainWindow w(device_manager,
+ open_file, open_file_format);
w.show();
#ifdef ENABLE_SIGNALS
w.show();
#ifdef ENABLE_SIGNALS
@@
-154,7
+168,7
@@
int main(int argc, char *argv[])
QObject::connect(handler,
SIGNAL(term_received()),
&w, SLOT(close()));
QObject::connect(handler,
SIGNAL(term_received()),
&w, SLOT(close()));
- } else {
+ } else {
qWarning() <<
"Could not prepare signal handler.";
}
qWarning() <<
"Could not prepare signal handler.";
}