add ability to estimate probe photon count from diffraction data

stevehenke · stevehenke · commit b98a49f54e67 · 2025-03-04T15:36:59.000-06:00
diff --git a/src/ptychodus/__main__.py b/src/ptychodus/__main__.py
@@ -132,7 +132,7 @@ def main() -> int:
 
         from ptychodus.view import ViewCore
 
-        view = ViewCore.createInstance(parsedArgs.dev)
+        view = ViewCore()
 
         from ptychodus.controller import ControllerCore
 
diff --git a/src/ptychodus/controller/core.py b/src/ptychodus/controller/core.py
@@ -26,7 +26,7 @@ class ControllerCore:
     def __init__(self, model: ModelCore, view: ViewCore) -> None:
         self.view = view
 
-        self._memoryController = MemoryController(model.memoryPresenter, view.memoryProgressBar)
+        self._memoryController = MemoryController(model.memoryPresenter, view.memory_progress_bar)
         self._fileDialogFactory = FileDialogFactory()
         self._ptyChiViewControllerFactory = PtyChiViewControllerFactory(
             model.ptyChiReconstructorLibrary
@@ -59,6 +59,7 @@ def __init__(self, model: ModelCore, view: ViewCore) -> None:
             self._fileDialogFactory,
         )
         self._productController = ProductController.createInstance(
+            model.patterns_core.dataset,
             model.productRepository,
             model.productAPI,
             view.productView,
@@ -154,5 +155,5 @@ def showMainWindow(self, windowTitle: str) -> None:
 
     def swapCentralWidgets(self, action: QAction) -> None:
         index = action.data()
-        self.view.parametersWidget.setCurrentIndex(index)
-        self.view.contentsWidget.setCurrentIndex(index)
+        self.view.left_panel.setCurrentIndex(index)
+        self.view.right_panel.setCurrentIndex(index)
diff --git a/src/ptychodus/controller/memory.py b/src/ptychodus/controller/memory.py
@@ -1,15 +1,14 @@
-from __future__ import annotations
-
 from PyQt5.QtCore import QTimer
-from PyQt5.QtWidgets import QProgressBar
+from PyQt5.QtWidgets import QProgressBar, QSizePolicy
 
 from ..model.memory import MemoryPresenter
 
 
 class MemoryController:
-    def __init__(self, presenter: MemoryPresenter, progressBar: QProgressBar) -> None:
+    def __init__(self, presenter: MemoryPresenter, progress_bar: QProgressBar) -> None:
         self._presenter = presenter
-        self._progressBar = progressBar
+        self._progress_bar = progress_bar
+        self._progress_bar.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
         self._timer = QTimer()
         self._timer.timeout.connect(self._updateProgressBar)
 
@@ -24,6 +23,6 @@ def _updateProgressBar(self) -> None:
         availMemMB = int(stats.availableMemoryInBytes / 1e6)
         availMem = f'Available Memory: {availMemMB} MB'
 
-        self._progressBar.setRange(0, 100)
-        self._progressBar.setValue(int(stats.memoryUsagePercent))
-        self._progressBar.setToolTip('\n'.join((totalMem, availMem)))
+        self._progress_bar.setRange(0, 100)
+        self._progress_bar.setValue(int(stats.memoryUsagePercent))
+        self._progress_bar.setToolTip('\n'.join((totalMem, availMem)))
diff --git a/src/ptychodus/controller/product/core.py b/src/ptychodus/controller/product/core.py
@@ -18,6 +18,7 @@
     ProductRepositoryItem,
     ProductRepositoryObserver,
 )
+from ...model.patterns import AssembledDiffractionDataset
 from ...model.product.metadata import MetadataRepositoryItem
 from ...model.product.object import ObjectRepositoryItem
 from ...model.product.probe import ProbeRepositoryItem
