Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
This commit is contained in:
		
						commit
						17f94228ab
					
				| @ -1478,6 +1478,7 @@ class MainWindow(QMainWindow): | ||||
|             self.locateEvent.setEnabled(True) | ||||
|         if event.pylot_autopicks: | ||||
|             self.drawPicks(picktype='auto') | ||||
|         if event.pylot_picks and event.pylot_autopicks: | ||||
|             self.compare_action.setEnabled(True) | ||||
|         self.draw() | ||||
| 
 | ||||
|  | ||||
| @ -226,12 +226,10 @@ class Data(object): | ||||
| 
 | ||||
|         # try exporting event via ObsPy | ||||
|         else: | ||||
|             print(self.get_evt_data()) | ||||
|             evtdata_org = self.get_evt_data() | ||||
|             eventpath = evtdata_org.path | ||||
|             picks = evtdata_org.picks | ||||
|             picks_copy = copy.deepcopy(picks) | ||||
|             evtdata_copy = Event(eventpath) | ||||
|             evtdata_copy = Event(fnout) | ||||
|             evtdata_copy.picks = picks_copy | ||||
| 
 | ||||
|             # check for stations picked automatically as well as manually | ||||
|  | ||||
| @ -252,11 +252,7 @@ class PDFDictionary(object): | ||||
| 
 | ||||
|     @classmethod | ||||
|     def from_quakeml(self, fn): | ||||
|         cat = read_events(fn) | ||||
|         if len(cat) > 1: | ||||
|             raise NotImplementedError('reading more than one event at the same ' | ||||
|                                       'time is not implemented yet! Sorry!') | ||||
|         return PDFDictionary(picksdict_from_picks(cat[0])) # MP MP TODO: change function argument (auto/manu) | ||||
|         return PDFDictionary(fn) # LK TODO: check if stations are available with both automatic and manual picks | ||||
| 
 | ||||
|     def get_all(self, phase): | ||||
|         rlist = list() | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user