diff --git a/src/aare/gui/models/user_sample_model.py b/src/aare/gui/models/user_sample_model.py index 5f2e5dd6..e9163eb2 100644 --- a/src/aare/gui/models/user_sample_model.py +++ b/src/aare/gui/models/user_sample_model.py @@ -22,6 +22,12 @@ def get_entry(sample: SampleShortInfo, column: int): elif column == 6: return sample.mount_count elif column == 7: + return sample.raster_count + elif column == 8: + return sample.rotation_count + elif column == 9: + return sample.screening_count + elif column == 10: return sample.comment @@ -46,6 +52,9 @@ class UserSampleSpreadsheet(QAbstractTableModel): "Priority", "User", "Mount count", + "Raster count", + "Rotation count", + "Screening count", "Comment", ] self.current_sample = current_sample diff --git a/src/aare/gui/panels/reference_tools_panel.py b/src/aare/gui/panels/reference_tools_panel.py index b21807b4..03cbd1d8 100644 --- a/src/aare/gui/panels/reference_tools_panel.py +++ b/src/aare/gui/panels/reference_tools_panel.py @@ -27,6 +27,12 @@ def get_entry(sample: SampleShortInfo, column: int): return sample.sample_name elif column == 2: return sample.mount_count + elif column == 3: + return sample.rotation_count + elif column == 4: + return sample.raster_count + elif column == 5: + return sample.screening_count return "" class ReferenceToolsModel(QAbstractTableModel): @@ -35,7 +41,7 @@ class ReferenceToolsModel(QAbstractTableModel): self.samples: list[SampleShortInfo] = rows or [] self.current_reference = current_reference - self.header = ["Position", "Sample name", "Mount count"] + self.header = ["Position", "Sample name", "Mount count", "Raster count", "Rotation count", "Screening count",] self.__sort_col = 0 self.__sort_order = Qt.SortOrder.AscendingOrder self.__sorted_samples: list[SampleShortInfo] = []