reverting other files to master

CHANGELOG.md

@@ -1,14 +1,16 @@
 # Changelog
 
-## v24.0.2
+## v24.1.0
 
 Enhancements:
+  - Add option to edit help text #441
   - Update corner annotation with axis label #433
   - Add title to ViewerCoordsDockWidget #422
   - Adds methods to CILviewer and CILviewer2D #425
-  - adds Qt GUI toolbar to control 3D viewer
 
 Bugfix:
+  - Fix error when visualising 2D images #439
+  - Hides the slider when one image dimension is 1 #432
   - Differentiate 3D and 2D images in the converter `numpy2vtkImage` #437
   - Edit slider min value #420
   - Fix extent error when user clicks in the viewer to create a box by clicking outside of the image #425
@@ -50,7 +52,6 @@ Documentation
 - Add PR template #244 #373
 - Edit README.md #344
 
-
 ## v23.1.0
 - Raise error if try to add multiple widgets with the same name to CILViewer or CILViewer2D.
 - Adds the following base classes to `ui.main_windows.py`:

Wrappers/Python/ccpi/viewer/CILViewer.py

@@ -37,6 +37,7 @@ def __init__(self, callback):
         #self.AddObserver('RightButtonPressEvent', self.OnRightMousePress, -0.5)
         #self.AddObserver('RightButtonReleaseEvent', self.OnRightMouseRelease, -0.5)
         self.htext = None
+        self.htext = None
 
     def GetSliceOrientation(self):
         return self._viewer.sliceOrientation
@@ -324,7 +325,7 @@ def DisplayHelp(self):
             self.Render()
             return
 
-        font_size = 16
+        font_size = 24
 
         # Create the text mappers and the associated Actor2Ds.
 
@@ -341,27 +342,25 @@ def DisplayHelp(self):
         # The text is on multiple lines and center-justified (both horizontal and
         # vertical).
         textMapperC = vtk.vtkTextMapper()
-        if self.htext == None:
-            self.htext = """
-Mouse Interactions:
-    - Slice: Mouse Scroll
-    - Zoom: Right Mouse + Move Up/Down
-    - Pan: Middle Mouse Button + Move or Shift + Left Mouse + Move
-    - Adjust Camera: Left Mouse + Move
-    - Rotate: Ctrl + Left Mouse + Move
-    
-Keyboard Interactions:
-    h: Display this help
-    x:  YZ Plane
-    y:  XZ Plane
-    z:  XY Plane
-    r:  Save render to current_render.png
-    s:  Toggle visibility of slice
-    v:  Toggle visibility of volume render
-    c:  Activates volume render clipping plane widget
-    a:  Whole image Auto Window/Level
-    """
-        textMapperC.SetInput(self.htext)
+        textMapperC.SetInput("Mouse Interactions:\n"
+                             "\n"
+                             "  - Slice: Mouse Scroll\n"
+                             "  - Zoom: Right Mouse + Move Up/Down\n"
+                             "  - Pan: Middle Mouse Button + Move or Shift + Left Mouse + Move\n"
+                             "  - Adjust Camera: Left Mouse + Move\n"
+                             "  - Rotate: Ctrl + Left Mouse + Move\n"
+                             "\n"
+                             "Keyboard Interactions:\n"
+                             "\n"
+                             "h: Display this help\n"
+                             "x:  YZ Plane\n"
+                             "y:  XZ Plane\n"
+                             "z:  XY Plane\n"
+                             "r:  Save render to current_render.png\n"
+                             "s:  Toggle visibility of slice\n"
+                             "v:  Toggle visibility of volume render\n"
+                             "c:  Activates volume render clipping plane widget\n"
+                             "a:  Whole image Auto Window/Level\n")
         tprop = textMapperC.GetTextProperty()
         tprop.ShallowCopy(multiLineTextProp)
         tprop.SetJustificationToLeft()