Changes for 1.3.0

CHANGELOG.md

@@ -1,5 +1,11 @@
 # History of changes
 
+## Version 1.3.0 (9/8/21)
+* Reformatted with black and isort.
+* Flipped x axis to display radiological coordinates.
+* Harmonized Dockerfile and automated container building methods with rapidtide.
+* Fixed some formatting in documentation (thank you DMD!)
+
 ## Version 1.2.3 (4/6/20)
 * Major documentation improvements.
 * Finally fixed picachooser.readthedocs.org.

picachooser/LightboxItem.py

@@ -26,13 +26,14 @@
 A widget for displaying 3 and 4 dimensional data in a lightbox
 """
 
-from __future__ import print_function, division
+from __future__ import division, print_function
 
-from pyqtgraph.Qt import QtGui, QtCore
-import pyqtgraph as pg
-import numpy as np
 import os
+
+import numpy as np
+import pyqtgraph as pg
 from nibabel.affines import apply_affine
+from pyqtgraph.Qt import QtCore, QtGui
 
 try:
     from PIL import Image
@@ -42,9 +43,9 @@
     PILexists = False
 
 
+import picachooser.colormaps as cm
 import picachooser.io as io
 import picachooser.stats as stats
-import picachooser.colormaps as cm
 
 
 def newColorbar(view, left, top, impixpervoxx, impixpervoxy, imgsize):

picachooser/fit.py

@@ -19,13 +19,13 @@
 # $Date: 2016/07/12 13:50:29 $
 # $Id: tide_funcs.py,v 1.4 2016/07/12 13:50:29 frederic Exp $
 #
-from __future__ import print_function, division
+from __future__ import division, print_function
+
+import warnings
 
 import numpy as np
 import scipy as sp
 import scipy.special as sps
-import warnings
-
 from scipy.signal import hilbert
 
 # ---------------------------------------- Global constants -------------------------------------------

picachooser/scripts/PICAchooser

@@ -26,21 +26,21 @@
 A simple GUI for rating timecoursese by whatever metric you want
 """
 
-from __future__ import print_function, division
+from __future__ import division, print_function
 
-from pyqtgraph.Qt import QtGui, QtCore
+import argparse
+import os
+import sys
 
-import pyqtgraph as pg
 import numpy as np
-
-import sys
-import os
-import argparse
+import pyqtgraph as pg
+from pyqtgraph.Qt import QtCore, QtGui
 from scipy import fftpack
 from scipy.stats import pearsonr
-import picachooser.LightboxItem as lb
-import picachooser.io as io
+
 import picachooser.colormaps as cm
+import picachooser.io as io
+import picachooser.LightboxItem as lb
 
 hammingwindows = {}
 

picachooser/scripts/PICAchooser_dispatcher

@@ -21,11 +21,11 @@
 #       $Id: resamp1tc,v 1.12 2016/07/11 14:50:43 frederic Exp $
 #
 
-from __future__ import print_function, division
+from __future__ import division, print_function
 
-import sys
 import os
 import subprocess
+import sys
 
 
 def main():

picachooser/scripts/grader

@@ -26,21 +26,20 @@
 A simple GUI for rating timecoursese by whatever metric you want
 """
 
-from __future__ import print_function, division
+from __future__ import division, print_function
 
-from pyqtgraph.Qt import QtGui, QtCore
-
-import pyqtgraph as pg
-import numpy as np
+import argparse
 import glob
-
-import sys
 import os
-import argparse
+import sys
+
+import numpy as np
 import pandas as pd
+import pyqtgraph as pg
+from pyqtgraph.Qt import QtCore, QtGui
 from scipy import fftpack
-import picachooser.LightboxItem as lb
 
+import picachooser.LightboxItem as lb
 
 hammingwindows = {}
 

picachooser/scripts/melodicomp

@@ -26,19 +26,19 @@
 A simple GUI for rating timecoursese by whatever metric you want
 """
 
-from __future__ import print_function, division
+from __future__ import division, print_function
 
-from pyqtgraph.Qt import QtGui, QtCore
+import argparse
+import os
+import sys
 
 import numpy as np
-
-import sys
-import os
-import argparse
+from pyqtgraph.Qt import QtCore, QtGui
 from scipy.stats import pearsonr
-import picachooser.LightboxItem as lb
-import picachooser.io as io
+
 import picachooser.colormaps as cm
+import picachooser.io as io
+import picachooser.LightboxItem as lb
 
 # fix for Big Sur on macOS
 os.environ["QT_MAC_WANTS_LAYER"] = "1"

picachooser/stats.py

@@ -19,16 +19,14 @@
 # $Date: 2016/07/12 13:50:29 $
 # $Id: tide_funcs.py,v 1.4 2016/07/12 13:50:29 frederic Exp $
 #
-from __future__ import print_function, division
+from __future__ import division, print_function
 
 import numpy as np
 import scipy as sp
-
-
 from scipy.stats import johnsonsb, kurtosis, kurtosistest
 
-import picachooser.io as io
 import picachooser.fit as fit
+import picachooser.io as io
 
 # ---------------------------------------- Global constants -------------------------------------------
 defaultbutterorder = 6
@@ -650,8 +648,6 @@ def makemask(image, threshpct=25.0, verbose=False, nozero=False):
     threshval = pct2 + (threshpct / 100.0) * (pct98 - pct2)
     if verbose:
         print(
-            "fracval:",
-            fracval,
             " threshpct:",
             threshpct,
             " mask threshhold:",