Skip to content

Commit

Permalink
Merge pull request #1024 from mantidproject/1013_nexus_loading_window
Browse files Browse the repository at this point in the history
1013: NeXus Loading Window
  • Loading branch information
samtygier-stfc authored Jun 28, 2021
2 parents 4a5984f + 25571ed commit 4983d03
Show file tree
Hide file tree
Showing 18 changed files with 1,013 additions and 427 deletions.
1 change: 1 addition & 0 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jobs:
GITHUB_BRANCH_NAME: ${{ github.head_ref }}
run: |
git clone https://github.com/mantidproject/mantidimaging-data.git ~/mantidimaging-data
wget -O ~/mantidimaging-data/24737.nxs https://github.com/DiamondLightSource/Savu/blob/master/test_data/data/24737.nxs?raw=true
xvfb-run --auto-servernum python -m pytest -p no:xdist -p no:randomly -p no:repeat -p no:cov mantidimaging/eyes_tests
timeout-minutes: 15

Expand Down
Binary file added docs/_static/nexus_loading_window.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/release_notes/next.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ New features
- #964 : Open NeXus files
- #1010 : Write slope and offset into int tiffs
- #987 : Allow Flat-fielding without dark subtraction
- #1013 : NeXus Loading Window

Fixes
-----
Expand Down
22 changes: 14 additions & 8 deletions docs/user_guide/gui/loading_saving.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,19 @@ prior to saving.
NeXus Files
-----------

NeXus Files can be loaded by selecting the "Load NeXus file" on the File menu. Once a file has been chosen, the program
will attempt to find projections, dark images, and flat images by using the information contained in the NeXus
:code:`image_key` field. If an :code:`image_key` is not found, then the program will assume all the images in the file
are projections.
NeXus Files can be loaded by selecting the "Load NeXus file" on the File menu. This brings up the NeXus Load dialog
shown below.

The name given to the file will be taken from the :code:`title` field in the NeXus file if one is found, otherwise the
images are given the name "NeXus Data."
.. image:: ../../_static/nexus_loading_window.png
:alt: NeXus Load Dialog

If the loading is successful, the new images should appear in the main view of Mantid Imaging. Information related to
issues encountered while loading the file will be displayed as log messages as well as appearing in a popup window.
From here you can choose a NeXus file that you wish to load. The program will then scan its contents and check for a
:code:`NXtomo` entry. If an entry is found, information about the file will be displayed in the dialog. The data sizes
are also displayed so that a user can check that the image key and data field have the same number of elements. The
"Use?" checkbox can be used to select which images you wish to load.

If the required information could be found in the file, then the OK button will be enabled. Otherwise the button will be
disabled.

From here, you can press OK to load the file as a dataset. The name given to the images will be taken from the
:code:`title` field in the NeXus file if one is found, otherwise the images are given the name "NeXus Data."
202 changes: 0 additions & 202 deletions mantidimaging/core/io/loader/nexus_loader.py

This file was deleted.

Loading

0 comments on commit 4983d03

Please sign in to comment.