Changeset 5818dae in sasview

Timestamp:

Apr 4, 2018 2:14:46 PM (6 years ago)

Author:

wojciech

Branches:

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

Children:

062c9ea

Parents:

2a24d55

Message:

Reverted save button as potential solution to the problem has been found

Location:

src/sas

Files:

• sascalc/fit/pagestate.py (modified) (1 diff)
• sasgui/guiframe/report_dialog.py (modified) (5 diffs)
• sasgui/perspectives/fitting/basepage.py (modified) (2 diffs)

src/sas/sascalc/fit/pagestate.py

@@ -725 +725 @@
         # final report html strings
         report_str = html_str + ELINE.join(image_links)
-
+        report_str += FEET_3
         return report_str, text_str
 

src/sas/sasgui/guiframe/report_dialog.py

@@ -27 +27 @@
 class BaseReportDialog(wx.Dialog):
 
-    def __init__(self, report_list, *args, **kwds):
+    def __init__(self, report_list, imgRAM, fig_urls, *args, **kwds):
         """
         Initialization. The parameters added to Dialog are:
@@ -37 +37 @@
         kwds["image"] = 'Dynamic Image'
 
+        #MemoryFSHandle for storing images
+        self.imgRAM = imgRAM
+        #Images location in urls
+        self.fig_urls = fig_urls
         # title
         self.SetTitle("Report")
@@ -75 +79 @@
         hbox.Add(button_print)
 
-        if sys.platform == "win32":
-            button_save = wx.Button(self, wx.NewId(), "Save")
-            button_save.SetToolTipString("Save this report.")
-            button_save.Bind(wx.EVT_BUTTON, self.onSave, id=button_save.GetId())
-            hbox.Add(button_save)
+        button_save = wx.Button(self, wx.NewId(), "Save")
+        button_save.SetToolTipString("Save this report.")
+        button_save.Bind(wx.EVT_BUTTON, self.onSave, id=button_save.GetId())
+        hbox.Add(button_save)
 
         # panel for report page
@@ -112 +115 @@
         printh.PrintText(self.report_html)
 
+
     def OnClose(self, event=None):
         """
@@ -117 +121 @@
         : event: Close button event
         """
+        for fig in self.fig_urls:
+            self.imgRAM.RemoveFile(fig)
+
         self.Close()
 

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

@@ -641 +641 @@
         # get the strings for report
         report_str, text_str = self.state.report(fig_urls=refs)
-
         # Show the dialog
         report_list = [report_str, text_str, images]
-        dialog = ReportDialog(report_list, None, wx.ID_ANY, "")
+        dialog = ReportDialog(report_list, imgRAM, refs, None, wx.ID_ANY, "")
         dialog.Show()
 
@@ -677 +676 @@
             refs.append('memory:' + name)
             imgRAM.AddFile(name, canvas.bitmap, wx.BITMAP_TYPE_PNG)
-
             # append figs
             images.append(fig)