Merge branch 'release-0.1.7'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "minc-scripts-jscholz"]
+	path = minc-scripts-jscholz
+	url = https://github.com/jan-scholz/minc-scripts.git

NEWS

@@ -1,3 +1,8 @@
+New in Version 0.1.7
+====================
+* added vtk_meshconvert.py a program that can be used to convert between BIC obj, stl and vtk meshes
+* added bayes_intensity_update a program that updates an image based on prior knowledge coming from a population (and its stdev)
+
 New in Version 0.1.6
 ====================
 * fixes egg-info file issues. The minc-stuffs version information will be produced correctly now

README → README.md

@@ -3,6 +3,25 @@ minc-stuffs is repository that houses scripts and bits of code that are useful f
 This code is licensed under the 3-clause BSD License. 
 http://opensource.org/licenses/BSD-3-Clause
 
+Prerequisites:
+--------------
+In order to run vtk_meshconvert.py you need to have VTK installed. This can be done using (April 2015):
+<pre><code>
+sudo apt-get install libvtk5-dev python-vtk
+</pre></code>
+
+Installing from github:
+-----------------------
+<pre><code>
+git clone --recursive https://github.com/Mouse-Imaging-Centre/minc-stuffs.git
+</pre></code>
+or
+<pre><code>
+git clone https://github.com/Mouse-Imaging-Centre/minc-stuffs.git
+cd minc-stuffs
+git submodule update --init --recursive
+</pre></code>
+
 To build and install the perl and src code:
 ------------------------------------------
 ./autogen.sh

setup.py

@@ -13,7 +13,7 @@
     m.Extension.__dict__ = m._Extension.__dict__
 
 setup(name="python-stuffs",
-      version='0.1.6',
+      version='0.1.7',
       scripts=["python/TFCE",
                "python/smooth_vector",
                "python/measure_xcorr",
@@ -23,7 +23,8 @@
                "python/volumes_from_labels_only",
                "python/voxel_vote",
                "python/replace_label_with_nearest_valid_label",
-               "python/rotational_minctracc.py"],
+               "python/rotational_minctracc.py",
+               "minc-scripts-jscholz/vtk_meshconvert.py"],
       cmdclass = {'build_ext': build_ext},
       ext_modules = [Extension("cython_functions", ["python/cython_functions.pyx"], include_dirs=[numpy.get_include()])]
       )