merge origin develop into develop
This commit is contained in:
		
						commit
						dc656e5c57
					
				| @ -962,6 +962,7 @@ class MainWindow(QMainWindow): | ||||
|         if event.autopicks: | ||||
|             self.autopicks = event.autopicks | ||||
|             self.drawPicks(picktype='auto') | ||||
|             self.compare_action.setEnabled(True) | ||||
|         self.draw() | ||||
| 
 | ||||
|     def clearWaveformDataPlot(self): | ||||
|  | ||||
| @ -130,7 +130,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None, stealth_mode=False): | ||||
|     if iplot: | ||||
|         return EPick, LPick, PickError, fig | ||||
|     else: | ||||
|         return Epick, LPick, PickError | ||||
|         return EPick, LPick, PickError | ||||
| 
 | ||||
| 
 | ||||
| def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None): | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user