Merge pull request #47 from lassoan/master

Fix import errors
pnlbwh · Apr 27, 2022 · cc78514 · cc78514
2 parents e1e85b2 + 2040ca0
commit cc78514
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/SlicerDiffusionQC/GradQC.py b/SlicerDiffusionQC/GradQC.py
@@ -2,9 +2,6 @@
 import vtk, qt, ctk, slicer, mrml
 from slicer.ScriptedLoadableModule import *
 
-from gradqclib.slicerUserInteraction import slicerGUI
-from diffusionqclib.nhdr_write import nhdr_write
-
 #
 # GradQC
 #
@@ -286,7 +283,8 @@ def onSelectMask(self):
 
 
   def onSelectInput(self):
-
+    from diffusionqclib.nhdr_write import nhdr_write
+
     inPrefix= os.path.splitext(os.path.splitext(self.inputSelector.currentPath)[0])[0]
     file_name= self.inputSelector.currentPath 
     if '.nii' in self.inputSelector.currentPath:
@@ -390,6 +388,8 @@ def observeStatus(caller,_):
 
   def GUI(self):
 
+      from gradqclib.slicerUserInteraction import slicerGUI
+
       # If in autoMode, don't call the Slicer GUI below, negative logic used for self.autoMode
       if self.autoMode:  # self.autoMode = True when check box checked
 

diff --git a/diffusionqclib/diffusionqclib/dwi_attributes.py b/diffusionqclib/diffusionqclib/dwi_attributes.py
@@ -1,7 +1,7 @@
 # Return headers, mri data, axis index along which gradients are listed, axialViewAxis, b-value, gradient directions
 import nrrd
 import numpy as np
-from nhdr_write import nhdr_write
+from .nhdr_write import nhdr_write
 import os
 
 def dwi_attributes(file_name, inPrefix):

diff --git a/diffusionqclib/diffusionqclib/gradient_process.py b/diffusionqclib/diffusionqclib/gradient_process.py
@@ -11,8 +11,8 @@
     warnings.filterwarnings("ignore", category=FutureWarning)
     import nibabel as nib
 
-from dwi_attributes import dwi_attributes
-from saveResults import saveResults
+from .dwi_attributes import dwi_attributes
+from .saveResults import saveResults
 
 POINTS = 50 # For KDE estimation
 eps = 2.2204e-16  # For preventing log( ) to be -inf

diff --git a/diffusionqclib/diffusionqclib/nhdr_write.py b/diffusionqclib/diffusionqclib/nhdr_write.py
@@ -13,7 +13,7 @@
 # np.set_printoptions(precision= PRECISION, suppress= True, floatmode= 'maxprec')
 np.set_printoptions(precision= PRECISION, suppress= True)
 
-from bval_bvec_io import read_bvecs, read_bvals, bvec_scaling
+from .bval_bvec_io import read_bvecs, read_bvals, bvec_scaling
 
 def matrix_string(A):
     # A= np.array(A)

diff --git a/diffusionqclib/diffusionqclib/saveResults.py b/diffusionqclib/diffusionqclib/saveResults.py
@@ -7,15 +7,15 @@
     warnings.filterwarnings("ignore", category=FutureWarning)
     import nibabel as nib
 
-from bval_bvec_io import read_bvals, read_bvecs, write_bvals, write_bvecs
-from nhdr_write import nhdr_write
+from .bval_bvec_io import read_bvals, read_bvecs, write_bvals, write_bvecs
+from .nhdr_write import nhdr_write
 
 def saveDecisions(outPrefix, deletion, confidence, bvals):
 
     fqc = open(outPrefix+'_QC.csv', "w")
     fcon = open(outPrefix+'_confidence.csv', "w")
-    fqc.write('Gradient #, Pass 1\Fail 0, b value\n')
-    fcon.write('Gradient #, Sure 1\Unsure 0, b value\n')
+    fqc.write('Gradient #, Pass 1/Fail 0, b value\n')
+    fcon.write('Gradient #, Sure 1/Unsure 0, b value\n')
     for i in range(len(deletion)):
         fqc.write(str(i) + ',' + str(deletion[i]) + ','+ str(bvals[i])+'\n')
         fcon.write(str(i) + ',' + str(confidence[i]) + ','+ str(bvals[i])+'\n')