Merge branch 'master' into filterOptions
This commit is contained in:
commit
d0b5626c91
@ -393,11 +393,11 @@ class Data(object):
|
|||||||
else:
|
else:
|
||||||
# prevent overwriting original pick information
|
# prevent overwriting original pick information
|
||||||
event_old = self.get_evt_data()
|
event_old = self.get_evt_data()
|
||||||
print(event_old.resource_id, event.resource_id)
|
|
||||||
if not event_old.resource_id == event.resource_id:
|
if not event_old.resource_id == event.resource_id:
|
||||||
print("WARNING: Missmatch in event resource id's: {} and {}".format(
|
print("WARNING: Missmatch in event resource id's: {} and {}".format(
|
||||||
event_old.resource_id,
|
event_old.resource_id,
|
||||||
event.resource_id))
|
event.resource_id))
|
||||||
|
else:
|
||||||
picks = copy.deepcopy(event_old.picks)
|
picks = copy.deepcopy(event_old.picks)
|
||||||
event = merge_picks(event, picks)
|
event = merge_picks(event, picks)
|
||||||
# apply event information from location
|
# apply event information from location
|
||||||
|
Loading…
Reference in New Issue
Block a user