* 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 <http://www.gnu.org/licenses/>.
*/
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
-#include <stdint.h>
+#include <cstdint>
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <getopt.h>
#include <QDebug>
+#include <QSettings>
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
#include "pv/application.hpp"
#include "pv/devicemanager.hpp"
#include "pv/mainwindow.hpp"
+#include "pv/session.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
#include "android/assetreader.hpp"
#include "config.h"
#ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
#include <QtPlugin>
-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…] — %s\n"
+ " %s [OPTIONS] [FILE]\n"
"\n"
"Help Options:\n"
" -h, -?, --help Show help option\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"
+ " -D, --no-scan Don't auto-scan for devices, use -d spec only\n"
" -i, --input-file Load input from file\n"
" -I, --input-format Input format\n"
- "\n", PV_BIN_NAME, PV_DESCRIPTION);
+ " -c, --clean Don't restore previous sessions on startup\n"
+ "\n", PV_BIN_NAME);
}
int main(int argc, char *argv[])
{
int ret = 0;
- std::shared_ptr<sigrok::Context> context;
- std::string open_file, open_file_format;
+ shared_ptr<sigrok::Context> context;
+ string open_file, open_file_format, driver;
+ bool restore_sessions = true;
+ bool do_scan = true;
Application a(argc, argv);
#endif
// Parse arguments
- while (1) {
+ while (true) {
static const struct option long_options[] = {
- {"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}
+ {"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?i:I:", long_options, nullptr);
+ "l:Vhc?d:Di:I:", long_options, nullptr);
if (c == -1)
break;
case 'l':
{
const int loglevel = atoi(optarg);
+ if (loglevel < 0 || loglevel > 5) {
+ qDebug() << "ERROR: invalid log level spec.";
+ break;
+ }
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 'd':
+ driver = optarg;
+ break;
+
+ case 'D':
+ do_scan = false;
+ break;
+
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) {
- open_file = argv[argc - 1];
}
+ if (argc - optind == 1)
+ open_file = argv[argc - 1];
+
// Initialise libsigrok
context = sigrok::Context::create();
+ pv::Session::sr_context = context;
+
#ifdef ANDROID
context->set_resource_reader(&asset_reader);
#endif
try {
// Create the device manager, initialise the drivers
- pv::DeviceManager device_manager(context);
+ pv::DeviceManager device_manager(context, driver, do_scan);
// Initialise the main window
- pv::MainWindow w(device_manager,
- open_file, open_file_format);
+ 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()) {
SignalHandler *const handler =
// Run the application
ret = a.exec();
- } catch(std::exception e) {
+ } catch (exception e) {
qDebug() << e.what();
}
srd_exit();
#endif
- } while (0);
+ } while (false);
return ret;
}