Changeset f2530048 in sasview

Timestamp:

Aug 29, 2018 5:04:23 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

e9359e0a

Parents:

906e0c7

Message:

report save functionality: fix saved images not being referenced in the HTML (was also breaking xhtml2pdf)

File:

• src/sas/qtgui/Utilities/ReportDialog.py (modified) (3 diffs)

src/sas/qtgui/Utilities/ReportDialog.py

@@ -3 +3 @@
 import re
 import logging
+import traceback
 from xhtml2pdf import pisa
 
@@ -100 +101 @@
         pictures = self.getPictures(basename)
 
-        # translate png references into html from base64 string to on-disk name
-        cleanr = re.compile('<img src.*$')
+        # self.data_html contains all images at the end of the report, in base64 form;
+        # replace them all with their saved on-disk filenames
+        cleanr = re.compile('<img src.*$', re.DOTALL)
         replacement_name = ""
         html = self.data_html
         for picture in pictures:
             replacement_name += '<img src="'+ picture + '"><p></p>'
+        replacement_name += '\n'
         # <img src="data:image/png;.*>  => <img src=filename>
         html = re.sub(cleanr, replacement_name, self.data_html)
@@ -178 +181 @@
                 return pisaStatus.err
         except Exception as ex:
-            logging.error("Error creating pdf: " + str(ex))
+            # logging.error("Error creating pdf: " + str(ex))
+            logging.error("Error creating pdf: " + traceback.format_exc())
         return False