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

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/perspectives

Files:

• fitting/report_dialog.py (modified) (1 diff)
• invariant/report_dialog.py (modified) (1 diff)

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()