diff --git a/CITATION.cff b/CITATION.cff index 10f395ef608..8d606f07617 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,13 +1,11 @@ cff-version: 1.2.0 message: "If you use this software, please cite it as below." authors: - - family-names: Tasev - given-names: Dimitar - orcid: https://orcid.org/0000-0002-5435-1936 - family-names: Akello-Egwel given-names: Dolica - family-names: Allen given-names: Jack + orcid: https://orcid.org/0009-0007-2873-3731 - family-names: Baust given-names: Rachel - family-names: Gigg @@ -15,10 +13,19 @@ authors: - family-names: Jones given-names: Samuel orcid: https://orcid.org/0000-0001-7217-2280 + - family-names: Meigh + given-names: Ashley + orcid: https://orcid.org/0009-0001-6357-0516 - family-names: Nixon given-names: Daniel - family-names: Stock given-names: Samuel + - family-names: Sullivan + given-names: Michael + orcid: https://orcid.org/0000-0003-4910-7784 + - family-names: Tasev + given-names: Dimitar + orcid: https://orcid.org/0000-0002-5435-1936 - family-names: Taylor given-names: Will - family-names: Tygier @@ -26,9 +33,9 @@ authors: orcid: https://orcid.org/0000-0002-7495-8655 title: "Mantid Imaging" abstract: "Mantid Imaging is a graphical toolkit for performing 3D reconstruction of neutron tomography data. It provides an easy-to-use graphical interface to a wide range of pre/post-processing operations, tilt correction and reconstruction algorithms, accommodating for tomography users with varying data complexity and image analysis background knowledge. It utilises a flexible plugin system that allows easy integration of external software, and has allowed us to re-use software widely known in the neutron tomography community." -version: "2.5.0" +version: "2.7.0" doi: 10.5281/zenodo.4728059 -date-released: 2023-05-04 +date-released: 2024-02-21 license: "GPL-3.0-or-later" repository-code: https://github.com/mantidproject/mantidimaging url: https://mantidproject.github.io/mantidimaging diff --git a/docs/_templates/versioning.html b/docs/_templates/versioning.html index 28f6ae825f4..61a6ca01e50 100644 --- a/docs/_templates/versioning.html +++ b/docs/_templates/versioning.html @@ -13,7 +13,7 @@

{{ _('Versions') }}

{{ _('Versions') }}

