[bugfix] various bugfixes while testing on Windows with py3
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
import os
|
||||
import glob
|
||||
import sys
|
||||
from obspy.io.xseed import Parser
|
||||
|
||||
import numpy as np
|
||||
|
||||
@@ -170,7 +169,7 @@ def read_metadata(path_to_inventory):
|
||||
invfile = list()
|
||||
respfile = list()
|
||||
# possible file extensions specified here:
|
||||
inv = dict(dless=dlfile, xml=invfile, resp=respfile, dseed=dlfile)
|
||||
inv = dict(dless=dlfile, xml=invfile, resp=respfile, dseed=dlfile[:])
|
||||
if os.path.isfile(path_to_inventory):
|
||||
ext = os.path.splitext(path_to_inventory)[1].split('.')[1]
|
||||
inv[ext] += [path_to_inventory]
|
||||
|
||||
@@ -19,6 +19,7 @@ class map_projection(QtGui.QWidget):
|
||||
'''
|
||||
QtGui.QWidget.__init__(self)
|
||||
self._parent = parent
|
||||
self.metadata = parent.metadata
|
||||
self.parser = parent.metadata[1]
|
||||
self.picks = None
|
||||
self.picks_dict = None
|
||||
|
||||
@@ -829,7 +829,7 @@ class PickDlg(QDialog):
|
||||
self.drawArrivals()
|
||||
except Exception as e:
|
||||
print('Warning: Could not init expected picks from taup: {}'.format(e))
|
||||
|
||||
|
||||
def setupUi(self):
|
||||
menuBar = QtGui.QMenuBar(self)
|
||||
if not self._embedded:
|
||||
@@ -952,7 +952,11 @@ class PickDlg(QDialog):
|
||||
station_id = self.data.traces[0].get_id()
|
||||
parser = self.parent().metadata[1]
|
||||
station_coords = parser.get_coordinates(station_id)
|
||||
source_origin = self.parent().get_current_event().origins[0]
|
||||
origins = self.parent().get_current_event().origins
|
||||
if origins:
|
||||
source_origin = origins[0]
|
||||
else:
|
||||
raise ValueError('No source origin given.')
|
||||
arrivals = self.model.get_travel_times_geo(source_origin.depth,
|
||||
source_origin.latitude,
|
||||
source_origin.longitude,
|
||||
@@ -2760,7 +2764,7 @@ class InputsTab(PropTab):
|
||||
|
||||
from pylot.core.util.structure import DATASTRUCTURE
|
||||
|
||||
self.structureSelect.addItems(DATASTRUCTURE.keys())
|
||||
self.structureSelect.addItems(list(DATASTRUCTURE.keys()))
|
||||
|
||||
dsind = findComboBoxIndex(self.structureSelect, curstructure)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user