finalcif 147__tar.gz → 149__tar.gz

{finalcif-147 → finalcif-149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finalcif
-Version: 147
+Version: 149
 Summary: CIF file editor
 Project-URL: Homepage, https://dkratzert.de/finalcif.html
 Project-URL: Bug Tracker, https://github.com/dkratzert/FinalCif/issues

finalcif-149/finalcif/__init__.py

@@ -0,0 +1,2 @@
+
+VERSION = 149

{finalcif-147 → finalcif-149}/finalcif/appwindow.py

@@ -1604,8 +1604,11 @@ class AppWindow(QMainWindow):
         """
         vheader: QtWidgets.QHeaderView = self.ui.cif_main_table.verticalHeader()
         fm = QtGui.QFontMetrics(vheader.font(), self)
-        # noinspection PyTypeChecker
-        longest_string: str = max(self.ui.cif_main_table.vheaderitems, key=len)
+        try:
+            # noinspection PyTypeChecker
+            longest_string: str = max(self.ui.cif_main_table.vheaderitems, key=len)
+        except ValueError:
+            longest_string = '_chemical_formula_sum_foo'
         vheader.setMaximumWidth(fm.width(longest_string + 'O'))
 
     def changes_cif_has_values(self) -> bool:

{finalcif-147 → finalcif-149}/finalcif/finalcif_start.py

@@ -14,8 +14,7 @@ from typing import Type
 from finalcif import VERSION
 from finalcif.app_path import application_path
 from finalcif.appwindow import AppWindow, DEBUG, app
-from finalcif.gui.dialogs import show_bug_found_warning
-from finalcif.gui.dialogs import show_general_warning
+from finalcif.gui.dialogs import show_bug_found_warning, show_general_warning
 
 
 def my_exception_hook(exctype: Type[BaseException], value: BaseException, error_traceback: traceback,
@@ -30,10 +29,26 @@ def my_exception_hook(exctype: Type[BaseException], value: BaseException, error_
                  f'Date: {time.asctime(time.localtime(time.time()))}\n'
                  f'Finalcif crashed during the following operation:\n\n'
                  f'{"-" * 120}\n'
-                 f'{"".join(traceback.format_tb(error_traceback))}\n'
-                 f'{str(exctype.__name__)}: '
-                 f'{str(value)} \n'
-                 f'{"-" * 120}\n')
+                 # f'{"".join(traceback.format_tb(error_traceback))}\n'
+                 # f'{str(exctype.__name__)}: '
+                 # f'{str(value)} \n'
+                 # f'{"-" * 120}\n'
+                 )
+
+    # Walk through the traceback and extract local variables
+    for frame, _ in traceback.walk_tb(error_traceback):
+        errortext += (f'File "{frame.f_code.co_filename}", line {frame.f_lineno}, in '
+                      f'{frame.f_code.co_qualname}(...):\n')
+        newline = '\n'
+        errortext += f'  Locals: \n    '
+        errortext += "    ".join(
+            [f"  {k}:{newline}          {'          '.join([x + newline for x in repr(v).splitlines()])}" for k, v in
+             frame.f_locals.items()]) + '\n\n'
+
+    errortext += f'{"-" * 120}\n'
+    errortext += f'{str(exctype.__name__)}: {str(value)} \n'
+    errortext += f'{"-" * 120}\n'
+
     logfile = Path.home().joinpath(Path(r'finalcif-crash.txt'))
     try:
         logfile.write_text(errortext)

{finalcif-147 → finalcif-149}/finalcif/report/templated_report.py

@@ -1105,7 +1105,9 @@ class TemplatedReport():
         context, tpl_doc = self.prepare_report_data(self.cif, self.options, picfile, tpl_doc)
         # Filter definition for {{foobar|filter}} things:
         jinja_env = jinja2.Environment()
+        jinja_env.globals.update(zip=zip)
         jinja_env.globals.update(strip=str.strip)
+        jinja_env.filters['utf8'] = report_text.utf8
         jinja_env.filters['inv_article'] = report_text.get_inf_article
         jinja_env.filters['to_pm'] = angstrom_to_pm if self.options.use_picometers else do_nothing
         jinja_env.filters['to_nm'] = angstrom_to_nanometers if self.options.use_picometers else do_nothing
@@ -1144,6 +1146,7 @@ class TemplatedReport():
                                        autoescape=select_autoescape(['html', 'htm', 'xml']))
         # Add zip() method to global namespace of the template:
         jinja_env.globals.update(zip=zip)
+        jinja_env.globals.update(strip=str.strip)
         jinja_env.filters['to_pm'] = angstrom_to_pm if self.options.use_picometers else do_nothing
         jinja_env.filters['to_nm'] = angstrom_to_nanometers if self.options.use_picometers else do_nothing
         jinja_env.filters['inv_article'] = report_text.get_inf_article

finalcif-147/finalcif/__init__.py

@@ -1,2 +0,0 @@
-
-VERSION = 147