Commit Graph

1627 Commits

Author SHA1 Message Date
b3b3dca41a Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-08-11 16:07:43 +02:00
2554534759 [bugfix] a lot of different bugfixes 2017-08-11 16:07:23 +02:00
Ludger Küperkoch
f393585831 New function to get quality classes from uncertainties, plot only automatic picks, if pick qualities are less than 4. 2017-08-11 16:04:18 +02:00
Ludger Küperkoch
fe2957f76d Cosmetics 2017-08-11 15:02:47 +02:00
039f98a811 [add] check for nsamples and negative slope of cf 2017-08-11 15:01:32 +02:00
e6aa1ad031 [add] continue if no station coords
[bugfix] return if no isignal window
2017-08-11 14:50:12 +02:00
Ludger Küperkoch
571b90e5b7 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-08-11 12:49:18 +02:00
Ludger Küperkoch
e9a0be347c [Bugfix] Take into account different formats of input argument iplot. 2017-08-11 12:48:43 +02:00
fe2a2a9714 [add] trim_station_comp also for tuneAutopicker 2017-08-11 10:28:35 +02:00
7846e1303a [bugfix] in tuneautopicker 2017-08-11 10:24:25 +02:00
9b97937049 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-08-11 10:15:42 +02:00
Ludger Küperkoch
b36f20ff59 [Bugfix] Take into account that initial pick might be very close to start of CF. 2017-08-10 17:54:50 +02:00
Ludger Küperkoch
526cd4303e [Bugfix] Still unclear, sometimes time array larger than data array. 2017-08-10 17:23:08 +02:00
874fdd730a [add] check for gaps and trim traces for one station
[change] restitute data only if necessary!
2017-08-10 16:25:32 +02:00
Ludger Küperkoch
42dcf7576b Deleted annotated line. 2017-08-10 15:11:14 +02:00
Ludger Küperkoch
8023ba2993 [Bugfix] Wrong use of indices. 2017-08-10 15:10:15 +02:00
Ludger Küperkoch
55c1a38f29 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-08-10 14:06:59 +02:00
Ludger Küperkoch
7ae8f651d3 [Bugfix] Slope must be counts/s! 2017-08-10 14:06:33 +02:00
fd2b82e978 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-08-10 14:01:55 +02:00
4e6a6dc2a8 [bugfix] self used in function (not method) 2017-08-10 14:01:25 +02:00
Ludger Küperkoch
726c823646 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-08-10 12:47:08 +02:00
Ludger Küperkoch
071c18f649 Take into account very small prediction errors (synthetics!), [Bugfix] take into account very close zero crossings 2017-08-10 12:44:28 +02:00
460af0e094 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-08-10 12:25:42 +02:00
2cc05329f9 [bugfix] huge bug in slope calculation 2017-08-10 12:25:03 +02:00
8a80af78cf [bugfix] use z-trace starttime instead of full_range 2017-08-10 12:00:43 +02:00
1ed4f73e5c [bugfix] darius: comparison of P-pick slope to minAIC-S-slope instead of S-pick slope 2017-08-10 11:04:46 +02:00
Ludger Küperkoch
a450189ba2 Take empty trace into account. 2017-08-09 17:37:11 +02:00
fd9e4f0c05 [add] remove automatic phases possible from pickDlg 2017-08-09 15:10:36 +02:00
5c6f1eb564 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-08-09 14:16:45 +02:00
acaf7f5172 [add] differentiation between automatic and manual picks imported from new
style XML file
2017-08-09 14:15:50 +02:00
Ludger Küperkoch
1b16c13525 [Bugfix] autoPyLoT was running always non-parallel due to iplot argument. 2017-08-09 13:28:00 +02:00
Ludger Küperkoch
87b617b924 [Bugfix] Control figure output of autoPyLoT via optional input argument iplot. 2017-08-09 13:17:54 +02:00
29165aadc7 [bugfix] fixed former bugfix 2017-08-09 09:44:01 +02:00
Ludger Küperkoch
a7b02c68de Re-introduced multicore processing, temporarly disabled for bug fixing. 2017-08-08 17:09:17 +02:00
Ludger Küperkoch
9e48bb1fa4 Removed hard coded, unnecessary saftey gap. 2017-08-08 17:06:41 +02:00
Ludger Küperkoch
811f52c95c Enabled plotting of figures when called from terminal. 2017-08-08 16:38:29 +02:00
Ludger Küperkoch
ab410b790c If one horizontal component is missing, AR prediction is calculated on original trace and copy of it. 2017-08-08 14:19:13 +02:00
Ludger Küperkoch
cc2da4fc41 [Bugfix] 'NoneType' object has no attribute 'axes'. 2017-08-08 11:53:21 +02:00
Ludger Küperkoch
6891591ae9 [Bugfix] Wrong use of boolean variable. 2017-08-08 11:26:40 +02:00
Ludger Küperkoch
7d5bfe8107 ilen was referenced before assignment. 2017-08-08 10:24:12 +02:00
2fa9a60023 [rename] functions renamed 2017-08-07 16:41:50 +02:00
014152e30e [add] saveAllEvents now connected to export for Autopick process and saveProject 2017-08-07 16:33:45 +02:00
17a93cf62f [add] for global seismology CF pick windows will now be calculated
relative to estimated tt from TauPy, metadata and source location (in XML
file) needed
[TO DO]: automatic export of XML (esp. source loc) before autopicking
2017-08-07 11:21:20 +02:00
60ebaa6528 [bugfix] few typos 2017-08-04 11:05:52 +02:00
9499688887 [add] parameter taup_model 2017-08-04 11:03:10 +02:00
41e5c004b2 [add] new parameter use_taup 2017-08-04 10:28:00 +02:00
04bf655cf1 [bugfix] init Checkbox if parameter is not found 2017-08-04 10:27:23 +02:00
ddb1fb8b97 [add] multiple eventIDs possible as eventID pylot_parameter (testing needed) 2017-08-03 14:49:32 +02:00
cab9061030 [change] abortButton for Thread removed by default, cause it was not
working properly
2017-08-03 14:39:58 +02:00
125b72a582 [bugfix] autoPyLoT crashed when getSlope() method of AICPicker returned
None (comparing None to float), workaround: if not slope: slope=0
2017-08-03 12:05:19 +02:00
154e7b459f [add] --ncores flag added to autoPyLoT call, also enabled in GUI widget 2017-08-03 11:49:15 +02:00
90006809a5 [add] new autopick options added to file menu 2017-08-03 11:10:26 +02:00
e8a0a87dad [change] removed __del__ method reimplementation from thread objects
causing problems (no idea why it is there at all)
2017-08-03 11:09:50 +02:00
85a01fb0f1 [minor] cosmetics in print 2017-08-03 10:33:58 +02:00
5e2dc6c9f9 [add] improved submit functions 2017-08-03 10:15:54 +02:00
20b31a1c5c [reformat] code reformatting with PyCharm 2017-08-03 09:41:54 +02:00
4107f0249d [add] widgets for GUI independent spawning of autoPyLoT processes, WIP 2017-08-02 15:20:32 +02:00
482ae112e8 [bugfix] missing string emitting signal 2017-08-02 13:19:09 +02:00
d5645cf979 [bugfix] string transformation of None values 2017-08-02 11:02:24 +02:00
a5a3087283 [add] system specific path SEPERATOR 2017-08-02 10:47:41 +02:00
c60c659608 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-07-31 17:00:55 +02:00
aa5d11d735 [WIP] changed multiThread structure to QThreadPool 2017-07-31 17:00:19 +02:00
Ludger Küperkoch
8b7496a2fb Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	pylot/RELEASE-VERSION
2017-07-31 15:40:11 +02:00
c353c24283 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-07-31 14:57:36 +02:00
7ca6509611 [bugfix] has_keys not a method of dict in python3 2017-07-31 14:56:59 +02:00
bd62115e5d Merge remote-tracking branch 'origin/develop' into develop 2017-07-31 14:56:31 +02:00
Ludger Küperkoch
290a623664 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-07-31 14:18:40 +02:00
Ludger Küperkoch
7009983925 [Bugfix] Wrong derivation of method_id. 2017-07-31 14:17:06 +02:00
17e6169cee [bugfix] untabify code 2017-07-31 13:52:57 +02:00
06b8c8413f merge release version 2017-07-31 13:44:37 +02:00
121ef4357f [WIP] using multiThread to call autopylot 2017-07-31 13:43:06 +02:00
Ludger Küperkoch
4244c4209b New function to derive onset quality classes and to plot them if desired. 2017-07-31 12:04:03 +02:00
f13542840f [add] MultiThread class added 2017-07-31 10:40:03 +02:00
f86f33b22f [minor] removed output 2017-07-20 16:18:00 +02:00
04d43f67c5 [bugfix] default phases from obspy not unique
[add] toggle button for checking phases
2017-07-20 15:11:07 +02:00
f93713fdad [bugfixes] filtering should be possible for all recognized phases now 2017-07-20 14:09:35 +02:00
d48d29f7ec [change] code restructured for flexibility 2017-07-20 11:50:57 +02:00
9c089329f3 [bugfix] string changed by accident 2017-07-20 11:42:31 +02:00
389965e573 [add] plot arrivals option added
[change] code reformated by PyCharm
2017-07-20 11:33:01 +02:00
c644095b5a [add] phase defaults for phasesTab 2017-07-19 15:12:01 +02:00
548c863f10 [minor] tight_layout for waveformwidget figure 2017-07-18 16:17:04 +02:00
d21afcf31a [minor] changed linewidth of wf plot slightly 2017-07-18 16:12:33 +02:00
be588252cf [add] events can be removed by clicking a button in event_table 2017-07-18 16:07:08 +02:00
60594c97cf [bugfix] wrong if cause in for loop in read_eventfile_info
[add] function to remove events from project
2017-07-18 15:27:52 +02:00
37875d5c87 [add] finished remove picks feature, testing needed 2017-07-18 14:34:09 +02:00
dbb3fab6d0 [add] possibility to remove picks added to pickDlg 2017-07-18 13:54:47 +02:00
1918c11b42 [bugfix/improvement] checkZ4s independent of different trace starttimes and sampling rates 2017-07-17 18:02:29 +02:00
176f13db09 [bugfix] slope window was used for calculation of checkz4s leading to huge problems 2017-07-17 16:58:40 +02:00
547355fbdf [change] updated parameters of function call exportEvent in autoPyLoT 2017-07-17 13:44:38 +02:00
f41a330606 [add] default event output name += .xml 2017-07-17 13:10:02 +02:00
2633f4b9cf [bugfix] error-prone check for method_id.id 2017-07-17 11:58:32 +02:00
7e0f4efbcc [bugfix] wrong usage of instrinsic function list() 2017-07-17 11:50:51 +02:00
7f0ab4dd94 [merge] merged changes in QtPyLoT manually 2017-07-17 11:38:50 +02:00
e5f5ab8412 [change] improved code behavior; exportEvent now checks for magnitudes and origins as well 2017-07-17 11:32:38 +02:00
b286290797 [change] exportEvent now checks for existing picks of type 'fcheck' in xml file and replaces them with new picks 2017-07-17 10:55:02 +02:00
90e27f1d08 [WIP] autopicks -> update xml file 2017-07-14 16:24:37 +02:00
a017c4deb4 [bugfix] various bugfixes while testing on Windows with py3 2017-07-14 15:26:39 +02:00
3869922378 [bugfix] typo in variable name 2017-07-14 14:16:12 +02:00
227112cbac [change] parameter evtdata of class Data has to be called as str object
(instead of outdated basestring) to make the class python 3 compatible
2017-07-14 13:30:54 +02:00
20e86cee5a Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-07-14 11:11:49 +02:00
68f864e93a [bugfixes] changed iplot flag default to 0, intercept Exception on false
filter settings
2017-07-14 11:09:18 +02:00
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
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
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
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
e0926c6b20 [change] phase/expected phase arrivals text position now stays readable around pickDlg axes 2017-07-10 15:39:44 +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
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
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
9e6b376c62 [bugfix] reintroduced previous bugfix 2017-06-29 17:02:05 +02:00
Ludger Küperkoch
647cb1e32b Reintroduced changes of MP spuriously removed by previous commit. 2017-06-29 16:41:09 +02:00
Ludger Küperkoch
1e99ae8272 File extention for output taken from preferences OutputsTab. 2017-06-29 16:35:52 +02:00
574704cc49 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-29 10:24:27 +02:00
3ae166b147 [bugfix] picks not plotted in PickDlg if type(picks .or. picksdict) was AttribDict instead of dict 2017-06-29 10:23:45 +02:00
Ludger Küperkoch
5564fb54dc Additional screen output to inform the user about status of saving picks. 2017-06-29 09:51:24 +02:00
Ludger Küperkoch
e7bd1c8d31 Export for VELEST-cnv format. 2017-06-28 16:55:12 +02:00
4f8631e829 [revert] changes of previous commit reverted as problems with QDialog seem to be caused by windows XServer 2017-06-28 16:40:44 +02:00
marcel
afd7a94852 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-06-28 16:26:16 +02:00
marcel
2f7033329b [bugfix] possible that dialog was hidden behind other windows 2017-06-28 16:24:24 +02:00
Ludger Küperkoch
d31fec8781 Before exporting phases, check for manual picks and export them instead of automatic picks. 2017-06-28 14:23:24 +02:00
Ludger Küperkoch
f52b42f009 [Bugfix] Write header only, if export has been successfull. 2017-06-28 12:40:03 +02:00
Ludger Küperkoch
85829b22eb Write header in ObsPy-generated NLLoc-observation file. 2017-06-28 12:38:21 +02:00
cb1fb60eec Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-27 15:11:06 +02:00
f1f9295370 [add] user prompt when event_id not matching on load_data 2017-06-27 15:08:19 +02:00
Ludger Küperkoch
a3487b66ea [Bugfix] Take care that chosen window lengths fit to length of time series. 2017-06-27 13:59:00 +02:00
Ludger Küperkoch
68ef127617 [Bugfix] Network code was missing. 2017-06-27 11:46:21 +02:00
a90e0bd78b [change] data._new moved to applyEVTData 2017-06-27 10:49:11 +02:00
Ludger Küperkoch
987f5c4d62 Additional info for user. 2017-06-27 10:11:11 +02:00
30e2e1df84 [bugfix] query for data flag/attribute isNew changed 2017-06-26 17:41:08 +02:00
71da6ded2b [bugfix] Error when getEventFromPath returned None 2017-06-26 17:40:36 +02:00
Ludger Küperkoch
c56a11634a Uncomment setNew, though still not sure, what its all about. 2017-06-26 16:10:18 +02:00
Ludger Küperkoch
bec8604904 autoPyLoT appends manual picks to xml-file, and manualPyLoT appends automatic picks to xml-file. 2017-06-26 14:47:36 +02:00
581a85b81f [bugfix] missing network code in picksdict_from_picks triggered silent Exception using picks generated by picks_from_picksdict 2017-06-26 13:58:26 +02:00
b10b79ea79 [change] renamed picks attribute for pylot to pylot_picks, picks attribute of events will now be used exclusively for ObsPy picks 2017-06-26 12:19:06 +02:00
d08bd4cc9e [move] class Event finally moved to new module event 2017-06-26 12:03:04 +02:00
acaf592590 [move] class Event moved to pylot.core.util.utils 2017-06-26 10:47:40 +02:00
Ludger Küperkoch
0f05be6a50 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	pylot/RELEASE-VERSION
2017-06-23 15:47:09 +02:00
Ludger Küperkoch
9746913f8b Consistent prefix for all PyLoT-output. 2017-06-23 15:45:45 +02:00
8e6c4d06ce [add] array_map now plotting event location if given 2017-06-23 15:40:13 +02:00
ed4c112e99 [add] additional event information will be displayed in eventlist tab
[bugfix] project.search_eventfile_info was using relative path for filename
2017-06-23 14:56:56 +02:00
f409861d10 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-23 14:16:06 +02:00
103ae716a2 [add] additional event information can now be read by project from a simple textfile and added to each event (time, location, magnitude) 2017-06-23 14:14:42 +02:00
Ludger Küperkoch
c9f0b126df Equal xml-file name for both automatic and manual picks, i.e. PyLoT_evID.xml. 2017-06-23 14:11:35 +02:00
929f58b942 merge origin/develop into develop 2017-06-23 12:12:55 +02:00
7bb2d54f6e [change] Event class now bases on ObsPy Event class which should be more efficient in future, origin time will be read from notes file if possible 2017-06-23 12:04:26 +02:00
Ludger Küperkoch
27597e6b4b Take into account parameter extent when writing header for PyLoT-input file. 2017-06-23 11:32:08 +02:00
Ludger Küperkoch
5958e05f3b Cosmetics. 2017-06-23 10:26:49 +02:00
Ludger Küperkoch
6ebad273a9 Improved screen output. 2017-06-23 10:10:45 +02:00
Ludger Küperkoch
71876638c8 Flexible calculation of local magnitude including station magntiude scaling as well as network magnitude scaling.
auoPyLot-output-file names have prefix event ID.
2017-06-22 15:04:16 +02:00
ca1d3dca38 [add] filter parameters added to default parameters 2017-06-22 12:01:22 +02:00
97ee03b443 Merge branch 'develop' into filterOptions 2017-06-22 11:26:02 +02:00
8e8b3e0462 [rename] AutoPickPara ---> PylotPara 2017-06-22 11:22:17 +02:00
f91e1cde6f [change] structure changed to make parabox more flexible 2017-06-22 11:03:24 +02:00
203974cd83 [bugfix] parameters interchanged 2017-06-22 10:54:17 +02:00
f6a20c4ea2 [bugfix] advanced_cb acciddently pushed to bottom of layout 2017-06-22 10:53:56 +02:00
Ludger Küperkoch
9f164fc075 Still in progress: flexible local magnitude estimation. 2017-06-21 16:42:26 +02:00
Ludger Küperkoch
477aacbb4a Preparation of flexible local magnitude estimation. 2017-06-21 15:43:12 +02:00
Ludger Küperkoch
cf200e1425 Preparation of flexible local magnitude estimation, renamed module. 2017-06-21 15:41:12 +02:00
5928967e28 [closes #212] tuneAutopicker always tries to load current event in mainwindow 2017-06-21 15:33:49 +02:00
6feffaeadb [closes #209] spacebar can now be used to accept pickDlg, also added a checkbox to automatically open next station (experimental) 2017-06-21 15:20:36 +02:00
b0dcf5ff4b [change] local magnitude section added 2017-06-21 14:20:22 +02:00
d77abdc1d0 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-21 14:10:24 +02:00
5214d31908 [add] space hotkey to close window 2017-06-21 14:09:39 +02:00
Ludger Küperkoch
b96af41324 In progress: new parametters for magnitude estimation 2017-06-21 13:53:53 +02:00
c10639b49c [merge] manual merging to new function structure (widget insertion with position) 2017-06-21 13:28:44 +02:00
43c314a1f8 [add/change] dataroot added to project file, improvements in behavior of create/save project 2017-06-21 13:24:45 +02:00
Ludger Küperkoch
9dc1545b63 Renamed/added new main parameter sequence Seismic Moment and Local Magnitude. 2017-06-21 13:03:17 +02:00
Ludger Küperkoch
51be558560 New parameters added for local magnitude estimation and scaling. 2017-06-21 13:01:14 +02:00
0a6ad8b663 [add] folder structure automatically recognized when adding events 2017-06-21 11:45:35 +02:00
be463c2adf [add] functionality to display one groupbox of AutoPickParaBox exclusively 2017-06-21 10:36:22 +02:00
1b512a0864 [closes #207, closes #208] when supressing user prompt, applyEVTData to data object was accidently removed 2017-06-20 16:23:54 +02:00
ab979e9b10 [bugfix] events not properly provided to autoPyLoT by TuneAutopicker, wrong parameter name in plotting routine 2017-06-20 14:32:21 +02:00
0ff6f78a6c [add] parameter localMag added 2017-06-20 12:10:56 +02:00
718879fad0 merge origin/develop into develop 2017-06-20 09:57:52 +02:00
300ff9215b [fixes #210] missing paranthesis in function call 2017-06-20 09:54:23 +02:00
Ludger Küperkoch
16003b6353 Bugfix: Different number of elements in used arrays. 2017-06-19 18:21:38 +02:00
Ludger Küperkoch
2601ec2865 Bugfix: Empty polyfit-object is avoided. 2017-06-19 16:35:51 +02:00
1b17842f63 [fixes #201] test events will be skipped when using TuneAutopicker 2017-06-19 16:30:39 +02:00
0717f491aa [closes #203] events can be saved as pickle now, not intended to save back event notes to notes.txt file as it is only used for automatically generated event folders 2017-06-19 13:54:43 +02:00
Ludger Küperkoch
9aba69686d Richter magnitude scaling is hard-wired, should not be handled internal. First step to flexible local-
magnitude estimation.
2017-06-19 11:37:08 +02:00
08b9cec674 [refs #206] savepicks XML now opens current event folder by default, also gives default filename
[bugfix] could not save XML files with . in name
[change] removed user prompt when changing picks on different event (redundant)
2017-06-19 11:28:11 +02:00
053caa5cf6 [change] replot after manual picking only if necessary (picks changed) 2017-06-19 10:37:24 +02:00
aea77cd49c [change] removed redundant propmpt because new picks have to be accepted in the first place when closing PickDlg 2017-06-19 10:30:08 +02:00
7257d43155 [fixes #205] call replot thread after manual picking 2017-06-19 10:23:39 +02:00
754883c5c9 [refs #204] adding application name/organisation/domain when building app before calling settings 2017-06-14 16:22:26 +02:00
d2d8498739 [bugfix] stream oabject overwritten when using alter_comp causing traces to disappear in plot 2017-06-12 14:36:38 +02:00
5412de8249 [add] notes can be read from event folders 2017-06-12 11:34:45 +02:00
ddedd3ed7a [hotfix] ignoring error when mouseclick signal cannot be disconnected 2017-06-12 10:42:44 +02:00
marcel
01c556562e [bugfix] newer version of pyqtgraph could not cope with UTCDatetime, now min/max_range for axes working 2017-06-09 13:51:20 +02:00
8e839df718 [add] pyqtgraph now part of Settings object; if installed will be used by default but can be deactivated 2017-06-09 13:23:16 +02:00
b061c81b2c [change] removed axes on startup 2017-06-08 16:58:44 +02:00
d6dd8bfaa8 [bugfix] several bugfixes mostly refering to plotting from plotWaveformDataThread, now only plot data are generated from within thread 2017-06-08 16:36:47 +02:00
909e2241a7 [change] working version of pyqtgraph for dataPlot, WIP: fill not working on versions lower 0.9.9 2017-06-08 14:09:01 +02:00
a07162d668 first semi-working plot of all traces 2017-06-07 17:05:48 +02:00
be8035e118 [bugfix] update to previous commit 2017-06-07 11:31:03 +02:00
9e85a9df47 [bugfix] using default channel components in case QSettings is not working with OS 2017-06-07 11:29:38 +02:00
66c5142cb9 [change] major changes in AutoPickParaBox layout, now structured as groupboxes that can be hidden individually 2017-06-07 10:30:15 +02:00
0af795969b [add] parameters now changed as part of project, some small fixes 2017-06-06 16:30:27 +02:00
f7d0e49458 [change] some updates of main window title changed to new QtPyLoT 2017-06-06 15:51:06 +02:00
20300daecf [change] metadata not saved as part of project file anymore (files might get really big), still possible to load same project, idea: add QSetting whether to save or not to PyLoTprefs 2017-06-06 15:28:43 +02:00
bdc85fa56a [bugfix] channel order mixed 2017-06-06 14:43:36 +02:00
9007197786 [add] network code added to station map 2017-06-06 14:08:19 +02:00
4077ec207c [bugfix] contourf plot not shown in station map. min() max() was not working when nan in list 2017-06-06 13:49:40 +02:00
86c76c6f61 [bugfix] 3 comp. window, time correction for trace overdone 2017-06-06 11:16:57 +02:00
530a629d15 [bugfix] changed code order for QSettings 2017-06-02 14:02:08 +02:00
f7af1d0b1b Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-02 11:52:39 +02:00
6434366e55 [bugfixes] several fixes relating to Channel Components, main issue: SetChannelComponents object was newly initated every time. Now: One object saved inside global QSettings. Testing needed. 2017-06-02 11:51:00 +02:00
Ludger Küperkoch
1e03541d6d Stabilized slope calculation for quality control. 2017-06-02 11:41:52 +02:00
Ludger Küperkoch
e2c1b8501e Exception for ValueError, if autoPyLoT has been started from terminal.
Raise SacIOError if obspy.read spuriously wants to read SAC data.
2017-06-02 11:09:32 +02:00
0fb6e5d4df [bugfix] pickDlg takes into account timeshift of trace.starttime for different components
[add] initial pick displayed in pickDlg
2017-06-01 15:25:43 +02:00
04304d3db8 [hotfix] adding decimals to AutopickParaBox 2017-06-01 14:01:43 +02:00
eaa4849a20 added network code to TuneAutopicker, small bugfix 2017-05-31 17:31:58 +02:00
cf399ed747 added parameter selection with ParameterBox to QtPyLoT Mainwindow 2017-05-31 17:12:34 +02:00
7d736823b1 [bugfix] min/max values of automatically generated spinboxes changed to -10e7 to 10e7 2017-05-31 16:28:05 +02:00
cd612def81 WIP: working on saving filter options as part of project 2017-05-31 16:25:46 +02:00
62fa3ad8b1 several updates to internal refreshing of widgets when manual picks are set 2017-05-31 15:41:25 +02:00
02a59f46a9 [bugfix] fixed filter settings for pylot.in file on open/save action in AutoPickParaBox 2017-05-31 14:35:52 +02:00
5897113140 [bugfix] fixed behavior of createNewProject, changed some hotkeys and renamed actions in file tools
[new] added saveAs button for prject, TO DO: possibly change saveAs icon slightly from save icon
2017-05-31 14:30:06 +02:00
eb5cf08d58 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-31 13:46:37 +02:00
16c2ecb82f added main window zoom with [STRG] and [SHIFT] + mousewheel 2017-05-31 13:45:48 +02:00
Ludger Küperkoch
33e34ef194 Removed former changes, made it worse! 2017-05-31 12:21:40 +02:00
c540cd0f81 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-31 11:48:51 +02:00
17cdffe735 some updates on saving/closing and user interaction 2017-05-31 11:48:16 +02:00
Ludger Küperkoch
d7abd3bef9 Stabilized slope determination. 2017-05-31 11:41:24 +02:00
1ff3b845bb some changes on dirty flag, added keyPress/release Events for Ctrl-Key 2017-05-31 10:56:45 +02:00
60c882fe04 [bugfix] changes in default_parameters not applied 2017-05-31 10:33:45 +02:00
396555b4b4 changes in resolution window (added parameter for extent), TRIAL: changes in YLims of pickwindow after init Pick 2017-05-31 10:28:31 +02:00
f493359c26 [bugfix] fixes and modifications for (inhomogeneous) global datasets, WIP 2017-05-30 16:27:38 +02:00
ceed165307 [bugfix] accidential function rename in code fixed 2017-05-30 11:45:53 +02:00
a745381e8e some changes in propertiesDlg 2017-05-30 10:17:07 +02:00
395295a295 changed some things in properties dialog to keep settings when opened again. added settings 'nth_sample' to speed up plotting a little bit 2017-05-29 18:03:31 +02:00
0f1292e9f2 [bugfix] setValue not working when type(item) in QLineEdit was 'int' instead of 'str'(i.e. 'unicode') 2017-05-29 16:24:44 +02:00
41a870d720 some changes in dataPlot resizing/height adjustments 2017-05-29 16:21:36 +02:00
5115705c4e Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-29 13:50:30 +02:00
a2ca96ae57 wfDataPlot stations now sorted by network and then by name 2017-05-29 13:49:34 +02:00
Ludger Küperkoch
b542f83201 Bugfix, sligthly changed SNR and noise-level calculation. 2017-05-29 12:02:56 +02:00
cb91911313 Merge remote-tracking branch 'origin/develop' into develop 2017-05-29 11:57:14 +02:00
b2d48cd523 changed some dirty things 2017-05-29 11:56:22 +02:00
3ad82c0c9e small fix on saving back loaded project 2017-05-29 11:34:22 +02:00
8975913143 added load project option from command line (QtPyLoT.py -p) 2017-05-29 11:31:09 +02:00
Ludger Küperkoch
5e593fc932 New class for getting/setting channel order, replaces old globals COMPNAME_MAP and COMPPOS_MAP. 2017-05-29 11:23:39 +02:00
b3a4470910 slightly changed qtpylot to call it from console 2017-05-24 15:28:52 +02:00
69b2daaab8 Merge remote-tracking branch 'origin/develop' into develop 2017-05-24 14:13:43 +02:00
50129fc8d9 [fix] some small fixes, new QtPylot functions commented 2017-05-24 14:12:41 +02:00
Ludger Küperkoch
9bc6f601a1 A littlebit more pythonic. 2017-05-24 11:23:35 +02:00
Ludger Küperkoch
c954614544 Bugfix: PyLoT can now cope with databases named with number (e.g. year). 2017-05-24 10:19:50 +02:00
Ludger Küperkoch
74b19ac094 Bugfix: PyLoT could not cope with input file if not called pylot.in. 2017-05-24 10:12:12 +02:00
Ludger Küperkoch
92525732a3 Cosmetics. 2017-05-23 16:36:02 +02:00
Ludger Küperkoch
3da76e9f1c Connected new ChannelOrderTab to component positions and names. 2017-05-23 16:13:58 +02:00
Ludger Küperkoch
36b4a2a05f Removed needless print output. 2017-05-23 15:33:19 +02:00
Ludger Küperkoch
4b3687fd2b New preferences tap ChannelOrderTab for assigning channel numbers to components. 2017-05-23 15:31:13 +02:00
840610cb18 [new] added some mousewheel zooming for array map 2017-05-23 13:34:39 +02:00
83fd0efd83 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-22 15:36:35 +02:00
22eb46999c map beautification 2017-05-22 15:34:07 +02:00
Ludger Küperkoch
eb0cb7d5ab Cosmetics: Reasonable name for autopick-tune tap. 2017-05-22 14:59:48 +02:00
Ludger Küperkoch
cf4615a438 Removed obsolete class ParametersTab (Now done in class TuneAutopicker). 2017-05-22 14:38:48 +02:00
ba56bfbd25 added scroll functionality when mouse inside dataPlot canvas 2017-05-22 10:53:20 +02:00
Ludger Küperkoch
a3fbeafeac TuneAutopicker now gets event id independent from input of pylot.in. 2017-05-19 15:39:43 +02:00
5a3b77dc7b Merge remote-tracking branch 'origin/develop' into develop 2017-05-19 13:54:33 +02:00
f3a96ae200 small bugfix 2017-05-19 13:53:58 +02:00
Ludger Küperkoch
092aeb4cec autoPyLoT button works nearly properly now. 2017-05-19 13:22:04 +02:00
Ludger Küperkoch
4767add68f Re-initialized autoPyLoT from GUI, new input parameter eventid to make sure processing the right event. Buggy! 2017-05-19 12:30:03 +02:00
e911262c3e added some buttons for setting current event to ref/test, made ref/test color settings 'global', some fixes 2017-05-19 10:56:27 +02:00
cf971d6a87 Mainwindow plotWidget size fix 2017-05-19 09:23:02 +02:00
1143d97f36 added manual picks to tune autopick figures 2017-05-18 15:24:30 +02:00
Ludger Küperkoch
f814ec8656 Bugfix: if no plotflag set, fig was not assigned. 2017-05-18 13:53:22 +02:00
a8861dfdab [bugfix] multiprocessing problem fixed, caused by a general bug passing wrong argument [fig_dict] to AIC instead of [fig_dict[key]]; also iplot flag is correctly read from parameter file now 2017-05-18 13:16:53 +02:00
46236eeb55 changed PyQt import to PySide import! 2017-05-18 11:44:51 +02:00
11a7f17655 small fix preventing eventID from being changed in TuneAutopick when parameters are loaded 2017-05-18 11:41:14 +02:00
Ludger Küperkoch
b979649e82 Cosmetics. 2017-05-18 10:31:59 +02:00
Ludger Küperkoch
45ff145616 Take into account, that input_dict is not available when calling from terminal. 2017-05-18 10:09:51 +02:00