Merge pull request #17 from Topp-Roots-Lab/development

Resolves #14

Author: tparkerd

.gitignore

@@ -25,6 +25,9 @@ wheels/
 *.egg
 MANIFEST
 
+# Keep NSI SDK
+!rawtools/lib
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

HISTORY.rst

@@ -2,6 +2,24 @@
 History
 =======
 
+0.2.0 (2021-01-04)
+------------------
+
+* Added efX-SDK library
+* Added module to export/convert `nsihdr` files to uint `raw` files using the efX-SDK (Windows only)
+* Tentatively implemented a GUI for the nsihdr2raw export tool
+* Tweaked logging path for log files generated relative to input data for `nsihdr2raw`
+
+0.1.4 (2020-10-27)
+------------------
+
+* Code clean up, remove unnecessary transposing of data, improved debug statements and logging
+
+0.1.3 (2020-10-26)
+------------------
+
+* Fixed font file missing when installing via pip
+
 0.1.2 (2020-09-25)
 ------------------
 
@@ -10,4 +28,4 @@ History
 0.1.0 (2020-06-19)
 ------------------
 
-* First release on PyPI.
+* Initial version

MANIFEST.in

@@ -6,6 +6,7 @@ include README.rst
 include rawtools/assets/OpenSans-Regular.ttf
 
 recursive-include tests *
+recursive-include rawtools/lib *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 

rawtools/assets/caution.ico

@@ -4,19 +4,12 @@
 from importlib.metadata import version
 from multiprocessing import cpu_count
 
-from rawtools import convert, generate, nsihdr, qualitycontrol, log, raw2img
+from rawtools import convert, generate, log, qualitycontrol, raw2img
 
 __version__ = version('rawtools')
 
 def main():
     """Console script for rawtools."""
-    parser = argparse.ArgumentParser()
-    parser.add_argument('_', nargs='*')
-    args = parser.parse_args()
-
-    print("Arguments: " + str(args._))
-    print("Replace this message by putting your code into "
-          "rawtools.cli.main")
     return 0
 
 def raw_convert():
@@ -69,19 +62,27 @@ def raw_generate():
     generate.main(args)
 
 def raw_nsihdr():
-    description = "This tool converts a NSI project from 32-bit float to 16-bit unsigned integer format, and it extracts the midslice and generates a side-view projection of the volume."
+    description = "This tool converts a NSI project from 32-bit float to 16-bit unsigned integer format."
 
     parser = argparse.ArgumentParser(description=description, formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     parser.add_argument("-V", "--version", action="version", version=f'%(prog)s {__version__}')
-    parser.add_argument("-v", "--verbose", action="store_true", help="Increase output verbosity")
+    parser.add_argument("-v", "--verbose", action="store_true", default=False, help="Increase output verbosity")
     parser.add_argument("-f", "--force", action="store_true", default=False, help="Force file creation. Overwrite any existing files.")
-    parser.add_argument('path', metavar='PATH', type=str, nargs='+', help='List of .nsihdr files')
+    parser.add_argument("--gui", action="store_true", default=False, help="(Experimental) Enable GUI")
+    parser.add_argument('path', metavar='PATH', type=str, nargs="+", help='List of .nsihdr files')
     args = parser.parse_args()
 
     args.module_name = 'nsihdr'
     log.configure(args)
 
-    rt.nsihdr.main(args)
+    # Use a GUI to select the source directory
+    if args.gui == True:
+        from rawtools.gui import nsihdr
+        nsihdr.App(args)
+    # Otherwise, assume CLI use
+    else:
+        from rawtools import nsihdr
+        nsihdr.main(args)
 
 def raw_qc():
     """Quality control tools"""

rawtools/assets/caution.png

@@ -19,7 +19,6 @@ def bitdepth(name):
 
     """
     name = str(name)
-    logging.warning(name)
     supported_types = {
         'uint8': 'UCHAR',
         'uint16': 'USHORT',