diff --git a/docs/conf.py b/docs/conf.py index 119f8d18304..b149745282f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -69,18 +69,18 @@ # General information about the project. project = 'MantidImaging' -copyright = '2017-2023, Mantid Project' -author = 'Dimitar Tasev, Jack Allen, Dolica Akello-Egwel, Rachel Baust, Martyn Gigg, Samuel Jones, Dan Nixon, ' \ - 'Samuel Stock, Will Taylor, Sam Tygier' +copyright = '2017-2024, Mantid Project' +author = ("Dolica Akello-Egwel, Jack Allen, Rachel Baust, Martyn Gigg, Samuel Jones, Ashley Meigh, Daniel Nixon, " + "Samuel Stock, Michael Sullivan, Dimitar Tasev, Will Taylor, Sam Tygier") # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '2.7' +version = '2.8' # The full version, including alpha/beta/rc tags. -release = '2.7.0a1' +release = '2.8.0a1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -174,7 +174,7 @@ html_use_smartypants = False # sphinx-multiversion -smv_tag_whitelist = r'^(2.3.0|2.4.0|2.5.0|2.6.0)$' +smv_tag_whitelist = r'^(2.3.0|2.4.0|2.5.0|2.6.0|2.7.0)$' smv_branch_whitelist = None # No branches smv_released_pattern = r'' smv_prebuild_command = ( diff --git a/docs/index.rst b/docs/index.rst index 3d6cc8c0c1c..45759cf17cd 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,7 +29,7 @@ Mantid Imaging is a graphical toolkit for performing 3D reconstruction of neutro Please cite as: -Tasev, Dimitar; Akello-Egwel, Dolica; Allen, Jack; Baust, Rachel; Gigg, Martyn; Jones, Samuel; Nixon, Daniel; Stock, Samuel; Taylor, Will; Tygier, Sam. (2023). Mantid Imaging (2.5.0), Zenodo https://doi.org/10.5281/zenodo.4728059 +Akello-Egwel, Dolica; Allen, Jack; Baust, Rachel; Gigg, Martyn; Jones, Samuel; Meigh, Ashley; Nixon, Daniel; Stock, Samuel; Sullivan, Michael; Tasev, Dimitar; Taylor, Will; Tygier, Sam. (2024). Mantid Imaging (2.7.0), Zenodo https://doi.org/10.5281/zenodo.4728059 (See `Zenodo `_ for citing specific versions). diff --git a/docs/release_notes/2.7.rst b/docs/release_notes/2.7.rst new file mode 100644 index 00000000000..fe7baf83781 --- /dev/null +++ b/docs/release_notes/2.7.rst @@ -0,0 +1,29 @@ +New Features +------------ +- #1912 : Support sub-directories in Live viewer +- #1941 : Spectrum viewer tab for exporting to RITS +- #1943 : RITS export transmission errors +- #1945 : Export Binned RITS Formatted Data within Spectrum Viewer. +- #1957 : ROI support for RITS export +- #1992 : Spectrum Viewer: Change ROI Colour Through Right Click Dialog Menu +- #1996 : Added .fits file compatibility for Live Viewer +- #2026: Time of flight graph in the Spectrum Viewer is now resizable +- #2027: The Spectrum ROI details display in an adjustable table via spinboxes +- #2048: Update spectrum documentation to reflect changes made to the Spectrum Viewer. + +Fixes +----- +- #1873 : fix typeError: qWait(ms: int): argument 1 has unexpected type 'float' +- #1966: ExecutionTimer unit test fails intermittently for Windows GitHub Action +- #2002 : Better default values in Remove all stripes +- #2009 : Improve type annotation in gui.windows.recon +- #2012 : numpy2 deprication +- #2031 : Speed up imageview by avoiding unneeded calculation + +Developer Changes +----------------- +- #1932 : RITS Export Backend +- #1951 : Various fixes to speedup pytest +- #1955 : Add InstrumentLog as new log reader +- #1960 : Update developer tools +- #2011 : Move to a new conda repo https://anaconda.org/mantidimaging/mantidimaging \ No newline at end of file diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst index 5939184f979..f5ca8ac8070 100644 --- a/docs/release_notes/index.rst +++ b/docs/release_notes/index.rst @@ -6,6 +6,7 @@ Release Notes :caption: Contents: next + 2.7 2.6 2.5 2.4 diff --git a/docs/release_notes/next/dev-1932-RITS_export_backend b/docs/release_notes/next/dev-1932-RITS_export_backend deleted file mode 100644 index 9d34f8cfb96..00000000000 --- a/docs/release_notes/next/dev-1932-RITS_export_backend +++ /dev/null @@ -1 +0,0 @@ -#1932 : RITS Export Backend \ No newline at end of file diff --git a/docs/release_notes/next/dev-1951-pytest-speed b/docs/release_notes/next/dev-1951-pytest-speed deleted file mode 100644 index b85b1a29b2e..00000000000 --- a/docs/release_notes/next/dev-1951-pytest-speed +++ /dev/null @@ -1 +0,0 @@ -#1951 : Various fixes to speedup pytest diff --git a/docs/release_notes/next/dev-1955-instrument-log b/docs/release_notes/next/dev-1955-instrument-log deleted file mode 100644 index 28ef805cd41..00000000000 --- a/docs/release_notes/next/dev-1955-instrument-log +++ /dev/null @@ -1 +0,0 @@ -#1955 : Add InstrumentLog as new log reader diff --git a/docs/release_notes/next/dev-1960-update-tools b/docs/release_notes/next/dev-1960-update-tools deleted file mode 100644 index f0dd0a57433..00000000000 --- a/docs/release_notes/next/dev-1960-update-tools +++ /dev/null @@ -1 +0,0 @@ -#1960 : Update developer tools diff --git a/docs/release_notes/next/dev-2011-new-conda-repo b/docs/release_notes/next/dev-2011-new-conda-repo deleted file mode 100644 index fc0eac4fad5..00000000000 --- a/docs/release_notes/next/dev-2011-new-conda-repo +++ /dev/null @@ -1 +0,0 @@ -#2011 : Move to a new conda repo https://anaconda.org/mantidimaging/mantidimaging diff --git a/docs/release_notes/next/feature-1912-live-subdir b/docs/release_notes/next/feature-1912-live-subdir deleted file mode 100644 index 260977fc210..00000000000 --- a/docs/release_notes/next/feature-1912-live-subdir +++ /dev/null @@ -1 +0,0 @@ -#1912 : Support sub-directories in Live viewer diff --git a/docs/release_notes/next/feature-1941-rits-gui b/docs/release_notes/next/feature-1941-rits-gui deleted file mode 100644 index 89ce0f2c394..00000000000 --- a/docs/release_notes/next/feature-1941-rits-gui +++ /dev/null @@ -1,2 +0,0 @@ -#1941 : Spectrum viewer tab for exporting to RITS - diff --git a/docs/release_notes/next/feature-1943-RITS-transmission-error b/docs/release_notes/next/feature-1943-RITS-transmission-error deleted file mode 100644 index 4f2b8a35aea..00000000000 --- a/docs/release_notes/next/feature-1943-RITS-transmission-error +++ /dev/null @@ -1,2 +0,0 @@ -#1943 : RITS export transmission errors - diff --git a/docs/release_notes/next/feature-1945-export_binned_rits_data b/docs/release_notes/next/feature-1945-export_binned_rits_data deleted file mode 100644 index f56e2c94b6d..00000000000 --- a/docs/release_notes/next/feature-1945-export_binned_rits_data +++ /dev/null @@ -1 +0,0 @@ -#1945 : Export Binned RITS Formatted Data within Spectrum Viewer. diff --git a/docs/release_notes/next/feature-1957-rits-roi b/docs/release_notes/next/feature-1957-rits-roi deleted file mode 100644 index bdcc93f94df..00000000000 --- a/docs/release_notes/next/feature-1957-rits-roi +++ /dev/null @@ -1,2 +0,0 @@ -#1957 : ROI support for RITS export - diff --git a/docs/release_notes/next/feature-1992-ROI-colour b/docs/release_notes/next/feature-1992-ROI-colour deleted file mode 100644 index 3de82d867b5..00000000000 --- a/docs/release_notes/next/feature-1992-ROI-colour +++ /dev/null @@ -1 +0,0 @@ -#1992 : Spectrum Viewer: Change ROI Colour Through Right Click Dialog Menu diff --git a/docs/release_notes/next/feature-1996-fits-compatibility b/docs/release_notes/next/feature-1996-fits-compatibility deleted file mode 100644 index d77ae6675c9..00000000000 --- a/docs/release_notes/next/feature-1996-fits-compatibility +++ /dev/null @@ -1 +0,0 @@ -#1996 : Added .fits file compatibility for Live Viewer diff --git a/docs/release_notes/next/feature-2026-resizable-tof-spectrum b/docs/release_notes/next/feature-2026-resizable-tof-spectrum deleted file mode 100644 index 0c6b4c4c083..00000000000 --- a/docs/release_notes/next/feature-2026-resizable-tof-spectrum +++ /dev/null @@ -1 +0,0 @@ -#2026: Time of flight graph in the Spectrum Viewer is now resizable \ No newline at end of file diff --git a/docs/release_notes/next/feature-2027-Spectrum-ROI-Adjustable b/docs/release_notes/next/feature-2027-Spectrum-ROI-Adjustable deleted file mode 100644 index 1c6d6156b91..00000000000 --- a/docs/release_notes/next/feature-2027-Spectrum-ROI-Adjustable +++ /dev/null @@ -1 +0,0 @@ -#2027: The Spectrum ROI details display in an adjustable table via spinboxes \ No newline at end of file diff --git a/docs/release_notes/next/feature-2048-spectrum_documentation b/docs/release_notes/next/feature-2048-spectrum_documentation deleted file mode 100644 index 78483836ed3..00000000000 --- a/docs/release_notes/next/feature-2048-spectrum_documentation +++ /dev/null @@ -1 +0,0 @@ -#2048: Update spectrum documentation to reflect changes made to the Spectrum Viewer. \ No newline at end of file diff --git a/docs/release_notes/next/fix-1873-unexpected-float b/docs/release_notes/next/fix-1873-unexpected-float deleted file mode 100644 index 5370349eddf..00000000000 --- a/docs/release_notes/next/fix-1873-unexpected-float +++ /dev/null @@ -1 +0,0 @@ -#1873 : fix typeError: qWait(ms: int): argument 1 has unexpected type 'float' diff --git a/docs/release_notes/next/fix-1966-ExecutionTimer b/docs/release_notes/next/fix-1966-ExecutionTimer deleted file mode 100644 index 411a404c999..00000000000 --- a/docs/release_notes/next/fix-1966-ExecutionTimer +++ /dev/null @@ -1 +0,0 @@ -#1966: ExecutionTimer unit test fails intermittently for Windows GitHub Action diff --git a/docs/release_notes/next/fix-2002-default-values b/docs/release_notes/next/fix-2002-default-values deleted file mode 100644 index d169a0e13b6..00000000000 --- a/docs/release_notes/next/fix-2002-default-values +++ /dev/null @@ -1,2 +0,0 @@ -#2002 : Better default values in Remove all stripes - diff --git a/docs/release_notes/next/fix-2009-type annotations b/docs/release_notes/next/fix-2009-type annotations deleted file mode 100644 index 7ba55b721a7..00000000000 --- a/docs/release_notes/next/fix-2009-type annotations +++ /dev/null @@ -1 +0,0 @@ -#2009 : Improve type annotation in gui.windows.recon diff --git a/docs/release_notes/next/fix-2012-numpy_update b/docs/release_notes/next/fix-2012-numpy_update deleted file mode 100644 index 03f43a92103..00000000000 --- a/docs/release_notes/next/fix-2012-numpy_update +++ /dev/null @@ -1 +0,0 @@ -#2012 : numpy2 deprication diff --git a/docs/release_notes/next/fix-2030-slow-imageview b/docs/release_notes/next/fix-2030-slow-imageview deleted file mode 100644 index 84276927002..00000000000 --- a/docs/release_notes/next/fix-2030-slow-imageview +++ /dev/null @@ -1 +0,0 @@ -#2031 : Speed up imageview by avoiding unneeded calculation diff --git a/docs/release_notes/next/next.rst b/docs/release_notes/next/next.rst new file mode 100644 index 00000000000..41c12a20ef2 --- /dev/null +++ b/docs/release_notes/next/next.rst @@ -0,0 +1,16 @@ +Mantid Imaging next release +=========================== + +This contains changes for the next not yet released Mantid Imaging versions. + +New Features +------------ +.. release_notes:: feature + +Fixes +----- +.. release_notes:: fix + +Developer Changes +----------------- +.. release_notes:: dev