Merge branch 'issue-interactive' into main

FrederikLizakJohansen · Aug 28, 2024 · 7bb25e5 · 7bb25e5
2 parents 9a768cc + d1d53c1
commit 7bb25e5
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/data/AntiFluorite_Co2O.cif → debyecalculator/data/AntiFluorite_Co2O.cif b/data/AntiFluorite_Co2O.cif → debyecalculator/data/AntiFluorite_Co2O.cif
diff --git a/data/AntiFluorite_Co2O_r10.xyz → ...calculator/data/AntiFluorite_Co2O_r10.xyz b/data/AntiFluorite_Co2O_r10.xyz → ...calculator/data/AntiFluorite_Co2O_r10.xyz
diff --git a/data/ICSD_CollCode1504.cif → debyecalculator/data/ICSD_CollCode1504.cif b/data/ICSD_CollCode1504.cif → debyecalculator/data/ICSD_CollCode1504.cif
diff --git a/debyecalculator/data/__init__.py b/debyecalculator/data/__init__.py
diff --git a/data/icsd_000001_cc.cif → debyecalculator/data/icsd_000001_cc.cif b/data/icsd_000001_cc.cif → debyecalculator/data/icsd_000001_cc.cif
diff --git a/data/icsd_000029_cc.cif → debyecalculator/data/icsd_000029_cc.cif b/data/icsd_000029_cc.cif → debyecalculator/data/icsd_000029_cc.cif
diff --git a/...csd_001504_cc_r6_lc_2.85_6_tetragonal.xyz → ...csd_001504_cc_r6_lc_2.85_6_tetragonal.xyz b/...csd_001504_cc_r6_lc_2.85_6_tetragonal.xyz → ...csd_001504_cc_r6_lc_2.85_6_tetragonal.xyz
diff --git a/...sim_Ag2O_cc_r4_lc_2.64_4_AntiFlourite.xyz → ...sim_Ag2O_cc_r4_lc_2.64_4_AntiFlourite.xyz b/...sim_Ag2O_cc_r4_lc_2.64_4_AntiFlourite.xyz → ...sim_Ag2O_cc_r4_lc_2.64_4_AntiFlourite.xyz
diff --git a/debyecalculator/debye_calculator.py b/debyecalculator/debye_calculator.py
@@ -1174,7 +1174,7 @@ def update_example_files(change):
             file_list = '<strong>Uploaded Files:</strong><br>'
 
             # CIF Example
-            with importlib.resources.open_binary('data', 'AntiFluorite_Co2O.cif') as f:
+            with importlib.resources.open_binary('debyecalculator.data', 'AntiFluorite_Co2O.cif') as f:
                 example_dict = {}
                 example_dict['content'] = f.read()
                 example_dict['name'] = 'AntiFluorite_Co2O.cif'
@@ -1185,7 +1185,7 @@ def update_example_files(change):
                 create_file_widgets(example_dict, file_widgets)
 
             # XYZ Example
-            with importlib.resources.open_binary('data', 'AntiFluorite_Co2O_r10.xyz') as f:
+            with importlib.resources.open_binary('debyecalculator.data', 'AntiFluorite_Co2O_r10.xyz') as f:
                 example_dict = {}
                 example_dict['content'] = f.read()
                 example_dict['name'] = 'AntiFluorite_Co2O_r10.xyz'
@@ -1464,7 +1464,7 @@ def update_example_files(change):
         """ Plotting Options """
 
         # Load display display_assets
-        with importlib.resources.open_binary('debyecalculator.display_assets', 'qstep.png') as f:
+        with importlib.resources.open_binary('debyecalculator.display_assets', 'iq_scaling.png') as f:
             iq_scaling_img = f.read()
         with importlib.resources.open_binary('debyecalculator.display_assets', 'show_hide.png') as f:
             show_hide_img = f.read()
@@ -1876,7 +1876,7 @@ def update_parameters(b=None):
                 name = upload_file['name']
                 suffix = name.split('.')[-1]
                 if checkboxes[name].value:
-                    with tempfile.NamedTemporaryFile(delete=True, suffix='.' + suffix, mode = 'w') as temp_file:
+                    with tempfile.NamedTemporaryFile(delete=False, suffix='.' + suffix, mode = 'w') as temp_file:
                         temp_content = BytesIO(upload_file['content']).read().decode()
                         temp_filename = temp_file.name
                         temp_file.write(temp_content)