|
|
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 |
|
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 |
|
