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
beed46229a
[add] plot phase name in pickDlg, also plot network code
2017-06-30 13:56:59 +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
Ludger Küperkoch
1e99ae8272
File extention for output taken from preferences OutputsTab.
2017-06-29 16:35:52 +02:00
marcel
fc0934ba1d
[change] updated icons after jour fixe survey
2017-06-29 15:02:50 +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
marcel
cb5f7b6946
[new/change] updated PyLoT icons to a more homogeneous icon set
2017-06-28 16:25:14 +02:00
f1f9295370
[add] user prompt when event_id not matching on load_data
2017-06-27 15:08:19 +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
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
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
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
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
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
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
c44f351636
[add] new method to load multiple XML files at once for all events, WIP: picks loaded from XML files cannot be saved afterwards
2017-06-22 16:30: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
Ludger Küperkoch
cf200e1425
Preparation of flexible local magnitude estimation, renamed module.
2017-06-21 15:41:12 +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
43c314a1f8
[add/change] dataroot added to project file, improvements in behavior of create/save project
2017-06-21 13:24:45 +02:00
0a6ad8b663
[add] folder structure automatically recognized when adding events
2017-06-21 11:45:35 +02:00
6daccad341
[add] testing: saveProjectAs option 'always' enabled when project is active
2017-06-20 16:30:13 +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
0be5c4b694
[add] verbosity on import pyqtgraph exception
2017-06-20 13:22:29 +02:00
a8544dfb93
[bugfix] save XML does not set project clean
2017-06-20 10:35:31 +02:00
300ff9215b
[ fixes #210 ] missing paranthesis in function call
2017-06-20 09:54:23 +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
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
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
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
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
530a629d15
[bugfix] changed code order for QSettings
2017-06-02 14:02:08 +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
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
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
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
16c2ecb82f
added main window zoom with [STRG] and [SHIFT] + mousewheel
2017-05-31 13:45:48 +02:00
17cdffe735
some updates on saving/closing and user interaction
2017-05-31 11:48:16 +02:00
1ff3b845bb
some changes on dirty flag, added keyPress/release Events for Ctrl-Key
2017-05-31 10:56:45 +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
41a870d720
some changes in dataPlot resizing/height adjustments
2017-05-29 16:21:36 +02:00
a2ca96ae57
wfDataPlot stations now sorted by network and then by name
2017-05-29 13:49:34 +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
50129fc8d9
[fix] some small fixes, new QtPylot functions commented
2017-05-24 14:12:41 +02:00
22eb46999c
map beautification
2017-05-22 15:34:07 +02:00
ba56bfbd25
added scroll functionality when mouse inside dataPlot canvas
2017-05-22 10:53:20 +02:00
Ludger Küperkoch
2a054f75f5
autoPyLoT working properly now, incl. getting right event id and data path.
2017-05-19 14:25:24 +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
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
Ludger Küperkoch
6405350dcc
Introduced new button for autoPyLoT.
2017-05-18 11:02:20 +02:00
Ludger Küperkoch
b979649e82
Cosmetics.
2017-05-18 10:31:59 +02:00
d81fb3e2e9
several bugfixes, mainly on map_projection with updated pick structure as part of event class
2017-05-17 13:25:41 +02:00
55bc0de036
working on connection between picks/autopicks of different tools [WIP], to do: fix array map number of picks/points mismatch in map
2017-05-16 17:26:42 +02:00
ba58cb548b
bugfix iterating over same index as eventBox index
2017-05-16 14:20:32 +02:00
f43611aeda
added pickdlg to tune autopick, small fixes; to do: add manual picks
2017-05-16 13:41:35 +02:00
cae5c961b0
some fixes calling autopylot (figures=None), added log for autoTuner
2017-05-15 17:21:22 +02:00
a2ab98c202
added station list to TuneAutopicker
2017-05-15 12:03:53 +02:00
4d9c7b02cf
autoPyLoT: figure beautification
...
also added nav toolbar to TuneAutopicker
2017-05-15 11:21:45 +02:00
77b076d560
threading for tuneAutopicker working now, to do: change figures (vfill), tight layout?
2017-05-12 15:40:19 +02:00
184983bc87
WIP: figure generating in threads partly working
2017-05-12 11:03:41 +02:00
f58d17be14
WIP restructuring fig_dict to be created inside Qt Main Thread
2017-05-11 17:15:20 +02:00
Ludger Küperkoch
d1354a33b1
Reintroduced activation of compare_button, spuriously removed formerly.
2017-05-11 08:33:08 +02:00
6847bfe8c4
WIP autopick parameters
...
to do: save/load/station+trace selection
2017-05-10 16:28:07 +02:00
Ludger Küperkoch
89a70aae0b
Enabled comparison button if manual and automatic picks are available.
2017-05-09 18:22:23 +02:00
6563b01293
bugfix self._inputs not assigned
2017-05-04 11:50:28 +02:00
Ludger Küperkoch
e9660eea9c
Exchanged Reference Set with Tuning Set to be consistent to reference picking cook book.
2017-05-03 15:38:54 +02:00
50ee351995
added scrollbar vor main wf plot for huge datasets, some changes in basemap figure size
2017-05-03 15:16:48 +02:00
413a921e5d
small fixes
2017-05-03 11:28:43 +02:00
fce0c98a89
Merge remote-tracking branch 'origin/develop' into develop
2017-05-02 12:19:16 +02:00
b0c80075fa
small fix, preventing access to drag and drop in open folders dialog
2017-05-02 12:13:55 +02:00
Ludger Küperkoch
e5189fd3aa
Disable additional buttons when overview plot is cleared
2017-04-28 16:01:31 +02:00
Ludger Küperkoch
94bf08df60
Disabled/enabled locationInfo button.
2017-04-28 13:56:28 +02:00
Ludger Küperkoch
312932ce5e
Disabled/enabled saveProject button.
2017-04-28 13:47:24 +02:00
Ludger Küperkoch
39a7ce2d89
New project icon.
2017-04-28 13:42:57 +02:00
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
