mirror of https://github.com/f4exb/sdrangel.git
VISA: Prevent crash if VISA library not available
This commit is contained in:
parent
ce5837a392
commit
3bd0776706
|
@ -52,7 +52,7 @@ VISA::VISA() :
|
||||||
viFindRsrc = (ViStatus (*) (ViSession vi, ViString expr, ViPFindList li, ViPUInt32 retCnt, ViChar desc[])) libraryFunc(visaLibrary, "viFindRsrc");
|
viFindRsrc = (ViStatus (*) (ViSession vi, ViString expr, ViPFindList li, ViPUInt32 retCnt, ViChar desc[])) libraryFunc(visaLibrary, "viFindRsrc");
|
||||||
viFindNext = (ViStatus (*) (ViSession vi, ViChar desc[])) libraryFunc(visaLibrary, "viFindNext");
|
viFindNext = (ViStatus (*) (ViSession vi, ViChar desc[])) libraryFunc(visaLibrary, "viFindNext");
|
||||||
|
|
||||||
if (viOpenDefaultRM && viOpen && viClose && viPrintf) {
|
if (viOpenDefaultRM && viOpen && viClose && viPrintf && viFindRsrc && viFindNext) {
|
||||||
m_available = true;
|
m_available = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -111,8 +111,11 @@ void VISA::close(ViSession session)
|
||||||
|
|
||||||
QStringList VISA::processCommands(ViSession session, const QString& commands, bool *error)
|
QStringList VISA::processCommands(ViSession session, const QString& commands, bool *error)
|
||||||
{
|
{
|
||||||
QStringList list = commands.split("\n");
|
|
||||||
QStringList results;
|
QStringList results;
|
||||||
|
|
||||||
|
if (isAvailable())
|
||||||
|
{
|
||||||
|
QStringList list = commands.split("\n");
|
||||||
ViStatus status;
|
ViStatus status;
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
|
@ -147,12 +150,20 @@ QStringList VISA::processCommands(ViSession session, const QString& commands, bo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else if (error)
|
||||||
|
{
|
||||||
|
*error = true;
|
||||||
|
}
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList VISA::findResources()
|
QStringList VISA::findResources()
|
||||||
{
|
{
|
||||||
QStringList resources;
|
QStringList resources;
|
||||||
|
|
||||||
|
if (isAvailable())
|
||||||
|
{
|
||||||
ViChar rsrc[VI_FIND_BUFLEN];
|
ViChar rsrc[VI_FIND_BUFLEN];
|
||||||
ViFindList list;
|
ViFindList list;
|
||||||
ViRsrc matches = rsrc;
|
ViRsrc matches = rsrc;
|
||||||
|
@ -170,10 +181,13 @@ QStringList VISA::findResources()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return resources;
|
return resources;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool VISA::identification(ViSession session, QString &manufacturer, QString &model, QString &serialNumber, QString &revision)
|
bool VISA::identification(ViSession session, QString &manufacturer, QString &model, QString &serialNumber, QString &revision)
|
||||||
|
{
|
||||||
|
if (isAvailable())
|
||||||
{
|
{
|
||||||
QStringList result = processCommands(session, "*IDN?");
|
QStringList result = processCommands(session, "*IDN?");
|
||||||
if ((result.size() == 1) && (!result[0].isEmpty()))
|
if ((result.size() == 1) && (!result[0].isEmpty()))
|
||||||
|
@ -200,6 +214,7 @@ bool VISA::identification(ViSession session, QString &manufacturer, QString &mod
|
||||||
<< "revision: " << revision;
|
<< "revision: " << revision;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -207,6 +222,9 @@ bool VISA::identification(ViSession session, QString &manufacturer, QString &mod
|
||||||
QList<VISA::Instrument> VISA::instruments(QRegularExpression *filter)
|
QList<VISA::Instrument> VISA::instruments(QRegularExpression *filter)
|
||||||
{
|
{
|
||||||
QList<VISA::Instrument> instruments;
|
QList<VISA::Instrument> instruments;
|
||||||
|
|
||||||
|
if (isAvailable())
|
||||||
|
{
|
||||||
QStringList resourceList = findResources();
|
QStringList resourceList = findResources();
|
||||||
|
|
||||||
for (auto const &resource : resourceList)
|
for (auto const &resource : resourceList)
|
||||||
|
@ -230,6 +248,7 @@ QList<VISA::Instrument> VISA::instruments(QRegularExpression *filter)
|
||||||
close(session);
|
close(session);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return instruments;
|
return instruments;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue