Commit Graph

332 Commits

Author SHA1 Message Date
Ludger Küperkoch
8f92b4ec25 Implemented new, smaller versions of pick icons. 2017-04-27 10:42:31 +02:00
08dfe35620 final commit of first project/event branch, ready for merging to develop [open issues: no differentiation between auto and manual picks mainly for map (internal structure change incoming), new icon integration failed...] 2017-04-21 15:46:57 +02:00
6b7dbe3f9a some bugfixes 2017-04-20 17:06:36 +02:00
b23228253a [bugfix] plotting pick of lower most channel 2017-04-20 15:28:43 +02:00
29701ea68b plotting picks problem was no bug, but resulted from a high sensitivity of the code to random files or folders in the event directory causing HUGE problems... [fix this] 2017-04-20 15:08:36 +02:00
bcc58e4937 changed eventlist string and coloring, [bug]: picks not displayed 2017-04-20 14:03:26 +02:00
f5dcfc654d added eventlist, some changes in tab structure (layouts for each tab to keep tabs when refreshing) 2017-04-20 12:05:34 +02:00
227faf14c2 saving picks in events as part of project 2017-04-19 16:51:19 +02:00
f935da8296 few bugfixes 2017-04-19 16:05:45 +02:00
80577dcfc7 added map_projection plot 2017-04-19 15:40:22 +02:00
fd70ef2251 adding some tabs for map_projection, WIP 2017-04-18 17:17:46 +02:00
62876dd01d added first project structure and event lists (testing needed) 2017-04-18 16:24:26 +02:00
54222b7f11 added method for array plotting to QtPyLoT, to do: button to call array plot 2017-04-12 16:43:29 +02:00
bb60093657 changed PickDlg layout to simpler button layout with hotkeys 2017-04-12 12:14:01 +02:00
d370ef67c0 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-04-10 15:07:48 +02:00
085eee7d75 added autopicks in 3 component windows, also added vertical dashed lines for autopicks for better visibility 2017-04-10 15:06:30 +02:00
Ludger Küperkoch
2dda4d8e04 First action is to ask for PyLoT.in file. 2017-04-10 14:54:47 +02:00
Ludger Küperkoch
43eecfe78b Locate button is initialized as soon as number of picks is equal/greater 4. 2017-04-10 14:43:11 +02:00
Ludger Küperkoch
95dce91ada Major changes: PyLoT GUI opens immediately when calling PyLoT, buttons are deactivated and reactivated as soon as waveforms are loaded. 2017-04-10 14:24:39 +02:00
0656a571cd now returning pylot_form to have access to GUI modules in ipython 2017-04-10 14:01:08 +02:00
50d3c5f235 added ipython support for developing 2017-04-10 13:32:53 +02:00
Ludger Küperkoch
49a4cccc92 Bug fix: PyLoT displays warning message end terminates if no PyLoT-input file or autoPyLoT-output file is declared. 2017-04-10 09:50:53 +02:00
393289245f multiprocessing implemented for restitution and autopicker 2017-04-06 15:37:54 +02:00
c90b061de9 coppied files from Ludgers Laptop 2017-04-06 13:16:28 +02:00
04da34deec Merge branch 'feature/magnitude4QtPyLoT' into develop
Conflicts:
	pylot/core/analysis/magnitude.py
	pylot/core/util/widgets.py
2016-09-29 13:54:18 +02:00
dfefd8af87 [enhancement] make use of new Magnitude method in QtPyLoT 2016-09-29 12:08:59 +02:00
be2bacf5e8 bugfix: metadata not read from default file 2016-09-28 14:37:24 +02:00
72d15e1fc5 [new] implemented new magnitude concept into QtPyLoT 2016-09-27 15:15:53 +02:00
dc38bd6e79 [fix, refactor] started major refactoring of magnitude.py and fixed some smaller bugs 2016-09-26 14:47:50 +02:00
bfa7ffc960 [move] moving functions for Richter and moment magnitude calculation to magnitude module for re-use in autoPyLoT 2016-09-23 15:12:04 +02:00
04ec43c699 [fix] restitute waveform data prior to Wood-Anderson simulation 2016-09-22 14:12:24 +02:00
8307974edf [new] added richter magnitude calculation (to be tested) 2016-09-22 11:39:07 +02:00
80e0ca99d7 [new] added function to calculate symmetrized pickerror on the fly 2016-09-21 14:12:58 +02:00
a215ba35b1 Merge branch 'feature/magnitude4QtPyLoT'
Conflicts:
	pylot/core/analysis/magnitude.py
