|
@@ -9,6 +9,8 @@ import nixModule
|
|
|
import pathlib
|
|
|
import chardet
|
|
|
import re
|
|
|
+#should be dealt with in nixModule
|
|
|
+import nixWrapper
|
|
|
#
|
|
|
# labkeySlicerPythonExtension
|
|
|
#
|
|
@@ -431,14 +433,6 @@ class imageBrowserWidget(ScriptedLoadableModuleWidget):
|
|
|
pass
|
|
|
|
|
|
|
|
|
-def loadLibrary(name):
|
|
|
- #utility function to load nix library from git
|
|
|
- fwrapper=nixModule.getWrapper('nixWrapper.py')
|
|
|
- p=pathlib.Path(fwrapper)
|
|
|
- sys.path.append(str(p.parent))
|
|
|
- import nixWrapper
|
|
|
- return nixWrapper.loadLibrary(name)
|
|
|
-
|
|
|
|
|
|
#
|
|
|
# imageBrowserLogic
|
|
@@ -474,7 +468,7 @@ class imageBrowserLogic(ScriptedLoadableModuleLogic):
|
|
|
self.setup['paths']={}
|
|
|
|
|
|
lName='labkeyInterface'
|
|
|
- loadLibrary(lName)
|
|
|
+ nixWrapper.loadLibrary(lName)
|
|
|
|
|
|
import labkeyInterface
|
|
|
import labkeyDatabaseBrowser
|