Support changing images in ImageEditor for all IImage subclasses

docs/releases/upcoming/1810.bugfix.rst

@@ -0,0 +1 @@
+Fix issue with ImageEditor not updating for all IImage implementations.

traitsui/qt4/image_editor.py

@@ -276,8 +276,7 @@ def update_editor(self):
         """
         if self.factory.image is None:
             value = self.value
-            if isinstance(value, ImageResource):
-                self.control.setPixmap(convert_bitmap(value))
+            self.control.setPixmap(convert_bitmap(value))
         self.control.setScaledContents(self.factory.scale)
         self.control.setAllowUpscaling(self.factory.allow_upscaling)
         self.control.setPreserveAspectRatio(self.factory.preserve_aspect_ratio)

traitsui/tests/editors/test_image_editor.py

@@ -0,0 +1,142 @@
+# (C) Copyright 2004-2022 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+
+""" Tests pertaining to the ImageEditor
+"""
+
+import unittest
+
+import pkg_resources
+
+from pyface.api import Image, ImageResource
+from traits.api import File, HasTraits
+from traitsui.api import ImageEditor, Item, View
+from traitsui.tests._tools import (
+    BaseTestMixin,
+    create_ui,
+    requires_toolkit,
+    ToolkitName,
+)
+
+
+filename1 = pkg_resources.resource_filename(
+    "traitsui", "examples/demo/Extras/images/e-logo-rev.png"
+)
+filename2 = pkg_resources.resource_filename(
+    "traitsui", "examples/demo/Extras/images/info.png"
+)
+
+
+class ImageDisplay(HasTraits):
+
+    image = Image()
+
+
+@requires_toolkit([ToolkitName.wx])
+class TestImageEditor(BaseTestMixin, unittest.TestCase):
+
+    def test_image_editor_static(self):
+        obj1 = ImageDisplay()
+        view = View(
+            Item(
+                'image',
+                editor=ImageEditor(
+                    image=ImageResource(absolute_path=filename1),
+                ),
+            )
+        )
+
+        # This should not fail.
+        with create_ui(obj1, dict(view=view)) as ui:
+            pass
+
+    def test_image_editor_resource(self):
+        obj1 = ImageDisplay(
+            image=ImageResource(absolute_path=filename1)
+        )
+        view = View(
+            Item(
+                'image',
+                editor=ImageEditor()
+            )
+        )
+
+        # This should not fail.
+        with create_ui(obj1, dict(view=view)) as ui:
+            obj1.image = ImageResource(absolute_path=filename2)
+
+    def test_image_editor_array(self):
+        try:
+            import numpy as np
+            from pyface.api import ArrayImage
+        except ImportError:
+            self.skipTest("NumPy is not available")
+
+        gradient1 = np.empty(shape=(256, 256, 3), dtype='uint8')
+        gradient1[:, :, 0] = np.arange(256).reshape(256, 1)
+        gradient1[:, :, 1] = np.arange(256).reshape(1, 256)
+        gradient1[:, :, 2] = np.arange(255, -1, -1).reshape(1, 256)
+
+        gradient2 = np.empty(shape=(256, 256, 3), dtype='uint8')
+        gradient2[:, :, 0] = np.arange(255, -1, -1).reshape(256, 1)
+        gradient2[:, :, 1] = np.arange(256).reshape(1, 256)
+        gradient2[:, :, 2] = np.arange(255, -1, -1).reshape(1, 256)
+
+        obj1 = ImageDisplay(
+            image=ArrayImage(data=gradient1)
+        )
+        view = View(
+            Item(
+                'image',
+                editor=ImageEditor()
+            )
+        )
+
+        # This should not fail.
+        with create_ui(obj1, dict(view=view)) as ui:
+            obj1.image = ArrayImage(data=gradient2)
+
+    def test_image_editor_pillow(self):
+        try:
+            import PIL.Image
+            from pyface.api import PILImage
+        except ImportError:
+            self.skipTest("Pillow is not available")
+
+        pil_image_1 = PIL.Image.open(filename1)
+        pil_image_2 = PIL.Image.open(filename2)
+
+        obj1 = ImageDisplay(
+            image=PILImage(image=pil_image_1)
+        )
+        view = View(
+            Item(
+                'image',
+                editor=ImageEditor()
+            )
+        )
+
+        # This should not fail.
+        with create_ui(obj1, dict(view=view)) as ui:
+            obj1.image = PILImage(image=pil_image_2)
+
+    def test_image_editor_none(self):
+
+        obj1 = ImageDisplay()
+        view = View(
+            Item(
+                'image',
+                editor=ImageEditor()
+            )
+        )
+
+        # This should not fail.
+        with create_ui(obj1, dict(view=view)) as ui:
+            pass

traitsui/wx/image_editor.py

@@ -51,5 +51,4 @@ def update_editor(self):
         """
         if self.factory.image is None:
             value = self.value
-            if isinstance(value, ImageResource):
-                self.control.Bitmap(convert_bitmap(value))
+            self.control.Bitmap(convert_bitmap(value))