|
|
|
|
@ -33,6 +33,9 @@ VISA::VISA() :
@@ -33,6 +33,9 @@ VISA::VISA() :
|
|
|
|
|
viClose(nullptr), |
|
|
|
|
viPrintf(nullptr), |
|
|
|
|
viScanf(nullptr), |
|
|
|
|
viFindRsrc(nullptr), |
|
|
|
|
viFindNext(nullptr), |
|
|
|
|
visaLibrary(nullptr), |
|
|
|
|
m_available(false) |
|
|
|
|
{ |
|
|
|
|
#ifdef _MSC_VER |
|
|
|
|
@ -62,6 +65,14 @@ VISA::VISA() :
@@ -62,6 +65,14 @@ VISA::VISA() :
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
VISA::~VISA() |
|
|
|
|
{ |
|
|
|
|
if (visaLibrary && (m_defaultRM == 0)) { |
|
|
|
|
libraryClose(visaLibrary); |
|
|
|
|
visaLibrary = nullptr; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ViSession VISA::openDefault() |
|
|
|
|
{ |
|
|
|
|
if (isAvailable() && (m_defaultRM == 0)) |
|
|
|
|
@ -267,6 +278,11 @@ void *VISA::libraryFunc(void *library, const char *function)
@@ -267,6 +278,11 @@ void *VISA::libraryFunc(void *library, const char *function)
|
|
|
|
|
return GetProcAddress ((HMODULE)library, function); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void VISA::libraryClose(void *library) |
|
|
|
|
{ |
|
|
|
|
FreeLibrary((HMODULE)library); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
|
|
void *VISA::libraryOpen(const char *filename) |
|
|
|
|
@ -279,4 +295,9 @@ void *VISA::libraryFunc(void *library, const char *function)
@@ -279,4 +295,9 @@ void *VISA::libraryFunc(void *library, const char *function)
|
|
|
|
|
return dlsym (library, function); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void VISA::libraryClose(void *library) |
|
|
|
|
{ |
|
|
|
|
dlclose(library); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#endif |
|
|
|
|
|