Merge branch 'main' of https://github.com/RJbalikian/SPRIT-HVSR

RJbalikian · Oct 30, 2023 · facedb9 · facedb9
2 parents 5cf5af2 + 7ea0d12
commit facedb9
Show file tree

Hide file tree

Showing 20 changed files with 3,531 additions and 1,231 deletions.
diff --git a/docs/main.html b/docs/main.html
diff --git a/docs/sprit_gui.html b/docs/sprit_gui.html
diff --git a/docs/sprit_hvsr.html b/docs/sprit_hvsr.html
diff --git a/docs/sprit_utils.html b/docs/sprit_utils.html
@@ -47,7 +47,7 @@ <h1 class="title">Module <code>sprit.sprit_utils</code></h1>
 channel_order = {&#39;Z&#39;: 0, &#39;1&#39;: 1, &#39;N&#39;: 1, &#39;2&#39;: 2, &#39;E&#39;: 2}
 
 def check_gui_requirements():
-    print(&#34;Checking requirements for gui&#34;)
+    #First, check requirements
     # Define a command that tries to open a window
     command = &#34;python -c \&#34;import tkinter; tkinter.Tk()\&#34;&#34;
 
@@ -60,7 +60,7 @@ <h1 class="title">Module <code>sprit.sprit_utils</code></h1>
         oktoproceed=True
     else:
         oktoproceed=False
-        print(&#34;GUI window could not be created.&#34;)
+        print(&#34;GUI window cannot be created.&#34;)
 
     return oktoproceed
 
@@ -339,6 +339,16 @@ <h1 class="title">Module <code>sprit.sprit_utils</code></h1>
 #Make input data (dict) into sprit_hvsr class
 def make_it_classy(input_data, verbose=False):
     if isinstance(input_data, (sprit_hvsr.HVSRData, sprit_hvsr.HVSRBatch)):
+        for k, v in input_data.items():
+            if k==&#39;input_params&#39;:
+                for kin in input_data[&#39;input_params&#39;].keys():
+                    if kin not in input_data.keys():
+                        input_data[kin] = input_data[&#39;input_params&#39;][kin]
+            if k==&#39;params&#39;:
+                for kin in input_data[&#39;params&#39;].keys():
+                    print(kin)
+                    if kin not in input_data.keys():
+                        input_data[kin] = input_data[&#39;params&#39;][kin]                
         output_class = input_data
     else:
         output_class = sprit_hvsr.HVSRData(input_data)
@@ -464,7 +474,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
 <span>Expand source code</span>
 </summary>
 <pre><code class="python">def check_gui_requirements():
-    print(&#34;Checking requirements for gui&#34;)
+    #First, check requirements
     # Define a command that tries to open a window
     command = &#34;python -c \&#34;import tkinter; tkinter.Tk()\&#34;&#34;
 
@@ -477,7 +487,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
         oktoproceed=True
     else:
         oktoproceed=False
-        print(&#34;GUI window could not be created.&#34;)
+        print(&#34;GUI window cannot be created.&#34;)
 
     return oktoproceed
 
@@ -855,6 +865,16 @@ <h2 id="returns">Returns</h2>
 </summary>
 <pre><code class="python">def make_it_classy(input_data, verbose=False):
     if isinstance(input_data, (sprit_hvsr.HVSRData, sprit_hvsr.HVSRBatch)):
+        for k, v in input_data.items():
+            if k==&#39;input_params&#39;:
+                for kin in input_data[&#39;input_params&#39;].keys():
+                    if kin not in input_data.keys():
+                        input_data[kin] = input_data[&#39;input_params&#39;][kin]
+            if k==&#39;params&#39;:
+                for kin in input_data[&#39;params&#39;].keys():
+                    print(kin)
+                    if kin not in input_data.keys():
+                        input_data[kin] = input_data[&#39;params&#39;][kin]                
         output_class = input_data
     else:
         output_class = sprit_hvsr.HVSRData(input_data)

diff --git a/setup.py b/setup.py
@@ -8,7 +8,8 @@
     author= "Riley Balikian",
     author_email = "balikian@illinois.edu",
     version="0.1.50",
-    package_data={'sprit': ['resources/*', 'resources/icon/*', 'resources/themes/*', 'resources/themes/forest-dark/*', 'resources/themes/forest-light/*', 'resources/sample_data/*',]},
+    package_data={'sprit': ['resources/*', 'resources/icon/*', 'resources/themes/*', 'resources/themes/forest-dark/*', 
+                            'resources/themes/forest-light/*', 'resources/sample_data/*','resources/settings/*']},
     long_description_content_type="text/markdown",
     long_description=long_description,
     packages=find_packages(),

diff --git a/sprit/__init__.py b/sprit/__init__.py
@@ -10,7 +10,9 @@
 from sprit.sprit_hvsr import(
     run,
     export_data,
+    export_settings,
     import_data,
+    import_settings,
     input_params,
     gui,
     get_metadata,
@@ -51,8 +53,10 @@
             'get_char',
             'time_it',
             'checkifpath',
-            'export_data', 
+            'export_data',
+            'export_settings',
             'import_data',
+            'import_settings',
             'input_params',
             'gui',
             'get_metadata',

diff --git a/sprit/__pycache__/__init__.cpython-310.pyc b/sprit/__pycache__/__init__.cpython-310.pyc
diff --git a/sprit/__pycache__/__init__.cpython-311.pyc b/sprit/__pycache__/__init__.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_gui.cpython-310.pyc b/sprit/__pycache__/sprit_gui.cpython-310.pyc
diff --git a/sprit/__pycache__/sprit_gui.cpython-311.pyc b/sprit/__pycache__/sprit_gui.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_hvsr.cpython-310.pyc b/sprit/__pycache__/sprit_hvsr.cpython-310.pyc
diff --git a/sprit/__pycache__/sprit_hvsr.cpython-311.pyc b/sprit/__pycache__/sprit_hvsr.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_utils.cpython-310.pyc b/sprit/__pycache__/sprit_utils.cpython-310.pyc
diff --git a/sprit/__pycache__/sprit_utils.cpython-311.pyc b/sprit/__pycache__/sprit_utils.cpython-311.pyc
diff --git a/sprit/resources/settings/gui_theme.json b/sprit/resources/settings/gui_theme.json
@@ -0,0 +1 @@
+{"theme_name": "alt"}
diff --git a/sprit/resources/settings/instrument_settings.inst b/sprit/resources/settings/instrument_settings.inst
@@ -0,0 +1,10 @@
+{
+  "instrument": "Raspberry Shake",
+  "net": "AM",
+  "sta": "RAC84",
+  "loc": "00",
+  "cha": ["EHZ", "EHN", "EHE"],
+  "depth": 0,
+  "metapath": "c:/Users/balikian/LocalData/CodesScripts/Github/SPRIT-HVSR/sprit/resources/rs3dv5plus_metadata.inv",
+  "hvsr_band": [0.4, 40]
+}
diff --git a/sprit/resources/settings/processing_settings.proc b/sprit/resources/settings/processing_settings.proc
@@ -0,0 +1,69 @@
+{
+  "fetch_data": 
+		{
+		"source": "file",
+		"trim_dir": null,
+		"export_format": "mseed",
+		"detrend": "spline",
+		"detrend_order": 2,
+		"update_metadata": true,
+		"plot_input_stream": false,
+		"verbose": false,
+		"kwargs":
+			{}
+		},
+
+  "remove_noise": 
+		{
+		"remove_method": "auto",
+		"sat_percent": 0.995,
+		"noise_percent": 0.8,
+		"sta": 2,
+		"lta": 30,
+		"stalta_thresh": [  0.5,   5 ],
+		"warmup_time": 0,
+		"cooldown_time": 0,
+		"min_win_size": 1,
+		"remove_raw_noise": false,
+		"verbose": false
+		},
+
+  "generate_ppsds": 
+		{
+		"remove_outliers": true,
+		"outlier_std": 3,
+		"verbose": false,
+		"ppsd_kwargs":
+			{   "skip_on_gaps": true,   "db_bins": [    -200,     -50,     1.0   ],   "ppsd_length": 30.0,   "overlap": 0.5,   "special_handling": null,   "period_smoothing_width_octaves": 1.0,   "period_step_octaves": 0.03125,   "period_limits": [    0.025,     2.5   ] }
+		},
+
+  "process_hvsr": 
+		{
+		"method": 3,
+		"smooth": true,
+		"freq_smooth": "konno ohmachi",
+		"f_smooth_width": 40,
+		"resample": true,
+		"outlier_curve_std": 1.75,
+		"verbose": false
+		},
+
+  "check_peaks": 
+		{
+		"hvsr_band": [  0.4,   40 ],
+		"peak_selection": "max",
+		"peak_freq_range": [  0.4,   40 ],
+		"verbose": false
+		},
+
+  "get_report": 
+		{
+		"report_format": "print",
+		"plot_type": "HVSR p ann C+ p ann Spec",
+		"export_path": null,
+		"return_results": false,
+		"csv_overwrite_opt": "append",
+		"no_output": false,
+		"verbose": false
+		}
+}
diff --git a/sprit/sprit_gui.py b/sprit/sprit_gui.py
@@ -3,6 +3,7 @@
 import datetime
 import functools
 import linecache
+import json
 import os
 import pathlib
 import pkg_resources
@@ -34,6 +35,14 @@
     pass
 
 global spritApp
+global current_theme_name
+
+resource_dir = pathlib.Path(pkg_resources.resource_filename(__name__, 'resources/'))
+settings_dir = resource_dir.joinpath('settings')
+gui_theme_file = settings_dir.joinpath('gui_theme.json')
+with open(gui_theme_file, 'r') as f:
+    curr_gui_dict = json.load(f)
+current_theme_name = curr_gui_dict['theme_name']
 
 #Decorator that catches errors and warnings (to be modified later for gui)
 def catch_errors(func):
@@ -151,10 +160,11 @@ def __init__(self, master):
         self.darkthemepath = pathlib.Path(pkg_resources.resource_filename(__name__, "resources/themes/forest-dark.tcl"))
         self.lightthemepath = pathlib.Path(pkg_resources.resource_filename(__name__, "resources/themes/forest-light.tcl"))
 
+
+
         # Create the style object
         self.style = ttk.Style(master)
-        self.master.tk.call('source', self.lightthemepath)
-        #self.style.theme_use('default')
+        #
         #self.style.theme_use('forest-light')
 
         self.create_menubar()
@@ -164,6 +174,13 @@ def __init__(self, master):
         self.master.columnconfigure(0, weight=1)        
 
 
+        if 'forest' in current_theme_name:
+            if 'light' in current_theme_name:
+                self.master.tk.call('source', self.lightthemepath)
+            else:
+                self.master.tk.call('source', self.darkthemepath)
+        else:
+            self.style.theme_use(current_theme_name)
         # Create the dark theme
         #self.style.theme_create("dark", parent="alt", settings={
         #    "TLabel": {"configure": {"background": "black", "foreground": "white"}},
@@ -211,7 +228,33 @@ def create_menubar(self):
         def on_theme_select():
             # Set the theme based on the selected value
             self.style = ttk.Style()
-
+
+            #Update the theme file so the new theme opens on reboot
+            prev_theme = curr_gui_dict['theme_name']
+            curr_gui_dict['theme_name'] = self.theme_var.get()
+            with open(gui_theme_file, 'w') as f:
+                json.dump(curr_gui_dict, f)
+
+            def apply_theme():
+                if 'forest' in self.theme_var.get():
+                    if self.theme_var.get()=='forest-dark' and 'forest-dark' not in self.style.theme_names():
+                        self.master.tk.call('source', self.darkthemepath)
+                    elif self.theme_var.get()=='forest-light' and 'forest-light' not in self.style.theme_names():
+                        self.master.tk.call('source', self.lightthemepath)            
+                self.master.tk.call("ttk::style", "theme", "use", self.theme_var.get())
+
+            if curr_gui_dict['theme_name']=='forest-light' or curr_gui_dict['theme_name'] == 'forest-dark':
+                do_reboot = messagebox.askyesno('App Restart Required', 
+                                             f"It is recommended to restart the SpRIT GUI at this time to apply this theme. If not, you may continue but theme errors may occur. Click No to retain current theme ({prev_theme}) \nReboot now?",
+                                             )
+                print(do_reboot)
+                if do_reboot:
+                    reboot_app()
+                else:
+                    self.theme_var.set(prev_theme)
+            else:
+                apply_theme()
+
             """An attempt to get the backgrounds right
             def apply_to_all_children(widget, func):
                 Recursively apply a function to all child widgets of a given widget
@@ -229,12 +272,7 @@ def change_background_color(widget):
             
             apply_to_all_children(self.master, change_background_color)
             """
-            if 'forest' in self.theme_var.get():
-                if self.theme_var.get()=='forest-dark' and 'forest-dark' not in self.style.theme_names():
-                    self.master.tk.call('source', self.darkthemepath)
-                elif self.theme_var.get()=='forest-light' and 'forest-light' not in self.style.theme_names():
-                    self.master.tk.call('source', self.lightthemepath)            
-            self.master.tk.call("ttk::style", "theme", "use", self.theme_var.get())
+
             #self.master.tk.call("ttk::setTheme", self.theme_var.get())
 
             #self.style.theme_use(self.theme_var.get())
@@ -250,7 +288,7 @@ def export_parameters(self):
             filepath = filedialog.asksaveasfilename()
 
         self.theme_menu = tk.Menu(self.menubar, tearoff=0)
-        self.theme_var = tk.StringVar(value="Default")
+        self.theme_var = tk.StringVar(value=current_theme_name)
         self.theme_menu.add_radiobutton(label="Default", variable=self.theme_var, value="default", command=on_theme_select)
         self.theme_menu.add_radiobutton(label="Clam", variable=self.theme_var, value="clam", command=on_theme_select)
         self.theme_menu.add_radiobutton(label="Alt", variable=self.theme_var, value="alt", command=on_theme_select)
@@ -495,8 +533,8 @@ def report_results(hvsr_results):
             self.peakTest6ResultText.configure(text=hvsr_results['BestPeak']['Report']['Sa'][:-1])
             self.peakTest6Result.configure(text=hvsr_results['BestPeak']['Report']['Sa'][-1])
 
-            peakPass = (hvsr_results['BestPeak']['PassList']['PeakFreqClarityBelow'] +
-                    hvsr_results['BestPeak']['PassList']['PeakFreqClarityAbove']+
+            peakPass = (hvsr_results['BestPeak']['PassList']['PeakProminenceBelow'] +
+                    hvsr_results['BestPeak']['PassList']['PeakProminenceAbove']+
                     hvsr_results['BestPeak']['PassList']['PeakAmpClarity']+
                     hvsr_results['BestPeak']['PassList']['FreqStability']+
                     hvsr_results['BestPeak']['PassList']['PeakStability_FreqStD']+
@@ -3036,6 +3074,13 @@ def on_closing():
     root.destroy()
     exit()
 
+def reboot_app():
+    """Restarts the current program.
+    Note: this function does not return. Any cleanup action (like
+    saving data) must be done before calling this function."""
+    python = sys.executable
+    os.execl(python, python, * sys.argv)
+
 if __name__ == "__main__":
     can_gui = sprit_utils.check_gui_requirements()