c7aeb1959b 
							
						 
					 
					
						
						
							
							implement picking window and station selection (tests pending due to not working station selection so far)  
						
						 
						
						
						
						
					 
					
						2015-03-09 11:21:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							54916fa421 
							
						 
					 
					
						
						
							
							Merge branch 'filter-handling' into develop  
						
						 
						
						... 
						
						
						
						Conflicts:
	pylot/core/util/widgets.py 
						
						
					 
					
						2015-03-06 09:14:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							78b41f3d57 
							
						 
					 
					
						
						
							
							initialization of a picking window (work doubled due to system crash before commit)  
						
						 
						
						
						
						
					 
					
						2015-03-06 09:05:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							e321ad26b2 
							
						 
					 
					
						
						
							
							make creating new event work  
						
						 
						
						
						
						
					 
					
						2015-03-06 09:03:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							a86a2efb8a 
							
						 
					 
					
						
						
							
							debugging in progress (filter waveform not working)  
						
						 
						
						
						
						
					 
					
						2015-03-05 14:52:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							567ae16f1d 
							
						 
					 
					
						
						
							
							bugfix: FilterOptionsDialog should only provide logic options  
						
						 
						
						
						
						
					 
					
						2015-03-04 15:42:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2d823272 
							
						 
					 
					
						
						
							
							user interface setup for picking dialog added  
						
						 
						
						
						
						
					 
					
						2015-03-04 11:54:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							0dbcca1c6f 
							
						 
					 
					
						
						
							
							moved function createAction to the widgets module (reused in additional widget)  
						
						 
						
						... 
						
						
						
						bugfix: on Linux systems os.getlogin raises an exception (reimplementation: getLogin) 
						
						
					 
					
						2015-03-04 11:52:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b23c9d1104 
							
						 
					 
					
						
						
							
							initialized new widget and window for picking (work in progress)  
						
						 
						
						
						
						
					 
					
						2015-03-01 19:59:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							addb8ae815 
							
						 
					 
					
						
						
							
							try to make filtering work  
						
						 
						
						
						
						
					 
					
						2015-03-01 19:59:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5496b2deaa 
							
						 
					 
					
						
						
							
							bugfix: use get and set methods instead of directly changes values of attributes  
						
						 
						
						
						
						
					 
					
						2015-02-20 08:28:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							757a6d784b 
							
						 
					 
					
						
						
							
							better use call to the classes method then returning a value  
						
						 
						
						
						
						
					 
					
						2015-02-18 15:35:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cdb8af56b3 
							
						 
					 
					
						
						
							
							bugfix: avoid empty parts of the data display  
						
						 
						
						
						
						
					 
					
						2015-02-18 15:35:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							abbe9cb2c4 
							
						 
					 
					
						
						
							
							bugfix: missed to call get method before trying to fetch an item  
						
						 
						
						
						
						
					 
					
						2015-02-18 15:34:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d15441900e 
							
						 
					 
					
						
						
							
							bugfixes in order to make the GUI work  
						
						 
						
						
						
						
					 
					
						2015-02-17 13:17:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							759697add8 
							
						 
					 
					
						
						
							
							problem with the creation of a valid resource identifier fixed (still problematic, see  #145 )  
						
						 
						
						
						
						
					 
					
						2015-02-13 11:36:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							903e87e1e1 
							
						 
					 
					
						
						
							
							usage of DATASTRUCTURE modified  
						
						 
						
						
						
						
					 
					
						2015-02-13 11:13:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bec1ee1716 
							
						 
					 
					
						
						
							
							new function added: createAmplitude - routine for convenient ~obspy.core.event.Amplitude object creation  
						
						 
						
						
						
						
					 
					
						2015-02-11 08:19:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d5c9ad41be 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop  
						
						 
						
						... 
						
						
						
						Conflicts:
	pylot/core/util/utils.py 
						
						
					 
					
						2015-02-10 13:17:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							46a20a10e6 
							
						 
					 
					
						
						
							
							new functions added for event creation purposes:  
						
						 
						
						... 
						
						
						
						getHash - returns a hash string from an UTCDateTime object
	createResourceID - returns a valid PyLoT resourceID for arbitrary types of event data
	createOrigin - returns an ObsPy Origin object (work in progress)
	createEvent - returns an ObsPy Event object (work in progress)
	createPick - returns an ObsPy Pick object (work in progress)
	createArrival - returns an ObsPy Arrival object (work in progress)
	createMagnitude - returns an ObsPy Magnitude object (work in progress)
	createAmplitude - returns an ObsPy Amplitude object (work in progress)
testing should be carried out as a next step 
						
						
					 
					
						2015-02-10 13:12:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c88ba18d2f 
							
						 
					 
					
						
						
							
							new functions added for event creation purposes:  
						
						 
						
						... 
						
						
						
						getHash - returns a hash string from an UTCDateTime object
	createResourceID - returns a valid PyLoT resourceID for arbitrary types of event data
	createOrigin - returns an ObsPy Origin object (work in progress)
	createEvent - returns an ObsPy Event object (work in progress)
	createPick - returns an ObsPy Pick object (work in progress)
	createArrival - returns an ObsPy Arrival object (work in progress) 
						
						
					 
					
						2015-02-09 13:24:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f6bf37c920 
							
						 
					 
					
						
						
							
							new package io.py which should contain all import and export routines written by ourselves, such as reading old PILOT phase and location information file; implementation of the readPILOTevent function; new routines in utils: createArrival will be split into two functions: createPick and createArrival; also planned: createOrigin, createAmplitude and createMagnitude as well as giving createEvent functionality  
						
						 
						
						
						
						
					 
					
						2015-02-07 09:12:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							401c09d0b4 
							
						 
					 
					
						
						
							
							added new methods to the MPLWidget class to control the axes labels  
						
						 
						
						
						
						
					 
					
						2015-02-04 14:49:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d22a224804 
							
						 
					 
					
						
						
							
							data plotting; waveform filtering and convenience imports in order to get a overview window displaying data; new data structure available -> PyLoT should be able to read PILOT data  
						
						 
						
						
						
						
					 
					
						2015-01-26 21:11:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dbd53024b2 
							
						 
					 
					
						
						
							
							new module: make selection of either data structure easier  
						
						 
						
						
						
						
					 
					
						2015-01-26 21:08:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							64158174e6 
							
						 
					 
					
						
						
							
							currently working on the plotting of waveforms; changes made to meet pre-requisites to data plotting  
						
						 
						
						
						
						
					 
					
						2015-01-22 16:41:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							538c2e2dff 
							
						 
					 
					
						
						
							
							Merge branch 'add-save'  
						
						 
						
						
						
						
					 
					
						2015-01-20 14:04:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							45fb1935ef 
							
						 
					 
					
						
						
							
							added FormatError to convenience imports of package util  
						
						 
						
						
						
						
					 
					
						2015-01-20 14:02:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							540891f3d7 
							
						 
					 
					
						
						
							
							preferences panel works for me; settings saved properly  
						
						 
						
						
						
						
					 
					
						2015-01-20 13:58:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1d61b4936c 
							
						 
					 
					
						
						
							
							add save data method  
						
						 
						
						
						
						
					 
					
						2014-12-18 13:49:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f0d60de745 
							
						 
					 
					
						
						
							
							add save data method  
						
						 
						
						
						
						
					 
					
						2014-12-17 12:16:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9d1a78222e 
							
						 
					 
					
						
						
							
							PropertiesDlg changed: retrieve additional information about the user, use QSettings to store the derived parameters  
						
						 
						
						
						
						
					 
					
						2014-12-17 07:52:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3fe1e3906e 
							
						 
					 
					
						
						
							
							OUTPUTFORMATS in defaults defined; manage available formats just from here  
						
						 
						
						
						
						
					 
					
						2014-12-17 06:37:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d665e47d02 
							
						 
					 
					
						
						
							
							get values for filter parameters from widget  
						
						 
						
						
						
						
					 
					
						2014-12-09 05:25:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9e7f20a9fb 
							
						 
					 
					
						
						
							
							create a working MainWindow  
						
						 
						
						
						
						
					 
					
						2014-12-08 11:38:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							41684cd282 
							
						 
					 
					
						
						
							
							filterOptions has now a buttonBox  
						
						 
						
						
						
						
					 
					
						2014-12-01 12:44:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3e559f61da 
							
						 
					 
					
						
						
							
							fnConstructor now works on eventIDs also  
						
						 
						
						
						
						
					 
					
						2014-12-01 12:43:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d405e9e6f9 
							
						 
					 
					
						
						
							
							debug GUI  
						
						 
						
						
						
						
					 
					
						2014-11-28 11:15:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4b7bfc6aa9 
							
						 
					 
					
						
						
							
							make GUI working even without actual data  
						
						 
						
						
						
						
					 
					
						2014-11-26 08:48:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d0d17ee656 
							
						 
					 
					
						
						
							
							reorganization of graphical and help resources; they are not part of the code and therefore they do not really match in util package  
						
						 
						
						
						
						
					 
					
						2014-11-26 08:45:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c40aec192c 
							
						 
					 
					
						
						
							
							test modules added and modified (not working yet)  
						
						 
						
						
						
						
					 
					
						2014-11-13 11:30:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8c66f1823a 
							
						 
					 
					
						
						
							
							cleaning up main window for first test runs  
						
						 
						
						
						
						
					 
					
						2014-11-13 11:29:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							86803cdff0 
							
						 
					 
					
						
						
							
							debugging UI problems to get the main application running  
						
						 
						
						
						
						
					 
					
						2014-11-06 15:07:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							013c948b33 
							
						 
					 
					
						
						
							
							fix convenience import problems  
						
						 
						
						
						
						
					 
					
						2014-11-06 15:05:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							97344c9f21 
							
						 
					 
					
						
						
							
							cleaned up object type class definition for FilterOptions, programs now only use methods to access attributes  
						
						 
						
						
						
						
					 
					
						2014-10-30 13:38:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3b613d8330 
							
						 
					 
					
						
						
							
							see ticket  #129  (future changes very likely)  
						
						 
						
						
						
						
					 
					
						2014-10-30 08:13:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							da18039c87 
							
						 
					 
					
						
						
							
							line added  
						
						 
						
						
						
						
					 
					
						2014-10-27 12:19:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							224c6b625c 
							
						 
					 
					
						
						
							
							FilterOptionsDialog processes parameter filter option of type FilterOption  
						
						 
						
						
						
						
					 
					
						2014-10-27 12:19:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							898169647b 
							
						 
					 
					
						
						
							
							added new convenience import from new module within package  
						
						 
						
						
						
						
					 
					
						2014-07-25 14:15:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Wehling 
							
						 
					 
					
						
						
						
						
							
						
						
							e4ddb8b55e 
							
						 
					 
					
						
						
							
							new module utils within package util containing helpers for this and that  
						
						 
						
						
						
						
					 
					
						2014-07-25 14:14:19 +02:00