Bläddra i källkod

Trying for a working version in windows

Andrej Studen @ Win7 7 år sedan
förälder
incheckning
ee52526a02

+ 7 - 1
labkeySlicerPythonExtension/labkeySlicerPythonExtension.py

@@ -53,7 +53,13 @@ class labkeySlicerPythonExtensionWidget(ScriptedLoadableModuleWidget):
 
 
     connectionFormLayout.addRow("Server: ", self.serverURL)
     connectionFormLayout.addRow("Server: ", self.serverURL)
 
 
-    self.startDir=os.environ['HOME']+"/temp/crt"
+    try:
+      self.startDir=os.path.join(os.environ['HOME'],"temp/crt")
+    except:
+      fhome=os.environ['HOMEDRIVE']+os.environ['HOMEPATH']
+      self.startDir=os.path.join(fhome,"temp")
+      
+
     self.userCertButton=qt.QPushButton("Load")
     self.userCertButton=qt.QPushButton("Load")
     self.userCertButton.toolTip="Load user certificate (crt)"
     self.userCertButton.toolTip="Load user certificate (crt)"
     self.userCertButton.connect('clicked(bool)',self.onUserCertButtonClicked)
     self.userCertButton.connect('clicked(bool)',self.onUserCertButtonClicked)

+ 11 - 3
labkeySlicerPythonExtension/slicerNetwork.py

@@ -20,7 +20,13 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         slicer.vtkURIHandler.__init__(self)
         slicer.vtkURIHandler.__init__(self)
         self.className="labkeyURIHandler"
         self.className="labkeyURIHandler"
         slicer.mrmlScene.AddURIHandler(self)
         slicer.mrmlScene.AddURIHandler(self)
-        self.localCacheDirectory=os.path.join(os.environ["HOME"],"labkeyCache")
+        try:
+	   self.localCacheDirectory=os.path.join(
+	     os.environ["HOME"],"labkeyCache")
+	except:
+	   #in windows, the variable is called HOMEPATH
+	   fhome=os.environ['HOMEDRIVE']+os.environ['HOMEPATH']
+	   self.localCacheDirectory=os.path.join(fhome,"labkeyCache")
 
 
     def CanHandleURI(self,uri):
     def CanHandleURI(self,uri):
         print "labkeyURIHandler::CanHandleURI({0})".format(uri)
         print "labkeyURIHandler::CanHandleURI({0})".format(uri)
@@ -45,7 +51,9 @@ class labkeyURIHandler(slicer.vtkURIHandler):
 
 
     def GetLocalPath(self,source):
     def GetLocalPath(self,source):
         relativePath=re.sub('labkey://','',source)
         relativePath=re.sub('labkey://','',source)
-        relativePath=re.sub('/',os.sep,relativePath)
+	sp=os.sep.encode('string-escape')
+        print "Substituting / with {0} in {1}".format(sp,relativePath)
+	relativePath=re.sub('/',sp,relativePath)
         return os.path.join(self.localCacheDirectory,relativePath)
         return os.path.join(self.localCacheDirectory,relativePath)
 
 
     def GetFile(self,source):
     def GetFile(self,source):
@@ -65,7 +73,7 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         path=os.path.dirname(dest)
         path=os.path.dirname(dest)
         try:
         try:
             os.makedirs(path)
             os.makedirs(path)
-        except OSError:
+        except:
             if not os.path.isdir(path):
             if not os.path.isdir(path):
                 raise
                 raise
         local=open(dest,'w')
         local=open(dest,'w')