Merge branch 'release-1.1.3'

Mouse-Imaging-Centre · Oct 20, 2014 · d861259 · d861259
2 parents 1973b8d + d8fa7b7
commit d861259
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
-New in Version 1.1.2
+New in Version 0.1.3
+====================
+* compute_values_across_segmentation, volumes_from_labels_only, and voxel_vote now accepts label files with up to 65536 labels (instead of 256)
+* voxel_vote now properly writes out label files (integer values)
+
+New in Version 0.1.2
 ====================
 * minc-stuffs can now be compiled against the minc-toolkit
diff --git a/python/compute_values_across_segmentation b/python/compute_values_across_segmentation
@@ -23,7 +23,7 @@ if __name__ == "__main__":
         parser.error("Incorrect number of arguments")
 
     inf = volumeFromFile(args[0], dtype="double")
-    atlas = volumeFromFile(args[1], dtype='ubyte')
+    atlas = volumeFromFile(args[1], dtype='ushort', labels=True)
     output = open(args[2], 'w')
 
     labels = unique(atlas.data)

diff --git a/python/volumes_from_labels_only b/python/volumes_from_labels_only
@@ -15,7 +15,7 @@ if __name__ == "__main__":
     if len(args) != 2:
         parser.error("Incorrect number of arguments")
 
-    atlas = volumeFromFile(args[0], dtype='ubyte')
+    atlas = volumeFromFile(args[0], dtype='ushort', labels=True)
     output = open(args[1], 'w')
 
     volumePerVoxel=atlas.separations[0]*atlas.separations[1]*atlas.separations[2]

diff --git a/python/voxel_vote b/python/voxel_vote
@@ -29,9 +29,9 @@ if __name__ == "__main__":
 
     nfiles = len(args)-1
     for i in range( nfiles ):
-        volhandles.append(volumeFromFile(args[i], dtype='ubyte'))
+        volhandles.append(volumeFromFile(args[i], dtype='ushort', labels=True))
 
-    outfile = volumeFromInstance(volhandles[0], outfilename)
+    outfile = volumeFromInstance(volhandles[0], outfilename, dtype='ushort', volumeType='ushort', labels=True)
 
     sliceArray = zeros( (nfiles,
                          volhandles[0].sizes[1],

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 
 setup(name="python-stuffs",
-      version='0.1.2',
+      version='0.1.3',
       scripts=["python/TFCE", 
 	       "python/smooth_vector", 
 	       "python/measure_xcorr",