Updates

ericspod · Mar 5, 2018 · ba58fa2 · ba58fa2
1 parent ac783d3
commit ba58fa2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git a/EidolonLibs b/EidolonLibs
diff --git a/src/plugins/CardiacMotionPlugin.py b/src/plugins/CardiacMotionPlugin.py
@@ -2159,21 +2159,21 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def testTestVolume(self):
-        et=ElemType.Tet1NL
-        sizes=(1.0,2.0,3.0)
-
-        nodes=listSum(eidolon.divideHextoTet(1))
-        inds=list(eidolon.group(range(len(nodes)),et.numNodes()))
-
-        regionfield=eidolon.listToMatrix([1]*len(inds),'regionfield')
-        dsinds=('inds',ElemType._Tet1NL,inds)
-
-        dds=[]
-        for size in sizes:
-            snodes=[vec3(*n)*vec3(size,0,0) for n in nodes] # scale nodes
-            dds.append(eidolon.PyDataSet('TestDS',snodes,dsinds))
-
-        vols=calculateLinTetVolume(dds,regionfield,[1])
+#    def testTestVolume(self):
+#        et=ElemType.Tet1NL
+#        sizes=(1.0,2.0,3.0)
+#        
+#        nodes=listSum(eidolon.divideHextoTet(1))
+#        inds=list(eidolon.group(range(len(nodes)),et.numNodes()))
+#        
+#        regionfield=eidolon.listToMatrix([1]*len(inds),'regionfield')
+#        dsinds=('inds',ElemType._Tet1NL,inds)
+#        
+#        dds=[]
+#        for size in sizes:
+#            snodes=[vec3(*n)*vec3(size,0,0) for n in nodes] # scale nodes
+#            dds.append(eidolon.PyDataSet('TestDS',snodes,dsinds))
+#            
+#        vols=calculateLinTetVolume(dds,regionfield,[1])
 
 
diff --git a/src/plugins/DicomPlugin.py b/src/plugins/DicomPlugin.py
@@ -48,8 +48,7 @@
 )
 import eidolon
 
-#eidolon.addLibraryFile('pydicom-1.0.0a1-py3-none-any.whl')
-eidolon.addLibraryFile('pydicom-1.0.0a1-py2.7') # PyDicom: https://github.com/darcymason/pydicom
+eidolon.addLibraryFile('pydicom-1.1.0.dev0') # PyDicom: https://github.com/darcymason/pydicom
 
 from pydicom.dicomio import read_file
 from pydicom.datadict import DicomDictionary

diff --git a/src/plugins/NiftiPlugin.py b/src/plugins/NiftiPlugin.py
@@ -20,7 +20,7 @@
 from eidolon import vec3, rotator, taskroutine, splitPathExt, halfpi, Future,ImageScenePlugin, ImageSceneObject, ImageSceneObjectRepr
 import eidolon
 
-eidolon.addLibraryFile('nibabel-1.4.0dev-py2.7') # http://nipy.org/nibabel/index.html
+eidolon.addLibraryFile('nibabel-2.3.0.dev0') # http://nipy.org/nibabel/index.html
 
 import nibabel
 from nibabel.nifti1 import unit_codes, xform_codes,data_type_codes

diff --git a/src/plugins/PlotPlugin.py b/src/plugins/PlotPlugin.py
@@ -47,7 +47,7 @@
 
 from ui import Ui_RegionGraphWidget
 
-eidolon.addLibraryFile('pyqtgraph-0.10.0+g0321ecb-py2-none-any')
+eidolon.addLibraryFile('pyqtgraph-0.10.0')
 
 import pyqtgraph as pg
 import numpy as np
+ −		python/nibabel-2.3.0.dev0.whl
+ −		python/pydicom-1.1.0.dev0.whl
+ −		python/pyqtgraph-0.10.0.whl