diff --git a/COPYING b/COPYING new file mode 100644 index 0000000000000000000000000000000000000000..e32513cc94131b2f2f163b024aaed0a18858ad37 --- /dev/null +++ b/COPYING @@ -0,0 +1,15 @@ +## License +GNU General Public License, Version 3, 29 June 2007 + +Copyright © 2021 Helmholtz Centre Potsdam GFZ German Research Centre for Geosciences, Potsdam, Germany + +RST-Evaluation is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + +RST-Evaluation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program. If not, see . + +## Contact +* Michael Rudolf; +rudolf@geo.tu-darmstadt.de +https://orcid.org/0000-0002-5077-5221 diff --git a/Legacy/FileConversion/ConvertAsciitoTXT.py b/Legacy/FileConversion/ConvertAsciitoTXT.py index 7c4de09123597224ad87969c34a4c0c808289545..045673202c201e53db3d286c9cf32e4d49197d76 100644 --- a/Legacy/FileConversion/ConvertAsciitoTXT.py +++ b/Legacy/FileConversion/ConvertAsciitoTXT.py @@ -1,4 +1,18 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Converts all *.asc files in the folder given in `path_in` and creates a time series plot in the folder `path_out`. This script requires `rstevaluation` to diff --git a/Legacy/FileConversion/ConvertTDMStoTXT.py b/Legacy/FileConversion/ConvertTDMStoTXT.py index 9747a52dbf779daa2c00356d5085765deadfe4ec..5c461e314fa63f86c88c0c0ec501d662147670b6 100644 --- a/Legacy/FileConversion/ConvertTDMStoTXT.py +++ b/Legacy/FileConversion/ConvertTDMStoTXT.py @@ -1,4 +1,18 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Converts all *.tdms files in the folder given in `path_in` and creates a time series plot in the folder `path_out`. This script requires `rstevaluation` to diff --git a/Legacy/FileConversion/ConvertVSTTDMStoTXT.py b/Legacy/FileConversion/ConvertVSTTDMStoTXT.py index 6985bc17c7a8ff008a24704c64032ccd107e2f66..3253aa5b10013407257f3c11d7715a93a594a388 100644 --- a/Legacy/FileConversion/ConvertVSTTDMStoTXT.py +++ b/Legacy/FileConversion/ConvertVSTTDMStoTXT.py @@ -1,4 +1,18 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Converts all *.tdms files in the folder given in `path_in` and creates a velocity stepping plot for each of them in the folder `path_out`. This script diff --git a/Legacy/ManualPicking/evaluate_picks.py b/Legacy/ManualPicking/evaluate_picks.py index a897c2de3db325aedc5963ceeae36ca08afea3b1..f256072b0f5e37223c0e90e776b58d4de6ab6ecd 100644 --- a/Legacy/ManualPicking/evaluate_picks.py +++ b/Legacy/ManualPicking/evaluate_picks.py @@ -1,4 +1,18 @@ #!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . import h5py import matplotlib as mpl diff --git a/Legacy/ManualPicking/manual_pick.py b/Legacy/ManualPicking/manual_pick.py index 5df138110e2d6041392c6f47e53cf8a39c7621d7..32e27076650642422583b33582eed375861149ff 100644 --- a/Legacy/ManualPicking/manual_pick.py +++ b/Legacy/ManualPicking/manual_pick.py @@ -1,4 +1,18 @@ #!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . import h5py import matplotlib as mpl diff --git a/Legacy/ManualPicking/rstmanpick.py b/Legacy/ManualPicking/rstmanpick.py index 3e47fcb4944c6355a7d82f67564eb9ac65794d99..c6a99377fb917df8c1736544c41c2238ec8df267 100644 --- a/Legacy/ManualPicking/rstmanpick.py +++ b/Legacy/ManualPicking/rstmanpick.py @@ -1,4 +1,18 @@ #!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . ''' rstmanpick.py diff --git a/Legacy/RSTanalysis/RST/Scripts/RSTanalysis.py b/Legacy/RSTanalysis/RST/Scripts/RSTanalysis.py index 26d02eed2c84d377c8d19da6e4c70e8598f11a50..62dae23f721d03cd1fff5a08ea2495e95aaefb24 100644 --- a/Legacy/RSTanalysis/RST/Scripts/RSTanalysis.py +++ b/Legacy/RSTanalysis/RST/Scripts/RSTanalysis.py @@ -1,4 +1,18 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . ''' Spyder Editor Authors: Michael Warsitzka, Matthias Rosenau, Malte Ritter, Michael Rudolf diff --git a/Legacy/RSTanalysis/VST/Scripts/VSTanalysis.py b/Legacy/RSTanalysis/VST/Scripts/VSTanalysis.py index 5c259a0add7da6b1e5543bfb43ce99d72c472626..26a16c26659808f986b26ed9d7c511b4eaa19897 100644 --- a/Legacy/RSTanalysis/VST/Scripts/VSTanalysis.py +++ b/Legacy/RSTanalysis/VST/Scripts/VSTanalysis.py @@ -1,4 +1,18 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Spyder Editor Authors: Michael Warsitzka, Matthias Rosenau, Malte Ritter, Michael Rudolf diff --git a/build.cmd b/build.cmd index 73891b8578b840889d234fe656333c9a3224816d..522c52f6be31a0339680ab73287404bb53bc9012 100644 --- a/build.cmd +++ b/build.cmd @@ -2,10 +2,10 @@ :: for windows. @ECHO OFF :: Compute requirements.txt -pipreqs --no-pin --force --print rstevaluation >> requirements.txt -@REM pipreqs --no-pin --print FileConversion >> requirements.txt -@REM pipreqs --no-pin --print ManualPicking >> requirements.txt -@REM pipreqs --no-pin --print RSTAnalysis >> requirements.txt +pipreqs --mode no-pin --force rstevaluation +@REM pipreqs --mode no-pin --print FileConversion >> requirements.txt +@REM pipreqs --mode no-pin --print ManualPicking >> requirements.txt +@REM pipreqs --mode no-pin --print RSTAnalysis >> requirements.txt :: Removes duplicates in requirements.txt setlocal disableDelayedExpansion diff --git a/requirements.txt b/requirements.txt index aa0e4eac9d006e46daaa810013b6e0a1d38e6fc6..8f835e3d36157eab28887412f6fc1bb6a31437c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ +animation +h5py matplotlib -nose npTDMS numpy pandas scipy +setuptools +terminal_animation tqdm -traitlets uncertainties -uncertainties.egg pyqt5 -terminal-animation \ No newline at end of file diff --git a/rstevaluation/rstevaluation/RST_pick_GUI.py b/rstevaluation/rstevaluation/RST_pick_GUI.py index 703a8b52cface0881f101f3c1f70abb800075932..a4db29510f53e3249afc29fd3d6e19b3f958f688 100644 --- a/rstevaluation/rstevaluation/RST_pick_GUI.py +++ b/rstevaluation/rstevaluation/RST_pick_GUI.py @@ -1,5 +1,18 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . # @Author: M. Rudolf, M. Warsitzka # @Date: 2019-02-20 12:00:00 # @Last Modified by: M. Rudolf diff --git a/rstevaluation/rstevaluation/__main__.py b/rstevaluation/rstevaluation/__main__.py index 9c7ae061912183ab44171a59db77125858d6b6ef..71009dc4f25b348d2b70d17cd031d2d2534e5591 100644 --- a/rstevaluation/rstevaluation/__main__.py +++ b/rstevaluation/rstevaluation/__main__.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Runs rst-evaluation with a GUI """ from rstevaluation import RST_pick_GUI diff --git a/rstevaluation/rstevaluation/analysis.py b/rstevaluation/rstevaluation/analysis.py index 56824ca0606afe2702f9192e169d3c2b75b3c947..fb78220e3ee69a5fb1220809366f5274abb9064f 100644 --- a/rstevaluation/rstevaluation/analysis.py +++ b/rstevaluation/rstevaluation/analysis.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Advanced data analysis functions for ringshear tester data """ import numpy as np import scipy.optimize as spopt diff --git a/rstevaluation/rstevaluation/classes.py b/rstevaluation/rstevaluation/classes.py index c8bb0c44c28a6b6d5f7a59765342043b59a2079c..e51d885f872e577a89273f38026ee723d4193ca3 100644 --- a/rstevaluation/rstevaluation/classes.py +++ b/rstevaluation/rstevaluation/classes.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Contains some custom classes for the use with the main GUI """ import tkinter as tk diff --git a/rstevaluation/rstevaluation/data.py b/rstevaluation/rstevaluation/data.py index 52ce91cafb8742961b1050f527e4d475b4d94bc4..afe66cd0b491442d37cc06f51a9723e36145afe0 100644 --- a/rstevaluation/rstevaluation/data.py +++ b/rstevaluation/rstevaluation/data.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Functions for data handling such as filtering, downsampling and fitting """ import nptdms diff --git a/rstevaluation/rstevaluation/files.py b/rstevaluation/rstevaluation/files.py index 5a9254e056a07f511605ef9331111198b24d3f3c..117f62d5f250e56719ed341919b4736f98a764c7 100644 --- a/rstevaluation/rstevaluation/files.py +++ b/rstevaluation/rstevaluation/files.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Functions for file operations for rst-evaluation """ import codecs @@ -299,11 +314,18 @@ def saveStrength(path, name, strength): label = ['_peak', '_dynamic', '_reactivation'] for i in range(0, 3): Stren = np.vstack((strength[0], strength[i+1])) - header_stress = 'Normal stress [Pa]'+'\t'+'Shear strength [Pa]' + header_stress = ( + 'Normal stress [Pa]\tShear strength [Pa]\t' + + 'Stddev.Shear strength [Pa]' + ) with open(os.path.join(path, name+label[i]+'.txt'), "w") as f: f.write(header_stress+'\n') for strdat in Stren.T: - f.write('{:}\t{:fP}'.format(strdat[0], strdat[1])) + sign = str(strdat[0]) + stren = '{:f}'.format(strdat[1]) + stren = stren.replace('+/-', '\t') + + f.write('%s\t%s\n' % (sign, stren)) f.closed @@ -317,7 +339,7 @@ def saveFric(path, name, fricmut, fricstd): '\t' + \ 'Cohesion [Pa]' + \ '\t' + \ - 'Std deviation (Coh.) [Pa]' + 'Std. deviation (Coh.) [Pa]' with open(os.path.join(path, name+'_fricstd.txt'), 'w') as f: f.write(header+'\n') f_string = '' @@ -325,24 +347,24 @@ def saveFric(path, name, fricmut, fricstd): cferr = unc.ufloat(fricstd[0][2], fricstd[0][3]) f_string += ( 'Peak friction:' + - '\t{:fP}'.format(mferr) + - '\t{:fP}'.format(cferr) + + '\t{:f}'.format(mferr).replace('+/-', '\t') + + '\t{:f}'.format(cferr).replace('+/-', '\t') + '\n' ) mferr = unc.ufloat(fricstd[1][0], fricstd[1][1]) cferr = unc.ufloat(fricstd[1][2], fricstd[1][3]) f_string += ( 'Dynamic friction:' + - '\t{:fP}'.format(mferr) + - '\t{:fP}'.format(cferr) + + '\t{:f}'.format(mferr).replace('+/-', '\t') + + '\t{:f}'.format(cferr).replace('+/-', '\t') + '\n' ) mferr = unc.ufloat(fricstd[2][0], fricstd[2][1]) cferr = unc.ufloat(fricstd[2][2], fricstd[2][3]) f_string += ( 'Reactivation friction:' + - '\t{:fP}'.format(mferr) + - '\t{:fP}'.format(cferr) + + '\t{:f}'.format(mferr).replace('+/-', '\t') + + '\t{:f}'.format(cferr).replace('+/-', '\t') + '\n' ) f.write(f_string) @@ -352,20 +374,20 @@ def saveFric(path, name, fricmut, fricstd): f_string = '' f_string += ( 'Peak friction:' + - '\t{:fP}'.format(fricmut[0][0]) + - '\t{:fP}'.format(fricmut[0][1]) + + '\t{:f}'.format(fricmut[0][0]).replace('+/-', '\t') + + '\t{:f}'.format(fricmut[0][1]).replace('+/-', '\t') + '\n' ) f_string += ( 'Dynamic friction:' + - '\t{:fP}'.format(fricmut[1][0]) + - '\t{:fP}'.format(fricmut[1][1]) + + '\t{:f}'.format(fricmut[1][0]).replace('+/-', '\t') + + '\t{:f}'.format(fricmut[1][1]).replace('+/-', '\t') + '\n' ) f_string += ( 'Reactivation friction:' + - '\t{:fP}'.format(fricmut[2][0]) + - '\t{:fP}'.format(fricmut[2][1]) + + '\t{:f}'.format(fricmut[2][0]).replace('+/-', '\t') + + '\t{:f}'.format(fricmut[2][1]).replace('+/-', '\t') + '\n' ) f.write(f_string) diff --git a/rstevaluation/rstevaluation/get_icons.py b/rstevaluation/rstevaluation/get_icons.py index f75bf2341fdcb8147220515159ce90fd5b69e39a..43649b4a5c4b5f9d393a65703ff8b90e2f3ce8ce 100644 --- a/rstevaluation/rstevaluation/get_icons.py +++ b/rstevaluation/rstevaluation/get_icons.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Provides PhotoImage objects for all images """ import tkinter as tk diff --git a/rstevaluation/rstevaluation/mainGUI.py b/rstevaluation/rstevaluation/mainGUI.py index 109ee73f19d12282151a9888cb454507b2314330..77d38c489f5f978d60c05597ebe98ba378a68cd5 100644 --- a/rstevaluation/rstevaluation/mainGUI.py +++ b/rstevaluation/rstevaluation/mainGUI.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Contains class for main graphical user interface. """ import configparser import json diff --git a/rstevaluation/rstevaluation/picking.py b/rstevaluation/rstevaluation/picking.py index bceb13301abcf33aa5d02faeea72b0b7d3fb6f94..16d4430ddf9900496e8d6e965c9324de5084fa90 100644 --- a/rstevaluation/rstevaluation/picking.py +++ b/rstevaluation/rstevaluation/picking.py @@ -1,4 +1,18 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Picking functions for rst-evaluation. """ @@ -266,9 +280,10 @@ def _pick_base_plot(cur_dat, config): if (np.abs(diffstress)/normstress) > 0.05: ax.annotate( '! Predefined normal stress difference > 5 % !', - (.5, .9), + (.5, .99), xycoords='axes fraction', horizontalalignment='center', + verticalalignment='top', color='r' ) else: diff --git a/rstevaluation/rstevaluation/plots.py b/rstevaluation/rstevaluation/plots.py index aabda1eb7c1f9e4efd9b1a96f8bb9437702c8405..14fc5a183120cda961255efae7a6a43653a35e33 100644 --- a/rstevaluation/rstevaluation/plots.py +++ b/rstevaluation/rstevaluation/plots.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Plotting functions for rst-evaluation """ import os diff --git a/rstevaluation/rstevaluation/processing.py b/rstevaluation/rstevaluation/processing.py index 6bd263c56586cf296a416c5f1047e8cdd5dde9da..b8718b9a503d8a1f85aa3e3232a2b022f54162bd 100644 --- a/rstevaluation/rstevaluation/processing.py +++ b/rstevaluation/rstevaluation/processing.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Contains functions for full processing of the data. """ diff --git a/rstevaluation/tests/batch_mode.py b/rstevaluation/tests/batch_mode.py index 26deeaed8853d4c753d63717860d6c07f012d59e..21c592305bde02de578c889083d2272d39391a4d 100644 --- a/rstevaluation/tests/batch_mode.py +++ b/rstevaluation/tests/batch_mode.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . """ Runs rst-evaluation in batch mode to quickly go over multiple folders """ import configparser diff --git a/rstevaluation/tests/function_timing.py b/rstevaluation/tests/function_timing.py index eb52de2feab041299b91fd729295a6c29adac2b7..81d42fa2ac5000477262c221f9e0124ea591bf1b 100644 --- a/rstevaluation/tests/function_timing.py +++ b/rstevaluation/tests/function_timing.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . import numpy as np import rstevaluation.tools.analysis as rstanalysis diff --git a/rstevaluation/tests/tdms_props.py b/rstevaluation/tests/tdms_props.py index 243f523d064fb3bec83a8aab5e2c4b0dcb08e1b9..c4bf2a8157afd054571d1e6205681fbba1910b8c 100644 --- a/rstevaluation/tests/tdms_props.py +++ b/rstevaluation/tests/tdms_props.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . import nptdms import numpy as np diff --git a/rstevaluation/tests/test.py b/rstevaluation/tests/test.py index 24e2b4437e940bc11e3768baccdf9432b85c8d83..350c8e07432c78efa636070c6b6457a88705f3d3 100644 --- a/rstevaluation/tests/test.py +++ b/rstevaluation/tests/test.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . import matplotlib.collections as mplcoll import matplotlib.pyplot as plt import numpy as np diff --git a/setup.cfg b/setup.cfg index f07191dbb84dd2fe0ce605067a92152c917ca61a..c0eb6e64f00abc22faa8d20b42efd44af83274a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = rstevaluation -version = 0.3.0 +version = 0.3.1 author = M. Warsitzka, M. Rudolf author-email = michael.rudolf@gfz-potsdam.de summary = Package to work with ring shear tester data from the Helmholtz Laboratory for Tectonic Modelling at the German Research Centre for Geoscience. diff --git a/setup.py b/setup.py index 3c5ce2d0b33e8581b2f5441f7cd040ea1726ba55..184042344d2757a161398ec5249dd98e7b3d4311 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,18 @@ +#!/usr/bin/env python3 +# This file is part of rstevaluation. + +# rstevaluation is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# rstevaluation is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with rstevaluation. If not, see . from os import path import setuptools