Changes in / [a4a1ac9:6015eee] in sasview

Location:

src/sas/sasgui

Files:

• guiframe/report_dialog.py (modified) (4 diffs)
• guiframe/report_image_handler.py (deleted)
• perspectives/fitting/basepage.py (modified) (2 diffs)
• perspectives/fitting/report_dialog.py (modified) (1 diff)
• perspectives/invariant/invariant_panel.py (modified) (2 diffs)
• perspectives/invariant/invariant_state.py (modified) (2 diffs)
• perspectives/invariant/report_dialog.py (modified) (1 diff)

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__)
@@ -71 +70 @@
         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()
@@ -120 +117 @@
 
 
-    def onClose(self, event=None):
+    def OnClose(self, event=None):
         """
         Close the Dialog
@@ -126 +123 @@
         """
         for fig in self.fig_urls:
-            ReportImageHandler.remove_figure(fig)
+            self.imgRAM.RemoveFile(fig)
 
-        self.Destroy()
+        self.Close()
 
     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
@@ -652 +651 @@
         by plotting, putting it into wx.FileSystem image object
         """
-        bitmaps = []
-        for canvas in canvases:
-            bitmaps.append(canvas.bitmap)
-        imgs, refs = ReportImageHandler.set_figs(figs, bitmaps, 'fit')
-
-        return ReportImageHandler.instance, imgs, refs
+        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
+
 
     def on_save(self, event):

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

@@ -72 +72 @@
         filename = basename + ext
 
-        # 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)
+        # 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)
 
         # translate png references int html from in-memory name to on-disk name
-        html = self.report_html.replace("memory:", basename+'_')
+        html = self.report_html.replace("memory:img_fit", basename+'_img')
 
         #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__)
@@ -784 +783 @@
         report_img = self.state.image
         report_list = [report_html_str, report_text_str, report_img]
-        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 = ReportDialog(report_list, None, -1, "")
         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
@@ -612 +611 @@
         wximgbmp = wx.BitmapFromImage(wximg)
         # store the image in wx.FileSystem Object
-        imgs, refs = ReportImageHandler.set_figs([fig], [wximgbmp], 'inv')
-
-        self.wximgbmp = refs[0]
-        self.image = imgs[0]
+        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
 
 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] % self.fig_urls[0]
+        self.report_html = self.report_list[0] % "memory:img_inv.png"
         # layout
         self._setup_layout()