Changeset d0ce666f in sasview for src

Timestamp:

Sep 6, 2018 2:11:25 PM (6 years ago)

Author:

krzywon

Branches:

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

Children:

44e8f48

Parents:

fa412df

Message:

Remove image references when report is closed and point to correct file locations when saving reports to PDF.

Location:

src/sas/sasgui

Files:

• guiframe/report_dialog.py (modified) (4 diffs)
• guiframe/report_image_handler.py (modified) (3 diffs)
• perspectives/fitting/report_dialog.py (modified) (1 diff)
• 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__)
@@ -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/guiframe/report_image_handler.py

@@ -1 +1 @@
 import wx
+import logging
+
+logger = logging.getLogger(__name__)
 
 
@@ -9 +12 @@
 
         def __init__(self):
+            wx.FileSystem.AddHandler(wx.MemoryFSHandler())
             self.img_holder = wx.MemoryFSHandler()
-            wx.FileSystem.AddHandler(wx.MemoryFSHandler())
             self.refs = {}
             self.indices = []
@@ -60 +63 @@
 
     @staticmethod
+    def check_for_empty_instance():
+        if ReportImageHandler.instance is None:
+            ReportImageHandler.instance = \
+                ReportImageHandler._ReportImageHandler()
+
+    @staticmethod
     def set_figs(figs, bitmaps, perspective):
-        if not ReportImageHandler.instance:
-            ReportImageHandler.instance = ReportImageHandler._ReportImageHandler()
+        ReportImageHandler.check_for_empty_instance()
         return ReportImageHandler.instance.set_figs(figs, bitmaps, perspective)
+
+    @staticmethod
+    def remove_figure(fig_url):
+        try:
+            ReportImageHandler.check_for_empty_instance()
+            ReportImageHandler.instance.refs.pop(fig_url)
+        except Exception as e:
+            logger.warn(e)

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

@@ -74 +74 @@
         # save figures
         pictures = []
-        for num in range(self.nimages):
-            pic_name = basename + '_img%s.png' % num
+        i = 0
+        for url in self.fig_urls:
+            append_me = url.split(':')[1]
+            pic_name = basename + '_{}'.format(append_me)
             # save the image for use with pdf writer
-            self.report_list[2][num].savefig(pic_name)
+            self.report_list[2][i].savefig(pic_name)
             pictures.append(pic_name)
+            i += 1
 
         # 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/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()