Updates to handle bug with matplotlib and versions of qt/pyqt.

conda_env.yml

@@ -11,6 +11,7 @@ dependencies:
 - matplotlib
 - numpy
 - psutil
+- pyqt=4.11.4
 - scipy
 
 - pip:

gprMax/optimisation_taguchi.py

@@ -441,10 +441,6 @@ def plot_optimisation_history(fitnessvalueshist, optparamshist, optparamsinit):
         optparamshist (dict): Name of parameters to optimise and history of their values
     """
 
-    import matplotlib
-    # Make sure QT5 is used if not on Mac OS X
-    if sys.platform != 'darwin':
-        matplotlib.use('Qt5Agg')
     import matplotlib.pyplot as plt
 
     # Plot history of fitness values

tests/benchmarking/plot_benchmark.py

@@ -3,10 +3,6 @@ import os
 import sys
 
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 

tests/test_compare_analytical.py

@@ -22,10 +22,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 

tests/test_compare_experimental.py

@@ -22,10 +22,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
 from gprMax.exceptions import CmdInputError

tests/test_compare_numerical.py

@@ -21,10 +21,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
 from tools.plot_fields import plot_Ascan

tools/plot_Ascan.py

@@ -22,10 +22,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 

tools/plot_Bscan.py

@@ -22,10 +22,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
 from gprMax.exceptions import CmdInputError

tools/plot_antenna_params.py

@@ -22,10 +22,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 

tools/plot_source_wave.py

@@ -21,10 +21,6 @@ import os
 import sys
 
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
 from gprMax.exceptions import CmdInputError

user_libs/antenna_patterns/initial_save.py

@@ -11,10 +11,6 @@ import sys
 
 import h5py
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
 from gprMax.constants import c, z0

user_libs/antenna_patterns/plot_fields.py

@@ -10,10 +10,6 @@ import os
 import sys
 
 import numpy as np
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
 from gprMax.constants import c, z0

user_libs/optimisation_taguchi/fitness_functions.py

@@ -9,10 +9,6 @@ import os
 import sys
 
 import h5py
-import matplotlib
-# Make sure QT5 is used if not on Mac OS X
-if sys.platform != 'darwin':
-    matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 import numpy as np
 from scipy import signal