Changes in src/sas/sasgui/perspectives/fitting/basepage.py [b4398819:5ae083b] in sasview

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (6 diffs)

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):
@@ -2907 +2884 @@
             self.magnetic_on = True
             button.SetLabel("Magnetic OFF")
-            m_value = 1.0e-06
+            m_value = 1
             for key in self.model.magnetic_params:
                 if key.count('M0') > 0:
                     self.model.setParam(key, m_value)
-                    m_value += 0.5e-06
+                    m_value += 0.5
         else:
             self.magnetic_on = False
@@ -2973 +2950 @@
         Get the string copies of the param names and values in the tap
         """
-        content = 'sasview_parameter_values:'
+        content = 'sasview_parameter_values;'
         # Do it if params exist
         if self.parameters:
@@ -3235 +3212 @@
                 logger.error(traceback.format_exc())
             content += name + ',' + str(check) + ',' + value + disfunc + ',' + \
-                       bound_lo + ',' + bound_hi + ':'
+                       bound_lo + ',' + bound_hi + ';'
 
         return content
@@ -3274 +3251 @@
         context = {}
         # put the text into dictionary
-        lines = text.split(':')
+        lines = text.split(';')
         if lines[0] != 'sasview_parameter_values':
             self._copy_info(False)