X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=8f495419fee7467de77c4074c32927ce658de919;hp=5c3e5b25818ffc70d1ac28a347e9b33cb91bda47;hb=b5940cf0ef30b3519389da8c8768aee4d4424415;hpb=dac1bb975265d33e7aeb0e3fc0342260613af9d1
diff --git a/main.cpp b/main.cpp
index 5c3e5b25..8f495419 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,123 +14,165 @@
* 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
+#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"
+#include "pv/session.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
+using std::exception;
+using std::shared_ptr;
+using std::string;
+
void usage()
{
fprintf(stdout,
"Usage:\n"
- " %s [OPTIONâ¦] [FILE] â %s\n"
+ " %s [OPTIONS] [FILE]\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", PV_BIN_NAME, PV_DESCRIPTION);
+ "\n"
+ "Application Options:\n"
+ " -V, --version Show release version\n"
+ " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n"
+ " -d, --driver Specify the device driver to use\n"
+ " -i, --input-file Load input from file\n"
+ " -I, --input-format Input format\n"
+ " -c, --clean Don't restore previous sessions on startup\n"
+ "\n", PV_BIN_NAME);
}
int main(int argc, char *argv[])
{
int ret = 0;
- struct sr_context *sr_ctx = NULL;
- const char *open_file = NULL;
+ shared_ptr context;
+ string open_file, open_file_format, driver;
+ bool restore_sessions = true;
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'},
+ {"driver", required_argument, nullptr, 'd'},
+ {"input-file", required_argument, nullptr, 'i'},
+ {"input-format", required_argument, nullptr, 'I'},
+ {"clean", no_argument, nullptr, 'c'},
+ {nullptr, 0, nullptr, 0}
};
const int c = getopt_long(argc, argv,
- "l:Vh?", long_options, NULL);
+ "l:Vhc?d: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);
- sr_log_loglevel_set(loglevel);
+ context->set_log_level(sigrok::LogLevel::get(loglevel));
#ifdef ENABLE_DECODE
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 'd':
+ driver = optarg;
+ break;
- case 'h':
- case '?':
- usage();
- return 0;
+ case 'i':
+ open_file = optarg;
+ break;
+
+ case 'I':
+ open_file_format = optarg;
+ break;
+
+ case 'c':
+ restore_sessions = false;
+ 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
- if (sr_init(&sr_ctx) != SR_OK) {
- qDebug() << "ERROR: libsigrok init failed.";
- return 1;
- }
+ context = sigrok::Context::create();
+ pv::Session::sr_context = context;
+#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,14 +183,22 @@ int main(int argc, char *argv[])
try {
// Create the device manager, initialise the drivers
- pv::DeviceManager device_manager(sr_ctx);
+ pv::DeviceManager device_manager(context, driver);
// Initialise the main window
- pv::MainWindow w(device_manager, open_file);
+ pv::MainWindow w(device_manager);
w.show();
+ if (restore_sessions)
+ w.restore_sessions();
+
+ if (!open_file.empty())
+ w.add_session_with_file(open_file, open_file_format);
+ else
+ w.add_default_session();
+
#ifdef ENABLE_SIGNALS
- if(SignalHandler::prepare_signals()) {
+ if (SignalHandler::prepare_signals()) {
SignalHandler *const handler =
new SignalHandler(&w);
QObject::connect(handler,
@@ -157,7 +207,7 @@ int main(int argc, char *argv[])
QObject::connect(handler,
SIGNAL(term_received()),
&w, SLOT(close()));
- } else {
+ } else {
qWarning() <<
"Could not prepare signal handler.";
}
@@ -166,7 +216,7 @@ int main(int argc, char *argv[])
// Run the application
ret = a.exec();
- } catch(std::exception e) {
+ } catch (exception e) {
qDebug() << e.what();
}
@@ -175,11 +225,7 @@ int main(int argc, char *argv[])
srd_exit();
#endif
- } while (0);
-
- // Destroy libsigrok
- if (sr_ctx)
- sr_exit(sr_ctx);
+ } while (false);
return ret;
}