Changeset a4a1ac9 in sasview for src/sas

Timestamp:

Sep 10, 2018 1:26:03 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

17cccd0

Parents:

6015eee (diff), 44e8f48 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (09/10/18 13:26:03)

git-committer:

GitHub <noreply@…> (09/10/18 13:26:03)

Message:

Merge pull request #172 from SasView?/ticket-1166

Fix for report generation issue. Refs #1166.

Location:

src/sas

Files:

• sasgui/guiframe/report_dialog.py (modified) (4 diffs)
• sasgui/guiframe/report_image_handler.py (added)
• sasgui/perspectives/fitting/basepage.py (modified) (2 diffs)
• sasgui/perspectives/fitting/report_dialog.py (modified) (1 diff)
• sasgui/perspectives/invariant/invariant_panel.py (modified) (2 diffs)
• sasgui/perspectives/invariant/invariant_state.py (modified) (2 diffs)
• sasgui/perspectives/invariant/report_dialog.py (modified) (1 diff)
• sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) (2 diffs)
• sasview/__init__.py (modified) (1 diff)
• sasview/local_config.py (modified) (1 diff)
• sasview/test/1d_data/ISIS_Polymer_Blend_RT2.xml (added)
• sasview/test/1d_data/Ludox_silica.xml (added)
• sasview/test/1d_data/cansas1d.xsl (added)

src/sas/sasgui/guiframe/report_dialog.py

@@ -7 +7 @@
 import sys
 import wx.html as html
+from sas.sasgui.guiframe.report_image_handler import ReportImageHandler
 
 logger = logging.getLogger(__name__)
@@ -70 +71 @@
         button_close = wx.Button(self, wx.ID_OK, "Close")
         button_close.SetToolTipString("Close this report window.")
+        button_close.Bind(wx.EVT_BUTTON, self.onClose,
+                          id=button_close.GetId())
         hbox.Add(button_close)
         button_close.SetFocus()
@@ -117 +120 @@
 
 
-    def OnClose(self, event=None):
+    def onClose(self, event=None):
         """
         Close the Dialog
@@ -123 +126 @@
         """
         for fig in self.fig_urls:
-            self.imgRAM.RemoveFile(fig)
+            ReportImageHandler.remove_figure(fig)
 
-        self.Close()
+        self.Destroy()
 
     def HTML2PDF(self, data, filename):

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -31 +31 @@
 
 from sas.sasgui.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.report_image_handler import ReportImageHandler
 from sas.sasgui.guiframe.utils import format_number, check_float, IdList, \
     check_int
