Changeset 412e9e8b in sasview

Timestamp:

Sep 17, 2017 11:46:04 PM (7 years ago)

Author:

butler

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50

Parents:

6479f3a

Message:

Fix viewer documentation

Replaced the three images for the image_viewer_help.rst with new ones
that reflect the latest features. Also replaced the bmp with png.
Finaly added a comment in the image_viewer.py code noting the close
error generated by PIL (for any non png images). This should complete
the work on this branch.

Location:

src/sas/sasgui/perspectives/calculator

Files:

• image_viewer.py (modified) (1 diff)
• media/image_viewer_help.rst (modified) (2 diffs)
• media/load_image.bmp (deleted)
• media/load_image.png (added)
• media/pic_convert.bmp (deleted)
• media/pic_convert.png (added)
• media/pic_plot.bmp (deleted)
• media/pic_plot.png (added)

src/sas/sasgui/perspectives/calculator/image_viewer.py

@@ -59 +59 @@
             _, extension = os.path.splitext(basename)
             try:
+                # Note that matplotlib only reads png natively.
+                # Any other formats (tiff, jpeg, etc) are passed
+                # to PIL which seems to have a problem in version
+                # 1.1.7 that causes a close error which shows up in 
+                # the log file.  This does not seem to have any adverse
+                # effects.  PDB   --- September 17, 2017.
                 img = mpimg.imread(file_path)
                 is_png = extension.lower() == '.png'

src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst

@@ -34 +34 @@
    will be displayed.
 
-.. image:: load_image.bmp
+.. image:: load_image.png
 
 3) To save, print, or copy the image, or to apply a grid overlay, right-click 
    anywhere in the plot.
 
-.. image:: pic_plot.bmp
+.. image:: pic_plot.png
 
 4. If the image is taken from a 2D detector, SasView can attempt to convert 
@@ -51 +51 @@
    then click the OK.
 
-.. image:: pic_convert.bmp
+.. image:: pic_convert.png
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