SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

able to specify the protocol's data display format, for bin/ocx/hex/dec/ascii..

Browse Source
This commit is contained in:
dreamsourcelabTAI
2021-10-15 17:26:50 +08:00
parent ea11b48470
commit a80151e3c0
27 changed files with 1126 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DSView/pv/mainwindow.cpp
View File

@@ -90,6 +90,7 @@
#include <glib.h>
#include <list>
#include <libusb.h>
#include "../ui/msgbox.h"
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
@@ -938,12 +939,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
const sr_dev_inst *const sdi = _session.get_device()->dev_inst();
if ((!file_dev && strcmp(sdi->driver->name, sessionObj["Device"].toString().toUtf8()) != 0) ||
sdi->mode != sessionObj["DeviceMode"].toDouble()) {
dialogs::DSMessageBox msg(this);
msg.mBox()->setText(tr("Session Error"));
msg.mBox()->setInformativeText(tr("Session File is not compatible with current device or mode!"));
msg.mBox()->setStandardButtons(QMessageBox::Ok);
msg.mBox()->setIcon(QMessageBox::Warning);
msg.exec();
MsgBox::Show(NULL, "Session File is not compatible with current device or mode!", this);
return false;
}
@@ -1128,12 +1124,6 @@ bool MainWindow::store_session(QString name)
{
QFile sessionFile(name);
if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
// dialogs::DSMessageBox msg(this);
// msg.mBox()->setText(tr("File Error"));
// msg.mBox()->setInformativeText(tr("Couldn't open session file to write!"));
// msg.mBox()->setStandardButtons(QMessageBox::Ok);
// msg.mBox()->setIcon(QMessageBox::Warning);
// msg.exec();
qDebug("Warning: Couldn't open session file to write!");
return false;
}