projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItemPaintParams: Added missing include
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 43c8cb8e965c1c22bb947d3be71d7d3bf39d2613..daec62d2af09055409677d90885bc9faac5ce4af 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-18,139
+18,181
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include <signal.h>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#endif
+
#include <stdint.h>
#include <stdint.h>
-#include <libsigrok
/libsigrok.h
>
+#include <libsigrok
cxx/libsigrokcxx.hpp
>
#include <getopt.h>
#include <getopt.h>
-#include <QtGui/QApplication>
#include <QDebug>
#include <QDebug>
-#include "pv/mainwindow.h"
+#ifdef ENABLE_SIGNALS
+#include "signalhandler.hpp"
+#endif
+
+#include "pv/application.hpp"
+#include "pv/devicemanager.hpp"
+#include "pv/mainwindow.hpp"
+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/assetreader.hpp"
+#include "android/loghandler.hpp"
+#endif
#include "config.h"
#include "config.h"
-// Global pointer to our QApplication
-QApplication *g_app = NULL;
+#ifdef _WIN32
+// The static qsvg lib is required for SVG graphics/icons (on Windows).
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
void usage()
{
fprintf(stdout,
"Usage:\n"
void usage()
{
fprintf(stdout,
"Usage:\n"
- " %s [OPTION…]
[FILE]
— %s\n"
+ " %s [OPTION…] — %s\n"
"\n"
"Help Options:\n"
"\n"
"Help Options:\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);
}
-/*
- * SIGINT handler (likely received Ctrl-C from terminal)
- */
-void sigint_handler(int param)
-{
- (void)param;
-
- qDebug("Received SIGINT.");
-
- if (g_app)
- g_app->quit();
-}
-
int main(int argc, char *argv[])
{
int ret = 0;
int main(int argc, char *argv[])
{
int ret = 0;
- st
ruct sr_context *sr_ctx = NULL
;
-
const char *open_file = NULL
;
+ st
d::shared_ptr<sigrok::Context> context
;
+
std::string open_file, open_file_format
;
- // Register a SIGINT handler
- signal(SIGINT, sigint_handler);
+ Application a(argc, argv);
- QApplication a(argc, argv);
- // Now we have an application to populate our global pointer
- g_app = &a;
-
- // Set some application metadata
- QApplication::setApplicationVersion(PV_VERSION_STRING);
- QApplication::setApplicationName("PulseView");
- QApplication::setOrganizationDomain("http://www.sigrok.org");
+#ifdef ANDROID
+ srau_init_environment();
+ pv::AndroidLogHandler::install_callbacks();
+ pv::AndroidAssetReader asset_reader;
+#endif
// Parse arguments
while (1) {
static const struct option long_options[] = {
// Parse arguments
while (1) {
static const struct option long_options[] = {
- {"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}
};
{0, 0, 0, 0}
};
- const
char
c = getopt_long(argc, argv,
- "
Vh?", long_options, NULL
);
+ const
int
c = getopt_long(argc, argv,
+ "
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 'V':
// Print version info
fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
return 0;
- case 'h':
- case '?':
- usage();
- return 0;
+ case 'l':
+ {
+ const int loglevel = atoi(optarg);
+ context->set_log_level(sigrok::LogLevel::get(loglevel));
+
+#ifdef ENABLE_DECODE
+ srd_log_loglevel_set(loglevel);
+#endif
+
+ break;
+ }
+
+ case 'i':
+ open_file = optarg;
+ break;
+
+ case 'I':
+ open_file_format = optarg;
+ break;
}
}
if (argc - optind > 1) {
fprintf(stderr, "Only one file can be openened.\n");
return 1;
}
}
if (argc - optind > 1) {
fprintf(stderr, "Only one file can be openened.\n");
return 1;
- } else if (argc - optind == 1)
+ } else if (argc - optind == 1)
{
open_file = argv[argc - 1];
open_file = argv[argc - 1];
-
- // Initialise libsigrok
- if (sr_init(&sr_ctx) != SR_OK) {
- qDebug() << "ERROR: libsigrok init failed.";
- return 1;
}
}
- // Initialise libsigrokdecode
- if (srd_init(NULL) == SRD_OK) {
+ // Initialise libsigrok
+ context = sigrok::Context::create();
+#ifdef ANDROID
+ context->set_resource_reader(&asset_reader);
+#endif
+ do {
+
+#ifdef ENABLE_DECODE
+ // Initialise libsigrokdecode
+ if (srd_init(nullptr) != SRD_OK) {
+ qDebug() << "ERROR: libsigrokdecode init failed.";
+ break;
+ }
// Load the protocol decoders
srd_decoder_load_all();
// Load the protocol decoders
srd_decoder_load_all();
+#endif
- // Initialize all libsigrok drivers
- sr_dev_driver **const drivers = sr_driver_list();
- for (sr_dev_driver **driver = drivers; *driver; driver++) {
- if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
- qDebug("Failed to initialize driver %s",
- (*driver)->name);
- ret = 1;
- break;
- }
- }
+ try {
+ // Create the device manager, initialise the drivers
+ pv::DeviceManager device_manager(context);
- if (ret == 0) {
// Initialise the main window
// Initialise the main window
- pv::MainWindow w(open_file);
+ pv::MainWindow w(device_manager,
+ open_file, open_file_format);
w.show();
w.show();
+#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.";
+ }
+#endif
+
// Run the application
ret = a.exec();
// Run the application
ret = a.exec();
+
+ } catch(std::exception e) {
+ qDebug() << e.what();
}
}
- // Destroy libsigrokdecode and libsigrok
+#ifdef ENABLE_DECODE
+ // Destroy libsigrokdecode
srd_exit();
srd_exit();
+#endif
- } else {
- qDebug() << "ERROR: libsigrokdecode init failed.";
- }
-
- if (sr_ctx)
- sr_exit(sr_ctx);
+ } while (0);
return ret;
}
return ret;
}