@@ -150,6 +151,7 @@ def columnCount(self, parent: QModelIndex = QModelIndex()) -> int:
 class ProductController(ProductRepositoryObserver):
     def __init__(
         self,
+        dataset: AssembledDiffractionDataset,
         repository: ProductRepository,
         api: ProductAPI,
         view: ProductView,
@@ -159,6 +161,7 @@ def __init__(
         tableProxyModel: QSortFilterProxyModel,
     ) -> None:
         super().__init__()
+        self._dataset = dataset
         self._repository = repository
         self._api = api
         self._view = view
@@ -170,6 +173,7 @@ def __init__(
     @classmethod
     def createInstance(
         cls,
+        dataset: AssembledDiffractionDataset,
         repository: ProductRepository,
         api: ProductAPI,
         view: ProductView,
@@ -186,6 +190,7 @@ def createInstance(
         tableProxyModel.setSourceModel(tableModel)
 
         controller = cls(
+            dataset,
             repository,
             api,
             view,
@@ -290,7 +295,7 @@ def _editCurrentProduct(self) -> None:
 
         if current.isValid():
             product = self._repository[current.row()]
-            ProductEditorViewController.editProduct(product, self._view)
+            ProductEditorViewController.editProduct(self._dataset, product, self._view)
         else:
             logger.error('No current item!')
 
diff --git a/src/ptychodus/controller/product/editor.py b/src/ptychodus/controller/product/editor.py
@@ -1,16 +1,17 @@
 from typing import Any
 
 from PyQt5.QtCore import (
-    Qt,
     QAbstractTableModel,
     QModelIndex,
     QObject,
     QSortFilterProxyModel,
+    Qt,
 )
 from PyQt5.QtWidgets import QWidget
 
 from ptychodus.api.observer import Observable, Observer
 
+from ...model.patterns import AssembledDiffractionDataset
 from ...model.product import ProductRepositoryItem
 from ...view.product import ProductEditorDialog
 
@@ -79,17 +80,21 @@ def columnCount(self, parent: QModelIndex = QModelIndex()) -> int:
 class ProductEditorViewController(Observer):
     def __init__(
         self,
+        dataset: AssembledDiffractionDataset,
         product: ProductRepositoryItem,
         tableModel: ProductPropertyTableModel,
         dialog: ProductEditorDialog,
     ) -> None:
         super().__init__()
+        self._dataset = dataset
         self._product = product
         self._tableModel = tableModel
         self._dialog = dialog
 
     @classmethod
-    def editProduct(cls, product: ProductRepositoryItem, parent: QWidget) -> None:
+    def editProduct(
+        cls, dataset: AssembledDiffractionDataset, product: ProductRepositoryItem, parent: QWidget
+    ) -> None:
         tableModel = ProductPropertyTableModel(product)
         tableProxyModel = QSortFilterProxyModel()
         tableProxyModel.setSourceModel(tableModel)
@@ -102,11 +107,15 @@ def editProduct(cls, product: ProductRepositoryItem, parent: QWidget) -> None:
         dialog.tableView.resizeColumnsToContents()
         dialog.tableView.resizeRowsToContents()
 
-        viewController = cls(product, tableModel, dialog)
+        viewController = cls(dataset, product, tableModel, dialog)
         product.addObserver(viewController)
         dialog.textEdit.textChanged.connect(viewController._syncViewToModel)
 
         viewController._syncModelToView()
+
+        dialog.actionsView.estimateProbePhotonCountButton.clicked.connect(
+            viewController._estimateProbePhotonCount
+        )
         dialog.finished.connect(viewController._finish)
         dialog.open()
         dialog.adjustSize()
@@ -122,6 +131,13 @@ def _syncModelToView(self) -> None:
         metadata = self._product.getMetadata()
         self._dialog.textEdit.setPlainText(metadata.comments.getValue())
 
+    def _estimateProbePhotonCount(self) -> None:
+        metadata = self._product.getMetadata()
+        metadata.probePhotonCount.setValue(self._dataset.get_maximum_pattern_counts())
+
+        self._tableModel.beginResetModel()
+        self._tableModel.endResetModel()
+
     def _finish(self, result: int) -> None:
         self._product.removeObserver(self)
 
diff --git a/src/ptychodus/controller/scan/core.py b/src/ptychodus/controller/scan/core.py
@@ -2,7 +2,7 @@
 import logging
 
 from PyQt5.QtCore import QModelIndex, QSortFilterProxyModel, QStringListModel
-from PyQt5.QtWidgets import QAbstractItemView, QDialog
+from PyQt5.QtWidgets import QAbstractItemView, QDialog, QMessageBox
 
 from ptychodus.api.observer import SequenceObserver
 
@@ -93,6 +93,9 @@ def createInstance(
 
         view.buttonBox.editButton.clicked.connect(controller._editCurrentScan)
 
+        estimateTransformAction = view.buttonBox.analyzeMenu.addAction('Estimate Transform...')
+        estimateTransformAction.triggered.connect(controller._estimateTransform)
+
         return controller
 
     def _getCurrentItemIndex(self) -> int:
@@ -203,6 +206,19 @@ def _redrawPlot(self) -> None:
 
         self._plotView.figureCanvas.draw()
 
+    def _estimateTransform(self) -> None:  # FIXME
+        itemIndex = self._getCurrentItemIndex()
+
+        if itemIndex < 0:
+            logger.warning('No current item!')
+            return
+
+        _ = QMessageBox.information(
+            self._view,
+            'Not Implemented',
+            'Affine transform estimator is not yet implemented.',
+        )
+
     def _updateView(self, current: QModelIndex, previous: QModelIndex) -> None:
         enabled = current.isValid()
         self._view.buttonBox.loadButton.setEnabled(enabled)
diff --git a/src/ptychodus/view/core.py b/src/ptychodus/view/core.py
@@ -31,16 +31,19 @@
 
 
 class ViewCore(QMainWindow):
-    def __init__(self, parent: QWidget | None) -> None:
+    def __init__(self, parent: QWidget | None = None) -> None:
         super().__init__(parent)
 
+        logger.info(f'PyQt {PYQT_VERSION_STR}')
+        logger.info(f'Qt {QT_VERSION_STR}')
+
         self.navigationToolBar = QToolBar()
         self.navigationActionGroup = QActionGroup(self.navigationToolBar)
 
         self.splitter = QSplitter(Qt.Orientation.Horizontal)
-        self.parametersWidget = QStackedWidget()
-        self.contentsWidget = QStackedWidget()
-        self.memoryProgressBar = QProgressBar()
+        self.left_panel = QStackedWidget()
+        self.right_panel = QStackedWidget()
+        self.memory_progress_bar = QProgressBar()
 
         self.settingsAction = self.navigationToolBar.addAction(
             QIcon(':/icons/settings'), 'Settings'
@@ -88,68 +91,51 @@ def __init__(self, parent: QWidget | None) -> None:
         self.automationView = AutomationView.createInstance()
         self.automationWidget = QWidget()
 
-    @classmethod
-    def createInstance(
-        cls, isDeveloperModeEnabled: bool, parent: QWidget | None = None
-    ) -> ViewCore:
-        logger.info(f'PyQt {PYQT_VERSION_STR}')
-        logger.info(f'Qt {QT_VERSION_STR}')
+        #####
 
-        view = cls(parent)
-        view.setWindowIcon(QIcon(':/icons/ptychodus'))
+        self.setWindowIcon(QIcon(':/icons/ptychodus'))
 
-        view.navigationToolBar.setContextMenuPolicy(Qt.ContextMenuPolicy.PreventContextMenu)
-        view.addToolBar(Qt.ToolBarArea.LeftToolBarArea, view.navigationToolBar)
-        view.navigationToolBar.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon)
-        view.navigationToolBar.setIconSize(QSize(32, 32))
+        self.navigationToolBar.setContextMenuPolicy(Qt.ContextMenuPolicy.PreventContextMenu)
+        self.navigationToolBar.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon)
+        self.navigationToolBar.setIconSize(QSize(32, 32))
+        self.addToolBar(Qt.ToolBarArea.LeftToolBarArea, self.navigationToolBar)
 
-        for index, action in enumerate(view.navigationToolBar.actions()):
+        for index, action in enumerate(self.navigationToolBar.actions()):
             action.setCheckable(True)
             action.setData(index)
-            view.navigationActionGroup.addAction(action)
+            self.navigationActionGroup.addAction(action)
 
         # maintain same order as navigationToolBar buttons
-        view.parametersWidget.addWidget(view.settingsView)
-        view.parametersWidget.addWidget(view.patternsView)
-        view.parametersWidget.addWidget(view.productView)
-        view.parametersWidget.addWidget(view.scanView)
-        view.parametersWidget.addWidget(view.probeView)
-        view.parametersWidget.addWidget(view.objectView)
-        view.parametersWidget.addWidget(view.reconstructorView)
-        view.parametersWidget.addWidget(view.workflowParametersView)
-        view.parametersWidget.addWidget(view.automationView)
-        view.parametersWidget.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
-        view.splitter.addWidget(view.parametersWidget)
+        self.left_panel.addWidget(self.settingsView)
+        self.left_panel.addWidget(self.patternsView)
+        self.left_panel.addWidget(self.productView)
+        self.left_panel.addWidget(self.scanView)
+        self.left_panel.addWidget(self.probeView)
+        self.left_panel.addWidget(self.objectView)
+        self.left_panel.addWidget(self.reconstructorView)
+        self.left_panel.addWidget(self.workflowParametersView)
+        self.left_panel.addWidget(self.automationView)
+        self.left_panel.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
+        self.splitter.addWidget(self.left_panel)
 
         # maintain same order as navigationToolBar buttons
-        view.contentsWidget.addWidget(view.settingsTableView)
-        view.contentsWidget.addWidget(view.patternsImageView)
-        view.contentsWidget.addWidget(view.productDiagramView)
-        view.contentsWidget.addWidget(view.scanPlotView)
-        view.contentsWidget.addWidget(view.probeImageView)
-        view.contentsWidget.addWidget(view.objectImageView)
-        view.contentsWidget.addWidget(view.reconstructorPlotView)
-        view.contentsWidget.addWidget(view.workflowTableView)
-        view.contentsWidget.addWidget(view.automationWidget)
-        view.contentsWidget.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
-        view.splitter.addWidget(view.contentsWidget)
-
-        view.setCentralWidget(view.splitter)
-
-        # TODO make visible when complete
-        view.scanView.buttonBox.analyzeButton.setVisible(isDeveloperModeEnabled)
-        view.probeView.buttonBox.analyzeButton.setVisible(isDeveloperModeEnabled)
-        view.objectView.buttonBox.analyzeButton.setVisible(isDeveloperModeEnabled)
-
-        desktopSize = QApplication.desktop().availableGeometry().size()
-        preferredHeight = desktopSize.height() * 2 // 3
-        preferredWidth = min(desktopSize.width() * 2 // 3, 2 * preferredHeight)
-        view.resize(preferredWidth, preferredHeight)
-
-        view.memoryProgressBar.setSizePolicy(
-            QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred
-        )
-        view.statusBar().addPermanentWidget(view.memoryProgressBar)
-        view.statusBar().showMessage('Ready')
-
-        return view
+        self.right_panel.addWidget(self.settingsTableView)
+        self.right_panel.addWidget(self.patternsImageView)
+        self.right_panel.addWidget(self.productDiagramView)
+        self.right_panel.addWidget(self.scanPlotView)
+        self.right_panel.addWidget(self.probeImageView)
+        self.right_panel.addWidget(self.objectImageView)
+        self.right_panel.addWidget(self.reconstructorPlotView)
+        self.right_panel.addWidget(self.workflowTableView)
+        self.right_panel.addWidget(self.automationWidget)
+        self.right_panel.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
+        self.splitter.addWidget(self.right_panel)
+
+        self.setCentralWidget(self.splitter)
+
+        desktop_size = QApplication.desktop().availableGeometry().size()
+        preferred_height = desktop_size.height() * 2 // 3
+        preferred_width = min(desktop_size.width() * 2 // 3, 2 * preferred_height)
+        self.resize(preferred_width, preferred_height)
+
+        self.statusBar().addPermanentWidget(self.memory_progress_bar)
diff --git a/src/ptychodus/view/product.py b/src/ptychodus/view/product.py