@@ -651 +652 @@
         by plotting, putting it into wx.FileSystem image object
         """
-        images = []
-        refs = []
-
-        # For no figures in the list, prepare empty plot
-        if figs is None or len(figs) == 0:
-            figs = [None]
-
-        # Loop over the list of figures
-        # use wx.MemoryFSHandler
-        imgRAM = wx.MemoryFSHandler()
-        for fig in figs:
-            if fig is not None:
-                ind = figs.index(fig)
-                canvas = canvases[ind]
-
-            # store the image in wx.FileSystem Object
-            wx.FileSystem.AddHandler(wx.MemoryFSHandler())
-
-            # index of the fig
-            ind = figs.index(fig)
-
-            # AddFile, image can be retrieved with 'memory:filename'
-            name = 'img_fit%s.png' % ind
-            refs.append('memory:' + name)
-            imgRAM.AddFile(name, canvas.bitmap, wx.BITMAP_TYPE_PNG)
-            # append figs
-            images.append(fig)
-
-        return imgRAM, images, refs
-
+        bitmaps = []
+        for canvas in canvases:
+            bitmaps.append(canvas.bitmap)
+        imgs, refs = ReportImageHandler.set_figs(figs, bitmaps, 'fit')
+
+        return ReportImageHandler.instance, imgs, refs
 
     def on_save(self, event):

src/sas/sasgui/perspectives/fitting/report_dialog.py

@@ -72 +72 @@
         filename = basename + ext
 
-        # save figures
-        pictures = []
-        for num in range(self.nimages):
-            pic_name = basename + '_img%s.png' % num
-            # save the image for use with pdf writer
-            self.report_list[2][num].savefig(pic_name)
-            pictures.append(pic_name)
+        # save the images for use with pdf writer
+        pictures = [
+            '_'.join((basename, url.split(':')[1])) for url in self.fig_urls]
+        for i, pic in enumerate(pictures):
+            self.report_list[2][i].savefig(pic)
 
         # translate png references int html from in-memory name to on-disk name
-        html = self.report_html.replace("memory:img_fit", basename+'_img')
+        html = self.report_html.replace("memory:", basename+'_')
 
         #set file extensions

src/sas/sasgui/perspectives/invariant/invariant_panel.py

@@ -24 +24 @@
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.guiframe.report_image_handler import ReportImageHandler
 
 logger = logging.getLogger(__name__)
@@ -783 +784 @@
         report_img = self.state.image
         report_list = [report_html_str, report_text_str, report_img]
-        dialog = ReportDialog(report_list, None, -1, "")
+        ReportImageHandler.check_for_empty_instance()
+        imgRAM = ReportImageHandler.instance.img_holder
+        refs = [self.state.wximgbmp]
+        dialog = ReportDialog(report_list, imgRAM, refs, None, wx.ID_ANY, "")
         dialog.Show()
 

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -12 +12 @@
 from lxml import etree
 from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader
+from sas.sasgui.guiframe.report_image_handler import ReportImageHandler
 from sas.sascalc.dataloader.readers.cansas_reader import get_content
 from sas.sasgui.guiframe.utils import format_number
@@ -611 +612 @@
         wximgbmp = wx.BitmapFromImage(wximg)
         # store the image in wx.FileSystem Object
-        wx.FileSystem.AddHandler(wx.MemoryFSHandler())
-        # use wx.MemoryFSHandler
-        self.imgRAM = wx.MemoryFSHandler()
-        # AddFile, image can be retrieved with 'memory:filename'
-        self.imgRAM.AddFile('img_inv.png', wximgbmp, wx.BITMAP_TYPE_PNG)
-
-        self.wximgbmp = 'memory:img_inv.png'
-        self.image = fig
+        imgs, refs = ReportImageHandler.set_figs([fig], [wximgbmp], 'inv')
+
+        self.wximgbmp = refs[0]
+        self.image = imgs[0]
 
 class Reader(CansasReader):

src/sas/sasgui/perspectives/invariant/report_dialog.py

@@ -41 +41 @@
 
         # put image path in the report string
-        self.report_html = self.report_list[0] % "memory:img_inv.png"
+        self.report_html = self.report_list[0] % self.fig_urls[0]
         # layout
         self._setup_layout()

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

@@ -11 +11 @@
 -----------
 
-This tool enables X-ray users to calculate the slit size (FWHM/2) for smearing
-based on their half beam profile data.
+This tool enables X-ray users to calculate the slit size (FWHM/2) for resolution 
+smearing purposes based on their half beam profile data (as Q vs Intensity; any 
+other data fields are ignored).
 
-*NOTE! Whilst it may have some more generic applicability, the calculator has
-only been tested with beam profile data from Anton-Paar SAXSess\ :sup:`TM` software.*
+Method
+------
+
+The tool works by sequentially summing 10 or more intensity values until a 
+maximum value is attained. It then locates the Q values for the points just before, 
+and just after, **half** of this maximum value and interpolates between them to get 
+an accurate value for the Q value for the half maximum.
+
+NOTE! Whilst it may have some more generic applicability, the calculator has
+only been tested with beam profile data from Anton-Paar SAXSess\ :sup:`TM`\  software.
+The beam profile file does not carry any information about the units of the 
+Q data. It is probably |nm^-1| but the resolution calculations assume the slit 
+height/width has units of |Ang^-1|. If the beam profile data is not in these 
+units then it, or the result, must be manually converted.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -27 +40 @@
 
    *NOTE! To see an example of the beam profile file format, visit the file
-   beam profile.DAT in your {installation_directory}/SasView/test folder.*
+   beam profile.DAT in your {installation_directory}/SasView/test_1d folder.*
 
 3) Once a data is loaded, the slit size is automatically computed and displayed
    in the tool window.
 
-*NOTE! The beam profile file does not carry any information about the units of
-the Q data. This calculator assumes the data has units of 1/\ |Ang|\ . If the
-data is not in these units it must be manually converted beforehand.*
-
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 01May2015
+.. note::  This help document was last changed by Steve King, 09Sep2018

src/sas/sasview/__init__.py

@@ -1 @@
-__version__ = "4.2.0-beta"
+__version__ = "4.2.0"
 __build__ = "GIT_COMMIT"

src/sas/sasview/local_config.py

@@ -48 +48 @@
 '''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.'''
 _acknowledgement_citation = \
-'''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675'''
+'''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041'''
 
 _acknowledgement =  \