Merge pull request #11 from din14970/dev

Merge dev into master for new version

.gitignore

@@ -9,6 +9,8 @@ Dummy
 garbage
 .ipynb*
 .venvtest
+.DS_STORE
+.DS_Store
 
 # Created by https://www.gitignore.io/api/python
 # Edit at https://www.gitignore.io/?templates=python
@@ -118,4 +120,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# vs code
+.vscode/
+
+
 # End of https://www.gitignore.io/api/python
+.vscode/settings.json

README.md

@@ -88,13 +88,20 @@ supply the scan information manually.
 ## Credits and notes
 
 **This tool is not an official product of the TVIPS company. Use at your own risk. 
-I am not responsbile for loss or corruption of data.** The tool derives from python scripts
+We are not responsbile for loss or corruption of data.** The tool derives from python scripts
 originally developed by the company. We have significantly modified these
 scripts mainly to make the conversion process possible on a computer with regular sized RAM and
 support loss-less export to hdf5. The GUI is also our addition.
 
 ## Changelog
 
+### 0.1.2
+* calculate and store direct beam positions in the HDF5 file
+* calculate mean and maximum images
+* added choice in how to bin the data
+* more options on export image depth
+* bugfixes
+
 ### 0.1.1
 * Added an option to crop the file along the scan directions
 * Added an option to limit the conversion between a set number of frames

setup.py

@@ -5,13 +5,13 @@
 
 setup(
     name="tvipsconverter",
-    version="0.1.1",
+    version="0.1.2",
     description=(
         "GUI converter for movie data from TVIPS cameras"
         "into other formats like .blo, .tiff and .hspy."
         "Mainly for orientation mapping (PED) or 4D STEM experiments."),
     url='https://github.com/din14970/TVIPSconverter',
-    author='Niels Cautaerts',
+    author='Niels Cautaerts, Paddy Harrison',
     author_email='[email protected]',
     license='GPL-3.0',
     long_description=readme,
@@ -37,5 +37,6 @@
         'Pillow',
         'PyQt5>=5.13.2',
         'h5py>=2.10.0',
+        'scikit-image>=0.17.2',
     ],
 )

tvipsconverter/__main__.py

@@ -0,0 +1,3 @@
+from .widgets import main
+
+main()