Changeset 44e8f48 in sasview

Timestamp:

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

0863065

Parents:

d0ce666f

Message:

Be sure image handler is initialized in invariant panel and code cleanup.

Location:

src/sas/sasgui/perspectives

Files:

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

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

@@ -72 +72 @@
         filename = basename + ext
 
-        # save figures
-        pictures = []
-        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][i].savefig(pic_name)
-            pictures.append(pic_name)
-            i += 1
+        # save the images for use with pdf writer
+        pictures = [
+            '_'.join((basename, url.split(':')[1])) for url in self.fig_urls]
+        for i, pic in enumerate(pictures):
+            self.report_list[2][i].savefig(pic)
 
         # translate png references int html from in-memory name to on-disk name

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

@@ -784 +784 @@
         report_img = self.state.image
         report_list = [report_html_str, report_text_str, report_img]
+        ReportImageHandler.check_for_empty_instance()
         imgRAM = ReportImageHandler.instance.img_holder
         refs = [self.state.wximgbmp]