Changeset fa412df in sasview for src/sas/sasgui/perspectives

Timestamp:

Sep 6, 2018 10:58:01 AM (7 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:

d0ce666f

Parents:

ec4b19c

Message:

Simplify calling image handler and add documentation.

Location:

src/sas/sasgui/perspectives

Files:

• fitting/basepage.py (modified) (1 diff)
• invariant/invariant_panel.py (modified) (2 diffs)
• invariant/invariant_state.py (modified) (1 diff)

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

@@ -652 +652 @@
         by plotting, putting it into wx.FileSystem image object
         """
-
-        img_handler = ReportImageHandler()
         bitmaps = []
         for canvas in canvases:
             bitmaps.append(canvas.bitmap)
-        imgs, refs = img_handler.instance.set_figs(figs, bitmaps, 'fit')
-
-        return img_handler.instance.img_holder, imgs, refs
+        imgs, refs = ReportImageHandler.set_figs(figs, bitmaps, 'fit')
+
+        return ReportImageHandler.instance, imgs, refs
 
     def on_save(self, event):

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]
-        imgRAM = self.state.img_handler
+        imgRAM = ReportImageHandler.instance.img_holder
         refs = [self.state.wximgbmp]
         dialog = ReportDialog(report_list, imgRAM, refs, None, wx.ID_ANY, "")

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

@@ -612 +612 @@
         wximgbmp = wx.BitmapFromImage(wximg)
         # store the image in wx.FileSystem Object
-        self.img_handler = ReportImageHandler()
-        imgs, refs = self.img_handler.instance.set_figs([fig], [wximgbmp], 'inv')
+        imgs, refs = ReportImageHandler.set_figs([fig], [wximgbmp], 'inv')
 
         self.wximgbmp = refs[0]