Skip to content

input GUI bugfix #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasasonc merged 1 commit into from
Jun 19, 2025
Merged

input GUI bugfix #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions FLife/spectralData.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,8 @@ def __init__(self, input=None, window='hann', nperseg=1280,
'\nSampling interval of time signal should be given as second element of tuple `input`.')
input = (input, kwargs['dt'])

# Default input is by GUI
if input == None or input == 'GUI':
self.psd = PSDgen().get_PSD()

# needed parameters for time-history generation
if T is not None and fs is not None:
self._set_time_history(f=self.psd[:,0], psd=self.psd[:,1], T=T, fs=fs, **kwargs)


# If input is tuple, dictionary is created (backwards compatibility)
elif isinstance(input, tuple) and len(input) == 2:
if isinstance(input, tuple) and len(input) == 2:
warnings.warn('Tuple input has been deprecated. Use dictionary input instead.')
# If input is time signal
if isinstance(input[0], np.ndarray) and isinstance(input[1], (int, float)):
Expand All @@ -230,11 +221,17 @@ def __init__(self, input=None, window='hann', nperseg=1280,
self.psd = self._calculate_psd(self.data, fs=1.0/self.dt, window=window,
nperseg=nperseg, noverlap=noverlap,
trim=psd_trim_length)



# Default input is by GUI
if input == None or input == 'GUI':
self.psd = PSDgen().get_PSD()

# needed parameters for time-history generation
if T is not None and fs is not None:
self._set_time_history(f=self.psd[:,0], psd=self.psd[:,1], T=T, fs=fs, **kwargs)

# Input is dictionary a) PSD and frequency vector or b) time history and sampling interval
if isinstance(input, dict):
elif isinstance(input, dict):
if 'time_history' in input and 'dt' in input:
self.data = input['time_history']
self.dt = input['dt']
Expand Down