fix stray import qt4/qt5 problems

python3-testing-appstore
Sebastian Heimann 6 years ago
parent 8e1f642dbb
commit d1c2fe74f3

@ -13,8 +13,7 @@ import logging
import copy
from optparse import OptionParser
from pyrocko import util, trace, gf, cake, io
from pyrocko.gui import util as gui_util
from pyrocko import util, trace, gf, cake, io, marker
pjoin = os.path.join
logger = logging.getLogger('pyrocko.apps.fomosto')
@ -500,7 +499,7 @@ def command_view(args):
for phasename in phasenames:
phase_tmin = store.t(phasename, args[:-1])
if phase_tmin:
m = gui_util.PhaseMarker(
m = marker.PhaseMarker(
[('',
sta_code,
loc_code,

@ -3,7 +3,6 @@
# The Pyrocko Developers, 21st Century
# ---|P------/S----------~Lg----------
from __future__ import absolute_import
from .snuffler import Snuffler # noqa
from pyrocko.util import parse_md
__doc__ = parse_md(__file__)

@ -10,15 +10,19 @@ import time
import numpy as num
import logging
from .marker import Marker, PhaseMarker, EventMarker # noqa
from .marker import MarkerParseError, MarkerOneNSLCRequired # noqa
from .marker import load_markers, save_markers # noqa
from pyrocko import plot
import matplotlib
if matplotlib.get_backend().find('Qt4') != -1: # noqa
matplotlib.use('Qt5Agg')
from PyQt5 import QtCore as qc
from PyQt5 import QtGui as qg
from PyQt5 import QtWidgets as qw
from .marker import Marker, PhaseMarker, EventMarker # noqa
from .marker import MarkerParseError, MarkerOneNSLCRequired # noqa
from .marker import load_markers, save_markers # noqa
from pyrocko import plot
if sys.version_info > (3,):
buffer = memoryview

Loading…
Cancel
Save