projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Merge save_selection_to_file() back into export_file()
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 089deee756db87024ef5fe698a8be7335726debc..daec62d2af09055409677d90885bc9faac5ce4af 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-38,6
+38,7
@@
#include "pv/mainwindow.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
#include "pv/mainwindow.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/assetreader.hpp"
#include "android/loghandler.hpp"
#endif
#include "android/loghandler.hpp"
#endif
@@
-53,7
+54,7
@@
void usage()
{
fprintf(stdout,
"Usage:\n"
{
fprintf(stdout,
"Usage:\n"
- " %s [OPTION…]
[FILE]
— %s\n"
+ " %s [OPTION…] — %s\n"
"\n"
"Help Options:\n"
" -h, -?, --help Show help option\n"
"\n"
"Help Options:\n"
" -h, -?, --help Show help option\n"
@@
-61,6
+62,8
@@
void usage()
"Application Options:\n"
" -V, --version Show release version\n"
" -l, --loglevel Set libsigrok/libsigrokdecode loglevel\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);
}
@@
-68,13
+71,14
@@
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);
#ifdef ANDROID
srau_init_environment();
pv::AndroidLogHandler::install_callbacks();
Application a(argc, argv);
#ifdef ANDROID
srau_init_environment();
pv::AndroidLogHandler::install_callbacks();
+ pv::AndroidAssetReader asset_reader;
#endif
// Parse arguments
#endif
// Parse arguments
@@
-83,11
+87,13
@@
int main(int argc, char *argv[])
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"loglevel", required_argument, 0, 'l'},
{"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;
if (c == -1)
break;
@@
-113,23
+119,34
@@
int main(int argc, char *argv[])
break;
}
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
context = sigrok::Context::create();
// Initialise libsigrok
context = sigrok::Context::create();
-
+#ifdef ANDROID
+ context->set_resource_reader(&asset_reader);
+#endif
do {
#ifdef ENABLE_DECODE
// Initialise libsigrokdecode
do {
#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;
}
@@
-143,11
+160,12
@@
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
- if(SignalHandler::prepare_signals()) {
+ if
(SignalHandler::prepare_signals()) {
SignalHandler *const handler =
new SignalHandler(&w);
QObject::connect(handler,
SignalHandler *const handler =
new SignalHandler(&w);
QObject::connect(handler,