start on patterns screen; rename HDF5 file reader; prompt user to cho…

…ose data format
AdvancedPhotonSource · Oct 22, 2024 · 3c522b2 · 3c522b2
1 parent 6583bb0
commit 3c522b2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/ptychodus/controller/core.py b/ptychodus/controller/core.py
@@ -136,9 +136,12 @@ def __init__(self, model: ModelCore, view: ViewCore) -> None:
         self._refreshDataTimer.timeout.connect(model.refreshActiveDataset)
         self._refreshDataTimer.start(1000)  # TODO make configurable
 
-        view.navigationActionGroup.triggered.connect(lambda action: self.swapCentralWidgets(action))
         view.workflowAction.setVisible(model.areWorkflowsSupported)
 
+        self.swapCentralWidgets(view.patternsAction)
+        view.patternsAction.setChecked(True)
+        view.navigationActionGroup.triggered.connect(lambda action: self.swapCentralWidgets(action))
+
     def showMainWindow(self, windowTitle: str) -> None:
         self.view.setWindowTitle(windowTitle)
         self.view.show()

diff --git a/ptychodus/model/product/probe/multimodal.py b/ptychodus/model/product/probe/multimodal.py
@@ -119,9 +119,6 @@ def _adjustRelativePower(self, probe: WavefieldArrayType) -> WavefieldArrayType:
     def build(self, probe: Probe) -> Probe:
         if self.numberOfModes.getValue() <= 1:
             return probe
-        elif self.numberOfModes.getValue() == probe.numberOfModes:
-            # FIXME accomplish this differently
-            return probe
 
         array = self._initializeModes(probe.array)
 

diff --git a/ptychodus/plugins/h5DiffractionFile.py b/ptychodus/plugins/h5DiffractionFile.py
@@ -191,8 +191,8 @@ def write(self, filePath: Path, dataset: DiffractionDataset) -> None:
 def registerPlugins(registry: PluginRegistry) -> None:
     registry.diffractionFileReaders.registerPlugin(
         H5DiffractionFileReader(dataPath='/entry/data/data'),
-        simpleName='HDF5',
-        displayName='Hierarchical Data Format 5 Files (*.h5 *.hdf5)',
+        simpleName='APS_HXN',
+        displayName='CNM/APS HXN Diffraction Files (*.h5 *.hdf5)',
     )
     registry.diffractionFileReaders.registerPlugin(
         H5DiffractionFileReader(dataPath='/entry/measurement/Eiger/data'),

diff --git a/ptychodus/view/core.py b/ptychodus/view/core.py
@@ -108,8 +108,6 @@ def createInstance(
             action.setData(index)
             view.navigationActionGroup.addAction(action)
 
-        view.settingsAction.setChecked(True)
-
         # maintain same order as navigationToolBar buttons
         view.parametersWidget.addWidget(view.settingsView)
         view.parametersWidget.addWidget(view.patternsView)

diff --git a/ptychodus/view/patterns.py b/ptychodus/view/patterns.py
@@ -65,16 +65,18 @@ def __init__(self, parent: QWidget | None) -> None:
         super().__init__(parent)
         self.directoryComboBox = QComboBox()
         self.fileSystemTableView = QTableView()
+        self.fileTypeLabel = QLabel('Choose File Type:')
         self.fileTypeComboBox = QComboBox()
 
     @classmethod
     def createInstance(cls, parent: QWidget | None = None) -> OpenDatasetWizardFilesPage:
         view = cls(parent)
-        view.setTitle('Choose File(s)')
+        view.setTitle('Choose Dataset File(s)')
 
         layout = QVBoxLayout()
         layout.addWidget(view.directoryComboBox)
         layout.addWidget(view.fileSystemTableView)
+        layout.addWidget(view.fileTypeLabel)
         layout.addWidget(view.fileTypeComboBox)
         view.setLayout(layout)