From 69e88ae01fdcba61a8dd131d4e78e1a9476e68a8 Mon Sep 17 00:00:00 2001 From: Michael Rudolf Date: Fri, 3 Dec 2021 10:11:33 +0100 Subject: [PATCH 1/6] Formatting fix for #10: - Fixed missing newline character - Made stddeviations separate columns --- rstevaluation/rstevaluation/files.py | 37 +++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/rstevaluation/rstevaluation/files.py b/rstevaluation/rstevaluation/files.py index 5a9254e..6ef27a5 100644 --- a/rstevaluation/rstevaluation/files.py +++ b/rstevaluation/rstevaluation/files.py @@ -299,11 +299,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 +324,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 +332,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 +359,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) -- GitLab From 65d9abb191d3655891eab8bae14f2c0203cb4fcb Mon Sep 17 00:00:00 2001 From: Michael Rudolf Date: Fri, 3 Dec 2021 10:13:05 +0100 Subject: [PATCH 2/6] Moved stress difference warning a bit higher. --- rstevaluation/rstevaluation/picking.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rstevaluation/rstevaluation/picking.py b/rstevaluation/rstevaluation/picking.py index bceb133..fd9a7f7 100644 --- a/rstevaluation/rstevaluation/picking.py +++ b/rstevaluation/rstevaluation/picking.py @@ -266,9 +266,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: -- GitLab From 4ae29f6b71bc4215cdaf70c28c3d07fbeb47f151 Mon Sep 17 00:00:00 2001 From: Michael Rudolf Date: Fri, 3 Dec 2021 10:13:57 +0100 Subject: [PATCH 3/6] Minor version increment. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f07191d..c0eb6e6 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. -- GitLab From 0a96626a0d2b3ead5923975401cd2996d98c6714 Mon Sep 17 00:00:00 2001 From: Michael Rudolf Date: Fri, 17 Dec 2021 11:23:13 +0100 Subject: [PATCH 4/6] Preparations for new license --- Legacy/FileConversion/ConvertAsciitoTXT.py | 16 +++++++++++++++- Legacy/FileConversion/ConvertTDMStoTXT.py | 16 +++++++++++++++- Legacy/FileConversion/ConvertVSTTDMStoTXT.py | 16 +++++++++++++++- Legacy/ManualPicking/evaluate_picks.py | 14 ++++++++++++++ Legacy/ManualPicking/manual_pick.py | 14 ++++++++++++++ Legacy/ManualPicking/rstmanpick.py | 14 ++++++++++++++ Legacy/RSTanalysis/RST/Scripts/RSTanalysis.py | 16 +++++++++++++++- Legacy/RSTanalysis/VST/Scripts/VSTanalysis.py | 16 +++++++++++++++- rstevaluation/rstevaluation/RST_pick_GUI.py | 15 ++++++++++++++- rstevaluation/rstevaluation/__main__.py | 15 +++++++++++++++ rstevaluation/rstevaluation/analysis.py | 15 +++++++++++++++ rstevaluation/rstevaluation/classes.py | 15 +++++++++++++++ rstevaluation/rstevaluation/data.py | 15 +++++++++++++++ rstevaluation/rstevaluation/files.py | 15 +++++++++++++++ rstevaluation/rstevaluation/get_icons.py | 15 +++++++++++++++ rstevaluation/rstevaluation/mainGUI.py | 15 +++++++++++++++ rstevaluation/rstevaluation/picking.py | 16 +++++++++++++++- rstevaluation/rstevaluation/plots.py | 15 +++++++++++++++ rstevaluation/rstevaluation/processing.py | 15 +++++++++++++++ rstevaluation/tests/batch_mode.py | 15 +++++++++++++++ rstevaluation/tests/function_timing.py | 15 +++++++++++++++ rstevaluation/tests/tdms_props.py | 15 +++++++++++++++ rstevaluation/tests/test.py | 15 +++++++++++++++ setup.py | 15 +++++++++++++++ 24 files changed, 356 insertions(+), 7 deletions(-) diff --git a/Legacy/FileConversion/ConvertAsciitoTXT.py b/Legacy/FileConversion/ConvertAsciitoTXT.py index 7c4de09..0456732 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 9747a52..5c461e3 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 6985bc1..3253aa5 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 a897c2d..f256072 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 5df1381..32e2707 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 3e47fcb..c6a9937 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 26d02ee..62dae23 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 5c259a0..26a16c2 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/rstevaluation/rstevaluation/RST_pick_GUI.py b/rstevaluation/rstevaluation/RST_pick_GUI.py index 703a8b5..a4db295 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 9c7ae06..71009dc 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 56824ca..fb78220 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 c8bb0c4..e51d885 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 52ce91c..afe66cd 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 6ef27a5..117f62d 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 diff --git a/rstevaluation/rstevaluation/get_icons.py b/rstevaluation/rstevaluation/get_icons.py index f75bf23..43649b4 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 109ee73..77d38c4 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 fd9a7f7..16d4430 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. """ diff --git a/rstevaluation/rstevaluation/plots.py b/rstevaluation/rstevaluation/plots.py index aabda1e..14fc5a1 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 6bd263c..b8718b9 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 26deeae..21c5923 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 eb52de2..81d42fa 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 243f523..c4bf2a8 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 24e2b44..350c8e0 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.py b/setup.py index 3c5ce2d..1840423 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 -- GitLab From f8c57bc87296be58182ded2973212a7d5bfa8608 Mon Sep 17 00:00:00 2001 From: Michael Rudolf Date: Fri, 17 Dec 2021 11:23:29 +0100 Subject: [PATCH 5/6] Updated Requirements --- build.cmd | 8 ++++---- requirements.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.cmd b/build.cmd index 73891b8..522c52f 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 aa0e4ea..8f835e3 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 -- GitLab From bcc2cfcfb51aa7f6ca498c7cceca42de9c376c4b Mon Sep 17 00:00:00 2001 From: Michael Rudolf Date: Fri, 17 Dec 2021 11:27:10 +0100 Subject: [PATCH 6/6] Added COPYING --- COPYING | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..e32513c --- /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 -- GitLab