Cherry pick pull request #18833

Added check for if nonorthogonal axes should be displayed Re #18832 (cherry picked from commit 0d1ce7c) Added patch release note
mantidproject · Feb 23, 2017 · 17c4ab3 · 17c4ab3
1 parent 1210167
commit 17c4ab3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/MantidQt/SliceViewer/src/SliceViewer.cpp b/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -2948,7 +2948,7 @@ void SliceViewer::switchAxis() {
   if (m_canSwitchScales) { // cannot be called when sliceviewer first
                            // initialised because axis is inaccurate
     auto isHKL = API::isHKLDimensions(m_ws, m_dimX, m_dimY);
-    if (isHKL) {
+    if (isHKL && ui.btnNonOrthogonalToggle->isChecked()) {
       applyNonOrthogonalAxisScaleDraw();
     } else {
       applyOrthogonalAxisScaleDraw();

diff --git a/docs/source/release/v3.9.1/index.rst b/docs/source/release/v3.9.1/index.rst
@@ -24,6 +24,7 @@ Please cite any usage of Mantid as follows:
 Changes in this version
 -----------------------
 
+* `18833 <https://www.github.com/mantidproject/mantid/pull/18833>`_ Added check for if nonorthogonal axes should be displayed
 * `18891 <https://www.github.com/mantidproject/mantid/pull/18891>`_ Fix bug in gd_prtn_chrg for chunked data
 * `18907 <https://www.github.com/mantidproject/mantid/pull/18907>`_ Fix zeropadding for IMAT in Facilities.XML
 * `18914 <https://www.github.com/mantidproject/mantid/pull/18914>`_ Fix mass ws deletion bug
@@ -38,6 +39,8 @@ Summary of impact
 | Issue | Impact                                                                            | Solution                                    | Side Effect  |
 |       |                                                                                   |                                             | Probability  |
 +=======+===================================================================================+=============================================+==============+
+| 18833 | HKL axes now respect the non-orthogonal checkbox                                  | Add check if button is in a checked state   | **low**      |
++-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
 | 18891 | Fixes bug in gd_prtn_chrg for chunked data                                        | Recalculate proton charge just prior to use | **low**      |
 +-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
 | 18907 | Allows IMAT to use general file finding mechanism                                 | Facilities file update                      | **low**      |