Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							01fe32c9b2
							
						
					 | 
					
						
						
							
							[Bugfix] Reversed change of a former commit supposed to make it compatible to Python3.
						
						
						
						
						
						
					 | 
					
						2017-07-14 11:05:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a560f4140b
							
						
					 | 
					
						
						
							
							[update] icons will be imported depending on python version
						
						
						
						
						
						
					 | 
					
						2017-07-14 09:51:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Wehling-Benatelli
							
						 
					 | 
					
						
						
						
						
							
						
						
							e46f9066d9
							
						
					 | 
					
						
						
							
							[change] increased inter platform compatibility
						
						
						
						
						
						
					 | 
					
						2017-07-13 17:40:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f57aa37d99
							
						
					 | 
					
						
						
							
							[change] changed some functions to work with Python 3 and Windows
						
						
						
						
						
						
					 | 
					
						2017-07-13 17:27:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac25f9cacb
							
						
					 | 
					
						
						
							
							[bugfix] set locflag = 2 if traces could not be corrected
						
						
						
						
						
						
					 | 
					
						2017-07-13 11:23:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							154f802f27
							
						
					 | 
					
						
						
							
							[bugfix] removed useless prompt
						
						
						
						
						
						
					 | 
					
						2017-07-12 16:56:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							721874dbb7
							
						
					 | 
					
						
						
							
							[change] layout of sub-parameters of PylotParameter changed back to vertical alignment to save horizontal space in tuneautopick window
						
						
						
						
						
						
					 | 
					
						2017-07-12 16:49:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aa6f4324d0
							
						
					 | 
					
						
						
							
							Merge branch 'filterOptions' into develop
						
						
						
						
						
						
					 | 
					
						2017-07-12 16:33:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							818fb7a296
							
						
					 | 
					
						
						
							
							[change] final adjustments made to filteroptionsdialog and parabox, ready for testing
						
						
						
						
						
						
					 | 
					
						2017-07-12 16:24:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b67481ffa
							
						
					 | 
					
						
						
							
							Removed unwanted screen output.
						
						
						
						
						
						
					 | 
					
						2017-07-12 15:27:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							76a99005ec
							
						
					 | 
					
						
						
							
							[Change] Save picks in cnv-, xml, and obs-format simultaneously. cnv not working!
						
						
						
						
						
						
					 | 
					
						2017-07-12 15:24:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							351d473cbf
							
						
					 | 
					
						
						
							
							[Bugfix] Wrong format of nested if conditions.
						
						
						
						
						
						
					 | 
					
						2017-07-12 13:05:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							da372b435c
							
						
					 | 
					
						
						
							
							[Bugfix] Wrong processing flow for checking picks.
						
						
						
						
						
						
					 | 
					
						2017-07-12 12:09:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee32ee95e
							
						
					 | 
					
						
						
							
							[Bugfix] Save only real determined onsets.
						
						
						
						
						
						
					 | 
					
						2017-07-12 10:45:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a0cb9f6c8
							
						
					 | 
					
						
						
							
							Additional screen output to inform the user about pick saving details.
						
						
						
						
						
						
					 | 
					
						2017-07-12 09:58:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e2861fe24
							
						
					 | 
					
						
						
							
							Cosmetics.
						
						
						
						
						
						
					 | 
					
						2017-07-12 08:59:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							34d5f9bf7d
							
						
					 | 
					
						
						
							
							Additional screen output when saving picks.
						
						
						
						
						
						
					 | 
					
						2017-07-11 20:43:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							49092a928e
							
						
					 | 
					
						
						
							
							Save only picks for NLLoc, VELEST, etc. that not exceed adjusted uncertainties.
						
						
						
						
						
						
					 | 
					
						2017-07-11 16:23:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43116ec2c6
							
						
					 | 
					
						
						
							
							[add] filtering in pickDlg will not be done by default anymore, changes in pushing filter in main traces window, still WIP (not going back to original wf after first filtering?)
						
						
						
						
						
						
					 | 
					
						2017-07-11 16:22:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d9e52f577
							
						
					 | 
					
						
						
							
							[change] several updates updates to filterOptions, FILTERDEFAULTS now loaded from pylot.in, filterOptions should be 'shared' between filterOptionsDialog and pylotParameter
						
						
						
						
						
						
					 | 
					
						2017-07-11 16:03:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e3a4a2861d
							
						
					 | 
					
						
						
							
							[bugfix/test] idea to fix problem with different ressource_id's on autoPyLoT
						
						
						
						
						
						
					 | 
					
						2017-07-10 17:37:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0e566f9748
							
						
					 | 
					
						
						
							
							[add] latest pylot.in file added to inputs!
						
						
						
						
						
						
					 | 
					
						2017-07-10 15:49:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e0926c6b20
							
						
					 | 
					
						
						
							
							[change] phase/expected phase arrivals text position now stays readable around pickDlg axes
						
						
						
						
						
						
					 | 
					
						2017-07-10 15:39:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d966b87eba
							
						
					 | 
					
						
						
							
							Merge branch 'taup' into develop
						
						
						
						
						
						
					 | 
					
						2017-07-10 11:32:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bd4da2cc84
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
					 | 
					
						2017-07-10 11:31:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8dcff4a467
							
						
					 | 
					
						
						
							
							Merge branch 'master' into taup
						
						
						
						
						
						
					 | 
					
						2017-07-10 11:30:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d0b5626c91
							
						
					 | 
					
						
						
							
							Merge branch 'master' into filterOptions
						
						
						
						
						
						
					 | 
					
						2017-07-10 11:29:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fedb7c2c0d
							
						
					 | 
					
						
						
							
							[hotfix refs #220] Missmatching ressource_id's only produced warning on exporting picks, but did not prevent event mixing
						
						
						
						
						
						
					 | 
					
						2017-07-07 13:15:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a9334372e8
							
						
					 | 
					
						
						
							
							[add] working version of expected arrivals of chosen phases
						
						
						
						
						
						
					 | 
					
						2017-07-07 12:16:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							138aeebf2c
							
						
					 | 
					
						
						
							
							[bugfix] metadata not loaded from default value (TO DO: still not loading automatically from project file)
						
						
						
						
						
						
					 | 
					
						2017-07-07 11:43:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7e54275c3
							
						
					 | 
					
						
						
							
							[change] structural changes to filteroptions WIP
						
						
						
						
						
						
					 | 
					
						2017-07-06 17:22:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							09b2dfa5d1
							
						
					 | 
					
						
						
							
							[hotfix] could not load multiple parameters from pylot.in if values are type==string
						
						
						
						
						
						
					 | 
					
						2017-07-06 09:53:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dbc38385b5
							
						
					 | 
					
						
						
							
							[add] semi working version of filterOption dialog, WIP
						
						
						
						
						
						
					 | 
					
						2017-07-04 16:37:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							097222a43d
							
						
					 | 
					
						
						
							
							[add] namestrings for default parameters, filteroptions connected to parameters (WIP)
						
						
						
						
						
						
						
						[change] layout of pylotparabox 
						
						
					 | 
					
						2017-07-04 14:39:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b3c29c47e
							
						
					 | 
					
						
						
							
							[bugfix] missing comma in dictionary definition, also corrected misspelling
						
						
						
						
						
						
					 | 
					
						2017-07-04 10:31:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5bc9f14074
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into filterOptions
						
						
						
						
						
						
					 | 
					
						2017-07-04 10:19:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							532a90a61f
							
						
					 | 
					
						
						
							
							[Bugfix, not fixed completly] Locating event possible now out of GUI, class export obsolete? updateEvent still buggy!
						
						
						
						
						
						
					 | 
					
						2017-06-30 17:20:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							74393432da
							
						
					 | 
					
						
						
							
							[bugfix] do not show file menu when embedded, stretch changed (still problems on ludgers machine)
						
						
						
						
						
						
					 | 
					
						2017-06-30 15:06:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e12bb1bc6
							
						
					 | 
					
						
						
							
							[bugfix] when no settings are given for phases use empty list
						
						
						
						
						
						
					 | 
					
						2017-06-30 14:43:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c610d22f0
							
						
					 | 
					
						
						
							
							[add] restore default options for some tabs
						
						
						
						
						
						
					 | 
					
						2017-06-30 14:29:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							beed46229a
							
						
					 | 
					
						
						
							
							[add] plot phase name in pickDlg, also plot network code
						
						
						
						
						
						
					 | 
					
						2017-06-30 13:56:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							533f7ea353
							
						
					 | 
					
						
						
							
							merge origin/develop into develop
						
						
						
						
						
						
					 | 
					
						2017-06-30 13:31:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c0db3efa4
							
						
					 | 
					
						
						
							
							[add] different phases can now be selected in picks_menu on pickDlg depending on phases set in preferences
						
						
						
						
						
						
					 | 
					
						2017-06-30 13:26:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							13666312fa
							
						
					 | 
					
						
						
							
							[Bugfix] Enable locate button as soon as manual picks are available.
						
						
						
						
						
						
					 | 
					
						2017-06-30 11:04:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							92f4ae3923
							
						
					 | 
					
						
						
							
							[Bugfix] One argument for export was missing.
						
						
						
						
						
						
					 | 
					
						2017-06-30 10:41:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a61eebba29
							
						
					 | 
					
						
						
							
							[proposal] use checkable QPushButtons for phases instead of QLineEdit, as line edit is highly vulnerable to incorrect user input
						
						
						
						
						
						
					 | 
					
						2017-06-30 09:42:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ludger Küperkoch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b22d0f8d6
							
						
					 | 
					
						
						
							
							Started activating PhasesTab for phase declaration.
						
						
						
						
						
						
					 | 
					
						2017-06-29 17:20:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3931f13fbe
							
						
					 | 
					
						
						
							
							Merge branch 'develop'
						
						
						
						
						
						
					 | 
					
						2017-06-29 17:05:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e6b376c62
							
						
					 | 
					
						
						
							
							[bugfix] reintroduced previous bugfix
						
						
						
						
						
						
					 | 
					
						2017-06-29 17:02:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								marcel
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fc83459e2
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
						
						
						
						
						
						
					 | 
					
						2017-06-29 16:50:00 +02:00 | 
					
					
						
						
							
							
							
						
					 |