Commit 13288ae3 authored by Michael Rudolf's avatar Michael Rudolf
Browse files

Several Fixes:

 - Fixed a problem caused from closing a plot by switching to Qt5Agg
 - Fixed wrong function for downsampling
 - Fixed import statements to correctly work (in Linux) untested in Windows
parent ba624407
......@@ -3,7 +3,7 @@
# @Author: M. Rudolf, M. Warsitzka
# @Date: 2019-02-20 12:00:00
# @Last Modified by: M. Rudolf
# @Last Modified time: 2021-04-30 14:09:52
# @Last Modified time: 2021-07-07 18:26:30
"""
RST_pick_GUI.py
......@@ -16,7 +16,9 @@ GUI based approach for RSTpicking
import os
import tkinter as tk
from . import mainGUI, utilities
import matplotlib as mpl
from rstevaluation import mainGUI, utilities
def run():
......@@ -29,6 +31,7 @@ def run():
app.iconbitmap(image_path)
except tk.TclError:
pass
mpl.use('qt5agg')
app.mainloop()
......
""" Runs rst-evaluation with a GUI """
from . import RST_pick_GUI
from rstevaluation import RST_pick_GUI
if __name__ == '__main__':
RST_pick_GUI.run()
......@@ -44,9 +44,9 @@ def convert(path, file_in, config):
if len(data['time']) > nsamples:
freq = 1/data['time'][1]
R = int(freq / 5)
data['velocity'] = rstdat.downsample(data['velocity'], R)
data['shearforce'] = rstdat.downsample(data['shearforce'], R)
data['normalforce'] = rstdat.downsample(data['normalforce'], R)
data['velocity'] = rstdat.downsample_data(data['velocity'], R)
data['shearforce'] = rstdat.downsample_data(data['shearforce'], R)
data['normalforce'] = rstdat.downsample_data(data['normalforce'], R)
data['time'] = np.linspace(0, data['time'][-1], len(data['velocity']))
print('Data to large... Downsampled to 5 Hz.')
......@@ -94,7 +94,6 @@ def readdat(path, file_in, config):
alternativeload, standardload, pascalload
]
filetype = check_for_type(os.path.join(path, file_in))
print('%s of type: %s' % (file_in, filetype))
if filetype: # if filetype is non zero:
with codecs.open(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment