Changeset 3dac5e2 in sasview for fittingview/src/sans

Timestamp:

Jan 23, 2012 1:44:31 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

eeb8f50

Parents:

83e0aa1

Message:

changed the path of html image to the relative

File:

• fittingview/src/sans/perspectives/fitting/report_dialog.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/report_dialog.py

@@ -185 +185 @@
             #Note:The str for pic_fname shouldn't be removed.
             if self.nimages == 1:
-                html = report_frame % str(pic_fname[0])
+                html = report_frame % str(os.path.basename(pic_fname[0]))
             elif self.nimages == 2:
-                html = report_frame % (str(pic_fname[0]), str(pic_fname[1]))
+                html = report_frame % (str(os.path.basename(pic_fname[0])), 
+                                       str(os.path.basename(pic_fname[1])))
             elif self.nimages == 3:
-                html = report_frame % (str(pic_fname[0]), str(pic_fname[1]),
-                                          str(pic_fname[2]))
+                html = report_frame % (str(os.path.basename(pic_fname[0])), 
+                                       str(os.path.basename(pic_fname[1])),
+                                       str(os.path.basename(pic_fname[2])))
 
             # make/open file in case of absence
@@ -233 +235 @@
         if ext_num == (1 - ind_cor):
             if self.nimages == 1:
-                report = report_frame % pic_fname[0]
+                report = report_frame % os.path.basename(pic_fname[0])
             elif self.nimages == 2:
-                report = report_frame % (pic_fname[0], pic_fname[1])
+                report = report_frame % (os.path.basename(pic_fname[0]), 
+                                         os.path.basename(pic_fname[1]))
             elif self.nimages == 3:
-                report = report_frame % (pic_fname[0], pic_fname[1],
-                                          pic_fname[2])
+                report = report_frame % (os.path.basename(pic_fname[0]), 
+                                         os.path.basename(pic_fname[1]),
+                                         os.path.basename(pic_fname[2]))
         f = open(fName, 'w')
         f.write(report)