projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented device probing
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 54a69fd75550eb3485861bd471d27f6e2d6497a7..43c8cb8e965c1c22bb947d3be71d7d3bf39d2613 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-18,12
+18,10
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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 <signal.h>
#include <stdint.h>
#include <libsigrok/libsigrok.h>
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <signal.h>
#include <stdint.h>
#include <libsigrok/libsigrok.h>
-}
#include <getopt.h>
#include <getopt.h>
@@
-36,11
+34,12
@@
extern "C" {
// Global pointer to our QApplication
QApplication *g_app = NULL;
// Global pointer to our QApplication
QApplication *g_app = NULL;
+
void usage()
{
void usage()
{
- fprintf(std
err
,
+ fprintf(std
out
,
"Usage:\n"
"Usage:\n"
- " %s — %s\n"
+ " %s
[OPTION…] [FILE]
— %s\n"
"\n"
"Help Options:\n"
" -V, --version Show release version\n"
"\n"
"Help Options:\n"
" -V, --version Show release version\n"
@@
-49,13
+48,13
@@
void usage()
}
/*
}
/*
- * SIGINT handler (likely rec
ie
ved Ctrl-C from terminal)
+ * SIGINT handler (likely rec
ei
ved Ctrl-C from terminal)
*/
*/
-void sigint(int param)
+void sigint
_handler
(int param)
{
{
- (void)
param;
+ (void)param;
- qDebug("
pv: Recieved SIGINT
");
+ qDebug("
Received SIGINT.
");
if (g_app)
g_app->quit();
if (g_app)
g_app->quit();
@@
-65,9
+64,10
@@
int main(int argc, char *argv[])
{
int ret = 0;
struct sr_context *sr_ctx = NULL;
{
int ret = 0;
struct sr_context *sr_ctx = NULL;
+ const char *open_file = NULL;
// Register a SIGINT handler
// Register a SIGINT handler
- signal
(SIGINT, sigint
);
+ signal
(SIGINT, sigint_handler
);
QApplication a(argc, argv);
// Now we have an application to populate our global pointer
QApplication a(argc, argv);
// Now we have an application to populate our global pointer
@@
-94,7
+94,7
@@
int main(int argc, char *argv[])
switch (c) {
case 'V':
// Print version info
switch (c) {
case 'V':
// Print version info
- fprintf(std
err
, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+ fprintf(std
out
, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
return 0;
case 'h':
return 0;
case 'h':
@@
-104,6
+104,12
@@
int main(int argc, char *argv[])
}
}
}
}
+ 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.";
// Initialise libsigrok
if (sr_init(&sr_ctx) != SR_OK) {
qDebug() << "ERROR: libsigrok init failed.";
@@
-129,7
+135,7
@@
int main(int argc, char *argv[])
if (ret == 0) {
// Initialise the main window
if (ret == 0) {
// Initialise the main window
- pv::MainWindow w;
+ pv::MainWindow w
(open_file)
;
w.show();
// Run the application
w.show();
// Run the application