Baxpr pdf - remove convert dependency (#498)

* getpage

* remove convert dependency

* fix variable name

* Fix ordering of vars, and also fix Xnatupload

Author: baxpr

bin/Xnat_tools/Xnatupload

@@ -322,8 +322,8 @@ def generate_previews(ra_dict):
     """
     _format = ' Warning: generate_previews -- %s -- %s'
     cmd_o = 'gs -q -o "%s" -sDEVICE=pngalpha -dLastPage=1 "%s"'
-    cmd_p = 'convert "%s" -resize x200 "%s"'
-
+    #cmd_p = 'convert "%s" -resize x200 "%s"'
+    cmd_p = 'gs -q -o "%s" -sDEVICE=pngalpha -dLastPage=1 -dDEVICEHEIGHTPOINTS=200 -dDEVICEWIDTHPOINTS=200 -dFitPage "%s"'
     for label, resource_dict in list(ra_dict.items()):
         if 'PDF' in list(resource_dict.keys()):
             pdf_path = check_pdf_path(resource_dict['PDF'], label)
@@ -346,7 +346,7 @@ def generate_previews(ra_dict):
                     snapshot_preview = os.path.join(tmp_path, SNAPSHOT_P)
 
                     # Make the snapshot_thumbnail
-                    os.system(cmd_p % (snapshot_original, snapshot_preview))
+                    os.system(cmd_p % (snapshot_preview, snapshot_original))
 
                 if not os.path.exists(snapshot_original) or \
                    not os.path.exists(snapshot_preview):

dax/dax_tools_utils.py

@@ -61,7 +61,8 @@
 
 # Cmd:
 GS_CMD = """gs -q -o {original} -sDEVICE=pngalpha -dLastPage=1 {pdf_path}"""
-CONVERT_CMD = """convert {original} -resize x200 {preview}"""
+#CONVERT_CMD = """convert {original} -resize x200 {preview}"""
+CONVERT_CMD = """gs -q -o {preview} -sDEVICE=pngalpha -dLastPage=1 -dDEVICEHEIGHTPOINTS=200 -dDEVICEWIDTHPOINTS=200 -dFitPage {original}"""
 GS_CMD2 = """gs -q -o {original} -sDEVICE=pngalpha {pdf_path}"""
 
 # WARNING content for emails