Updates to getData and segmentation

pythonScripts/getData.py

@@ -150,9 +150,9 @@ def getLocalPath(r,setup,name):
    code=config.getCode(r,setup)
    return os.path.join(tempDir,code,name)
 
-def getURL(r,setup,name):
-   remoteDir=fb.buildPathURL(project,config.getPathList(r,setup))
-   return '/'.join(remoteDir,name)
+def getURL(fb,r,setup,name):
+   remoteDir=fb.buildPathURL(setup['project'],config.getPathList(r,setup))
+   return '/'.join([remoteDir,name])
  
 def getPatientNIM(fb,r,setup):
     fileName=config.getNodeName(r,setup,'NM',19)+'.nrrd'

pythonScripts/segmentation.py

@@ -136,6 +136,7 @@ def updateSegmentation(db,setup,r,pixels):
     
 def getSegmentationFileName(r,setup):
    fileName='{}_Segmentation.txt'.format(config.getCode(r,setup))
+   return fileName
 
 def writeSegmentation(db,fb,r,setup):
     fileName=getSegmentationFileName(r,setup)
@@ -150,7 +151,7 @@ def writeSegmentation(db,fb,r,setup):
         v[region,0]=float(qr['z'])
     #for i in range(len(rows)):
     #    print(v[i,:])
-    numpy.savetxt(getData.getLocalPath(fileName))
+    numpy.savetxt(getData.getLocalPath(r,setup,fileName),v)
     getData.copyToServer(fb,r,setup,[fileName])
 
 def getNC(r,xsetup):
@@ -162,9 +163,9 @@ def getNC(r,xsetup):
    
 def loadSegmentation(db,fb,r,setup):
    sName=getSegmentationFileName(r,setup)
-   fName=getData.getLocalPath(sName)
+   fName=getData.getLocalPath(r,setup,sName)
    if not os.path.isfile(fName):
-      fURL=getData.getURL(fName)
+      fURL=getData.getURL(fb,r,setup,fName)
       if fb.entryExists(fURL):
          copyFromServer(fb,r,setup,sName)
       else: