Pārlūkot izejas kodu

Merge branch 'master' of wiscigt.powertheword.com:andrej.studen/labkeySlicerPythonAPI

Andrej Studen @ Win7 6 gadi atpakaļ
vecāks
revīzija
3c41153b50
1 mainītis faili ar 10 papildinājumiem un 0 dzēšanām
  1. 10 0
      labkeySlicerPythonExtension/slicerNetwork.py

+ 10 - 0
labkeySlicerPythonExtension/slicerNetwork.py

@@ -136,6 +136,15 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         #make sure we are at the begining of the file
 
 	    #check file size
+<<<<<<< HEAD
+	    remote.seek(0,2)
+	    sz=remote.tell()
+	    print "Remote size: {0}".format(sz)
+
+	    remote.seek(0)
+        shutil.copyfileobj(remote,local)
+	    print "Local size: {0}".format(local.tell())
+=======
         if debug:
 	         remote.seek(0,2)
 	         sz=remote.tell()
@@ -145,6 +154,7 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         shutil.copyfileobj(remote,local)
         if debug:
 	         print("Local size: {0}").format(local.tell())
+>>>>>>> 7212758e9e58c9afa6f1d2a0b25eaef3d0a6ad64
         local.close()
 
     def StageFileWrite(self,source,dest):