X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=main.cpp;h=d0ca64a2483a85fb7cdac23c5a7170c1c3f02d34;hb=3592f4053b1b9d96869ccfb88a09a1d493ee253f;hp=cfaba777d2f26add33a344da7aacf17facc8931d;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git
diff --git a/main.cpp b/main.cpp
index cfaba77..d0ca64a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,20 +14,20 @@
* 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
#include /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
-#include
+#include
#include
#include
#include
+#include
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
@@ -38,58 +38,80 @@
#include "pv/mainwindow.hpp"
#ifdef ANDROID
#include
+#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
+using std::exception;
+using std::shared_ptr;
+using std::string;
+
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);
}
int main(int argc, char *argv[])
{
int ret = 0;
- std::shared_ptr context;
- const char *open_file = NULL;
+ shared_ptr context;
+ 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) {
+ while (true) {
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);
@@ -99,35 +121,42 @@ int main(int argc, char *argv[])
srd_log_loglevel_set(loglevel);
#endif
+ if (loglevel >= 5) {
+ const QSettings settings;
+ qDebug() << "Settings:" << settings.fileName()
+ << "format" << settings.format();
+ }
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)
+ }
+
+ 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 +170,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,
@@ -163,7 +193,7 @@ int main(int argc, char *argv[])
// Run the application
ret = a.exec();
- } catch(std::exception e) {
+ } catch (exception e) {
qDebug() << e.what();
}
@@ -172,7 +202,7 @@ int main(int argc, char *argv[])
srd_exit();
#endif
- } while (0);
+ } while (false);
return ret;
}