2016-09-21 10:41:38 +02:00
ca7ce5f13c [change] signature of calcMoMw changed; renamed getinvdir to get_metadata
removed an unused remnant parameter invdir from definition of calcMoMw; method getinvdir from Magnitude class has been renamed and modified and returns now the metadata information and not only the inventory directory
2016-09-21 10:27:47 +02:00
a54ffe01f8 [new, bugfix] use new metadata concept in the scope of QtPyLoT; consistent use of input variables
input variables should always be used; avoid hard-coded parameters
2016-09-20 13:45:49 +02:00
21042bc071 Merge branch 'feature/magnitude4QtPyLoT'
Conflicts:
	pylot/core/util/dataprocessing.py
	pylot/core/util/widgets.py
2016-09-20 13:24:37 +02:00
c73435dec3 [fix] do not calculate moment magnitude for S phases 2016-09-20 09:54:14 +02:00
420f382051 [cherry-pick] merged conflicts after cherry-pick of commit [17585f9381] 2016-09-19 11:42:52 +02:00
fa19ae9b9c [bugfix] only try to calculate moment magnitude given w0 and fc 2016-09-19 11:35:59 +02:00
8ee515e79f [bugfix] do not continue calculation without given data 2016-09-19 11:34:03 +02:00
5155efc710 [bugfix] do not try to give a full filepath for searching issue 2016-09-19 11:33:08 +02:00
17585f9381 [rename] renaming getGlobalTimes for consistency and introduction of similar new function in future commit 2016-09-19 11:29:33 +02:00
d7680f8ae3 Merge branch 'feature/magnitude4QtPyLoT'
Conflicts:
	pylot/core/util/utils.py
2016-09-13 12:02:21 +02:00
3d41e0abcd [refs #200] take advantage of the newly imported input file for magnitude calculation 2016-09-08 15:31:23 +02:00
6e6b3570a8 [bugfix] now plotting of picks works also if less data than picks are available 2016-09-08 15:29:37 +02:00
a2ddd04b2f [bugfix] cancelling localization now works and gives information about the localization state 2016-09-08 15:28:40 +02:00
cbbe019475 [new] read generalized parameter input file 2016-09-08 14:02:21 +02:00
49b07163ad [bugfix] saving data did not work properly due to changed variable signature; picking on just one horizontal component now possible, crash was caused by mismatching component labels -> new function added to find these labels from the available data 2016-09-08 09:54:43 +02:00
f6d05dd2cc [refs #200] use distance in kilometres
ObsPy provides the epicentral distance in degree if the event information are read from a NLLoc hyp-file. To calculate the correct moment magnitude values it is essential to have the distance in kilometres instead.
2016-09-07 11:05:10 +02:00
12641f8d52 [refs #200] fixing some minor bugs during processing of magnitude 2016-09-05 15:00:08 +02:00
e1e3d54f8e [refs #200] corrected call to QFileDialog 2016-09-05 10:16:12 +02:00
e6b788d423 Merge branch 'develop'
Conflicts:
	QtPyLoT.py
	pylot/core/io/data.py
2016-09-02 14:24:34 +02:00
76a856aa11 [clean-up] some code cosmetics and started to implement eventinformation 2016-09-02 14:21:59 +02:00
9f13f8db49 [refs #200] finished magnitude calculation (to be tested) 2016-09-02 09:03:51 +02:00
d98ecea18a [refs #200] now merging picks without destroyed reference resource IDs 2016-09-01 14:21:25 +02:00
81640d30f9 [refs #200] ongoing work on parameter derivation 2016-08-31 13:41:18 +02:00
facffa1bf2 [refs #200] started to implement magnitude determination from QtPyLoT 2016-08-31 12:16:48 +02:00
ad91504211 [ref #137] removing last bugs before closing feature 2016-08-29 15:52:58 +02:00
060bc1d0c8 [refs #137] bugfix value now is specified by user on demand 2016-08-26 14:36:33 +02:00
30ccd331d4 [refs #137] bugfix in widgets.py badly formatted string corrupted load of settings; added a functionality to utils' which function to also look for NLLoc installation in the settings' binary path 2016-08-26 10:48:16 +02:00
b29c7068e3 [refs #137] some improvements in autoPyLoT and ongoing work in the QtPyLoT NLL implementation 2016-08-25 21:32:41 +02:00
e53dd99d75 [refs #137] implementation of GUI driven NonLinLoc location started 2016-08-25 13:31:51 +02:00
14cd175297 [bugfix] it was not possible to pick the very first station manually 2016-06-10 09:01:37 +02:00
8e09fd7c42 [refs #195] pushing GUI element implementation forward 2016-06-07 13:51:03 +02:00
536019259e [adresses 195] preparing GUI elements for a new dialog widget for interactive comparison 2016-06-06 14:10:46 +02:00
de89fc83ce moved widget to utils widgets for consistency and reusability
additionally the filter for PHASES and LOC files has been modified to avoid false selection
2016-06-02 09:39:01 +02:00
0d7ee9d779 [fixed] loading of automatic picks did not plot any result (fixed in this rev) 2016-06-01 08:55:43 +02:00
62b1a4e670 making widget reusable 2016-05-31 17:36:00 +02:00
73c49d8291 improved plotting performance especially for large data sets 2016-05-31 17:27:59 +02:00
7965239a92 [closes #124] PILOT event data can be loaded now 2016-05-31 15:53:23 +02:00
36b0aea86c [edit] fixing bugs (in progress) 2016-05-27 12:53:34 +02:00
618dd10c23 [task] further steps to implement pick comparison from QtPyLoT 2016-05-27 11:25:47 +02:00
163a501ae9 introducing automatic data into QtPyLoT 2016-05-27 07:43:54 +02:00
392a556ac4 [restructure] Wall-E wasting time 2016-05-20 14:46:10 +02:00
41991c5d81 [edit] further restructuring and bugfixing 2016-05-03 13:54:59 +02:00
210d39882d further development on the reassessment routines for PILOT data 2016-05-03 08:46:13 +02:00
edd8920d54 WALL-E --- Small robot, big job! Restructuring the code and preparing implementation of a re-assessment tool for PILOT phases. 2016-05-01 21:10:30 +02:00
a9cd53886b [enhancement, task] there was no routine to read obs pick files available; default values for autopicking should be the same for all parts of PyLoT, thus defaults should be defined only once 2016-04-11 05:47:38 +02:00
bd2bad7367 [adresses #195] task related new function introduced 2016-03-30 15:25:06 +02:00
a2640e3126 reformatting code 2016-03-30 07:00:31 +02:00
2d66248cf9 [fixes #172] now also in overview all horizontals are plotted 2016-03-29 14:06:57 +02:00
4409a9c3ce [fixes #179] plotting of picks preserved after filtering 2016-03-29 12:09:26 +02:00
7b22bce2b0 [close #190] pick handling is now consistent for manual and automatic picks
manual and automatic picks are now treated in the same way but separately; implementation of comparison routines should be much more easy now
2016-03-29 11:26:08 +02:00
14048d6784 [edit] reformat string only if certain prefix is found 2016-03-29 11:00:31 +02:00
f075970f5e [adresses #190] autopicks in QtPyLoT can now also be updated
this change is necessary to be able to load autopickdata from storage independently
2016-03-29 10:30:45 +02:00
040c21dc13 [adresses #190] read information on the picker if available 2016-03-29 08:47:03 +02:00
c1c2aa4b7c [bugfix] value has to be returned in either case 2016-03-23 12:01:46 +01:00
cad6ed2274 [edit] exit if no waveform files are selected
PyLoT will only start if waveformfiles are selected
2016-03-22 10:49:06 +01:00
b8d680f54f 189 Channels shown in wrong order. 2016-03-18 15:35:12 +01:00
6f26ab07b7 [closes #184] saving picks works
saving now works without openening the filename prompt  twice or more often
2016-03-03 13:17:10 +01:00
ddc682de95 [bugfix] selected file filter should be evaluated 2016-03-02 11:04:11 +01:00
f01c6109a8 [reformat] reformatted imports and parentheses indentation 2016-01-29 07:21:17 +01:00
Ludger Küperkoch
28276d1f8c Set default path for autoPyLoT_local.in to /home/user/.pylot using os.expanduser("~"). 2015-12-04 14:39:17 +01:00
ed7a323c50 [new] reverting stdout redirection after auto picking is done; added method finalizeAutoPick for purposes to be done after the auto picking thread has finished 2015-12-01 05:04:26 +01:00
d29c57ab4b [bugfix] AutoPickLog is now directly attached to the MainWindow on the LeftDockWidgetArea and autoscrolls to the bottom 2015-11-30 09:55:33 +01:00
3f91fddd3e [new] added attribute autopicks to and modified corresponding handling methods in class MainWindow 2015-11-30 09:50:47 +01:00
50a5586355 [bugfix] autoPickListWidget is directly attached to the main window and autoScrolls to the latest entry 2015-11-26 05:17:26 +01:00
386131e9f3 started implementation of NLLoc properties selection into manualPyLoT; new utility routine to find indices throughout QComboBox' items 2015-11-20 09:06:52 +01:00
c51ba1bd56 [bugfix] trying to figure out cause of segmentation fault 2015-11-18 09:30:32 +01:00
ed17272999 [bugfix] attribute was unset before using property setter 2015-11-14 11:46:46 +01:00
69011f13ac [new] started to incorporate NLLoc into manualPyLoT 2015-11-13 14:05:29 +01:00
8ae692db70 [new] added a locate button to the toolbar in the GUI (not working yet) 2015-11-09 08:53:26 +01:00
9c7fbc4725 [new] introduced new attribute loc in order to control localization relevant GUI elements depending on the number of available phase onsets 2015-11-06 15:40:21 +01:00
21bb39d528 [new] preparing MainWindow for location button 2015-11-06 08:20:08 +01:00
a31e1a21f0 [bugfix] now filtering in the main window works; filter parameters are not stored -> has to be checked again 2015-10-31 00:07:24 +01:00
2201c3ea4d [modified] restructured filterWaveformData method in order to make the GUI more intuitive 2015-10-30 08:39:51 +01:00
a2047aa37b [disabled] P and S buttons preliminary removed due to unclear functionality 2015-10-30 08:37:00 +01:00
0a7b02c04a general clean-up 2.0 even more checks made and issues resolved 2015-10-19 11:25:15 +02:00
3dc9bb3d06 some pick plotting issues solved; replotting main window if picks have been changed, otherwise just plot additional/deleted picks 2015-09-25 15:06:59 +02:00
d1f1fb42f3 [fixes #176] event files are now opened and loaded correctly and picks are plotted in place 2015-09-21 08:48:29 +02:00
ff2b50f615 made some changes to make the code more idiomatic and renamed method convertPicks4PyLoT to updatePicks 2015-09-18 09:54:29 +02:00
2b42583999 debugged some code fragments while trying to solve the load event data problem 2015-09-17 17:55:40 +02:00
7a47594614 debugged some code fragments while trying to solve the load event data problem 2015-09-17 17:45:10 +02:00
f5fa4f4faf Python 3 compatibility 2015-09-07 10:03:12 +02:00
4eef4d238b 176 open event failure 2015-09-04 15:01:59 +02:00
cc0b1e0a5b 176 open event failure 2015-09-03 13:21:46 +02:00
7588ad3c5b resolved conflicts 2015-08-31 13:45:25 +02:00
623f5d7b7e [addresses #167] started fixing the multiple phase saving issue 2015-08-31 13:37:18 +02:00
1f7049691c [addresses #167] started fixing the multiple phase saving issue 2015-08-28 16:01:42 +02:00
3dd65b9cc3 [addresses #167] started fixing the multiple phase saving issue 2015-08-27 12:55:34 +02:00
0b02e8c213 Merge branch 'export-and-save-picks' into develop 2015-07-18 16:13:37 +02:00
f4f744e22c export and save picks implemented successfully 2015-07-18 16:11:20 +02:00
1e58a86110 [bugfix] forgot to commit changed imports due to class naming changes in [49bf0ecd3c] 2015-07-14 08:10:49 +02:00
d79165a9f2 [bugfix] pick times are absolute times, thus for plotting the start time has to be subtracted 2015-07-13 06:40:10 +02:00
641cb498f0 make labeling the trace slightly more efficient 2015-07-13 06:36:33 +02:00
ae563454af Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop 2015-07-10 09:23:05 +02:00
ea976295d0 huge structural rearrangement to resolve circular import problems
[add] new feature added to QtPyLoT capable of automatically picking an event from overview window
2015-07-10 09:22:58 +02:00
Ludger Küperkoch
2bd31f433b Changed labeling within overview window, station IDs are shown instead of running number. 2015-07-09 15:50:29 +02:00
398a25f902 non-working commit of autoPyLoT functionality in overview window 2015-07-09 11:37:03 +02:00
1bee360bbb use get methods rather than directly access attributes 2015-07-08 15:14:05 +02:00
591e5a7110 standard output format should be QuakeML for saving the event relevant data, moreover the other formats should only be written temporarily for processing purposes 2015-07-08 15:12:35 +02:00
173724ee5a make use of the __version__ variable other than updating the RELEASE_VERSION file 2015-07-07 14:27:29 +02:00
3320cd64a4 switching components enabled in overview window 2015-07-07 14:21:11 +02:00
6078338757 added a splash screen 2015-07-07 12:14:18 +02:00
960f9ca71a use only the high resolution icon 2015-07-07 11:21:06 +02:00
b8c92ed551 preparing to parse the picks to the picking window 2015-07-07 11:02:46 +02:00
a8fe4b7419 give variable declaration a sense 2015-07-07 10:47:55 +02:00
5507a22865 actually draw picks into the overview window 2015-07-07 10:46:27 +02:00
e051be8a06 code cosmetics and give some hint on the usage of the overview window in the status bar 2015-07-07 10:45:42 +02:00
3dd02d7f0c do not print information to standard out but into the status bar (recognizable for the user) 2015-07-07 10:44:06 +02:00
dd8766277a last four commits might not work without the imports coming with this one 2015-07-07 10:39:51 +02:00
5d2900510e added methods for drawing picks to the main window 2015-07-07 10:39:01 +02:00
06d6060a9f added method to add picks to the picks dictionary and warn the user if he/she is about to overwrite pick information 2015-07-07 10:37:54 +02:00
4990e33d27 added utility functions for pick handling 2015-07-07 10:33:14 +02:00
f99f5dbc8f unified icon set used for PyLoT in order to match the license restriction 2015-07-07 10:31:39 +02:00
a08c9e91e0 Ludger reported a Qt Problem that the MPLWidget was not recognized as an PySide.QtGui.QWidget; the problem was not reproducible on my system; maybe the problem was caused because getnoisewin is now imported from pick/utils and there matplotlib is imported for plotting reasons but to clarify the Qt backend used by matplotlib, it should not be imported before 2015-07-06 09:51:59 +02:00
b42f88605b the main application window now opens in fullscreen mode 2015-06-25 10:25:08 +02:00
ca4c5edb18 make the code more readable 2015-06-23 13:22:30 +02:00
c5da8fd994 changed usage signature of some function from module utils and the corresponding calls 2015-06-11 10:12:50 +02:00