Commit Graph

2848 Commits

Author SHA1 Message Date
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
marcel
2da1d81d3d [change] icons edited again 2017-06-29 16:49:21 +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
583f39dd17 Merge branch 'develop' 2017-06-29 15:18:38 +02:00
marcel
fc0934ba1d [change] updated icons after jour fixe survey 2017-06-29 15:02:50 +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
marcel
0691992850 [add] deleted icons added again... 2017-06-29 09:18:42 +02:00
Ludger Küperkoch
12e383738d Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	icons/Matlab_PILOT_icon.png
2017-06-28 23:11:16 +02:00
marcel
aff08d3a9c [add] some more icons added, hopefully fixed problem on ludgers commit deleting icons (changes in data.py should be correct as well) 2017-06-28 17:20:02 +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
9b7b22c305 [bugfix] one icon misplaced 2017-06-28 16:35:54 +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
cb5f7b6946 [new/change] updated PyLoT icons to a more homogeneous icon set 2017-06-28 16:25:14 +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
marcel
b140dd4f53 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-06-28 09:27:21 +02:00
795733cc5f Merge branch 'develop' 2017-06-27 15:30:18 +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
96ce713337 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-06-27 14:00:00 +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
f1a9726f91 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-27 13:54:51 +02:00
02da277f04 [bugfix] loading data from XML used same event multiple times as it was still part of current data object 2017-06-27 13:54:13 +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
ab260e45f2 [add/bugfix] data._new = False after first picks application 2017-06-27 10:39:44 +02:00
Ludger Küperkoch
987f5c4d62 Additional info for user. 2017-06-27 10:11:11 +02:00
Ludger Küperkoch
4e735b3672 [Bugfix] If too few onsets are available, no export of phases (except xml). 2017-06-27 09:57:00 +02:00
Ludger Küperkoch
a8bfc3c68f Parameter eventID uses wildcard (*) if all events of database supposed to be processed. 2017-06-27 09:44:38 +02:00
53089a3279 [add] rootpath will be applied to QSettings as well 2017-06-26 18:02:07 +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
a0633cafa4 Prevent export of phases when tuning picker. 2017-06-26 16:19:57 +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
b0405cf213 [change] load AUTO picks button will be reused now (old function deprecated as there is only one file for both types of picks) to automatically load all event information for all events given (TODO: currently only XML files!) 2017-06-26 14:22:00 +02:00
42c288ad82 [bugfix] return when no file is selected on load_data 2017-06-26 14:10:40 +02:00
c07642653d [change] default open path for load_data is event folder 2017-06-26 14:08:17 +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