Merge pull request #377 from European-XFEL/fix/tableInitialLoading

fix: interpret complex numbers from the DB when the gui loads the table

damnit/gui/table.py

@@ -9,7 +9,7 @@
 from PyQt5.QtWidgets import QMessageBox
 from superqt.utils import qthrottled
 
-from ..backend.db import BlobTypes, DamnitDB, ReducedData
+from ..backend.db import BlobTypes, DamnitDB, ReducedData, blob2complex
 from ..backend.extraction_control import ExtractionJobTracker
 from ..backend.user_variables import value_types_by_name
 from ..util import StatusbarStylesheet, delete_variable, timestamp2str
@@ -518,14 +518,16 @@ def _load_from_db(self):
             self.setItem(row_ix, 3, self.text_item(ts, timestamp2str(ts)))
 
         for (prop, run), grp in groupby(self.db.conn.execute("""
-            SELECT proposal, run, name, value, max_diff, attributes FROM run_variables
+            SELECT proposal, run, name, value, max_diff, summary_type, attributes FROM run_variables
             ORDER BY proposal, run
         """).fetchall(), key=lambda r: r[:2]):  # Group by proposal & run
             row_ix = self.run_index[(prop, run)]
-            for *_, name, value, max_diff, attr_json in grp:
+            for *_, name, value, max_diff, summary_type, attr_json in grp:
                 col_ix = self.column_index[name]
                 if name in self.user_variables:
                     value = self.user_variables[name].get_type_class().from_db_value(value)
+                if summary_type == "complex":
+                    value = blob2complex(value)
                 attrs = json.loads(attr_json) if attr_json else {}
                 self.setItem(row_ix, col_ix, self.new_item(value, name, max_diff, attrs))
 

docs/changelog.md

@@ -4,9 +4,12 @@
 
 Added:
 
-- Watch context file for changes saved outside the editor (!304).
+- GUI: Watch context file for changes saved outside the editor (!304).
+- GUI: show when runs are being processed (!322)
 - Reads techniques annotation from MyMDC (!338).
 - Add a `tags` attribute allowing cathegorizing `Variable`s (!354).
+- Add support for `complex` numbers (!374)
+- GUI: Add a Dark theme (!376)
 
 Changed:
 
@@ -19,10 +22,12 @@ Fixed:
 
 - Fixed loading data with WebViewer (!310).
 - Added back grid lines for plots of `DataArray`'s (!334).
+- Failed to setup new database from the GUI (!337)
 - Fixed adding new variable without explicit title as column in GUI (!347).
 - Fixed thumbnails of 2D `DataArray`'s to match what is displayed when the
   variable is plotted (!355).
 - Fixed crashes when the context file environment is missing dependencies (!356).
+- handle failure generating summary while writing results to file (!370)
 
 ## [0.1.4]