Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Marcel Paffrath 2022-11-07 17:56:58 +01:00
commit 37b73d4393
2 changed files with 7 additions and 3 deletions

View File

@ -11,11 +11,12 @@ The following packages are required:
* Python 3
* obspy
* pyyaml
(the following are dependencies of the above):
* numpy
* matplotlib
* matplotlib
to use the GUI:
@ -26,16 +27,19 @@ to use the GUI:
Configurations of *datapath*, *networks*, *stations* etc. can be done in the **parameters.yaml** input file.
The main program is executed by entering
```shell script
python survBot.py
```
The GUI can be loaded via
```shell script
python survBotGui.py
```
## Staff
Original author: M.Paffrath (marcel.paffrath@rub.de)
November 2022
November 2022

View File

@ -25,7 +25,7 @@ except ImportError:
import matplotlib
from matplotlib.figure import Figure
if QtGui.__package__ in ['PySide2', 'PyQt5']:
if QtGui.__package__ in ['PySide2', 'PyQt5', 'PySide6']:
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT
else: