X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=main.cpp;h=0881c184a913d3c704abffca86e50485166e2da9;hb=e3ac35531f1e76a31669e821e14dbeb95a5cba63;hp=c0ac04b475d49b9ac2330856ceded776ab34e292;hpb=e8d009288de28cb194bc7964f96677c2baf900c9;p=pulseview.git
diff --git a/main.cpp b/main.cpp
index c0ac04b..0881c18 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifdef ENABLE_DECODE
@@ -23,42 +22,47 @@
#endif
#include
-#include
+#include
#include
#include
#ifdef ENABLE_SIGNALS
-#include "signalhandler.h"
+#include "signalhandler.hpp"
#endif
-#include "pv/application.h"
-#include "pv/devicemanager.h"
-#include "pv/mainwindow.h"
+#include "pv/application.hpp"
+#include "pv/devicemanager.hpp"
+#include "pv/mainwindow.hpp"
#ifdef ANDROID
#include
-#include "android/loghandler.h"
+#include "android/assetreader.hpp"
+#include "android/loghandler.hpp"
#endif
#include "config.h"
#ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
#include
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
#endif
void usage()
{
fprintf(stdout,
"Usage:\n"
- " %s [OPTIONâ¦] [FILE] â %s\n"
+ " %s [OPTIONâ¦] â %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"
+ "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);
}
@@ -66,30 +70,43 @@ int main(int argc, char *argv[])
{
int ret = 0;
std::shared_ptr 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();
+ pv::AndroidAssetReader asset_reader;
#endif
// 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'},
- {0, 0, 0, 0}
+ {"help", no_argument, nullptr, 'h'},
+ {"version", no_argument, nullptr, 'V'},
+ {"loglevel", required_argument, nullptr, 'l'},
+ {"input-file", required_argument, nullptr, 'i'},
+ {"input-format", required_argument, nullptr, 'I'},
+ {nullptr, 0, nullptr, 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) {
+ 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);
@@ -102,32 +119,33 @@ int main(int argc, char *argv[])
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");
+ fprintf(stderr, "Only one file can be opened.\n");
return 1;
- } else if (argc - optind == 1)
+ } else if (argc - optind == 1) {
open_file = argv[argc - 1];
+ }
// Initialise libsigrok
context = sigrok::Context::create();
-
+#ifdef ANDROID
+ context->set_resource_reader(&asset_reader);
+#endif
do {
#ifdef ENABLE_DECODE
// Initialise libsigrokdecode
- if (srd_init(NULL) != SRD_OK) {
+ if (srd_init(nullptr) != SRD_OK) {
qDebug() << "ERROR: libsigrokdecode init failed.";
break;
}
@@ -141,11 +159,12 @@ int main(int argc, char *argv[])
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
- if(SignalHandler::prepare_signals()) {
+ if (SignalHandler::prepare_signals()) {
SignalHandler *const handler =
new SignalHandler(&w);
QObject::connect(handler,
@@ -154,7 +173,7 @@ int main(int argc, char *argv[])
QObject::connect(handler,
SIGNAL(term_received()),
&w, SLOT(close()));
- } else {
+ } else {
qWarning() <<
"Could not prepare signal handler.";
}
@@ -163,7 +182,7 @@ int main(int argc, char *argv[])
// Run the application
ret = a.exec();
- } catch(std::exception e) {
+ } catch (std::exception e) {
qDebug() << e.what();
}