- Timestamp:
- Feb 17, 2015 11:48:47 AM (10 years ago)
- 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:
- 00323d6
- Parents:
- 8729965 (diff), 3ef5b2f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Location:
- src/sas
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/guiframe/gui_manager.py
r8729965 r707c6be 2129 2129 logging.error("Error in _onTutorial: %s" % sys.exc_value) 2130 2130 try: 2131 #in case when the pdf default set other than acrobat 2132 import ho.pisa as pisa 2131 # Try an alternate method 2132 logging.error("Could not open the tutorial pdf, trying xhtml2pdf") 2133 from xhtml2pdf import pisa 2133 2134 pisa.startViewer(path) 2134 2135 except: 2136 logging.error("Could not open the tutorial pdf with xhtml2pdf") 2135 2137 msg = "This feature requires 'PDF Viewer'\n" 2136 msg += "Please install it first (Free)..."2137 2138 wx.MessageBox(msg, 'Error') 2138 2139 else: … … 2142 2143 except: 2143 2144 try: 2144 #in case when the pdf default set other than preview 2145 import ho.pisa as pisa 2145 # Try an alternate method 2146 logging.error("Could not open the tutorial pdf, trying xhtml2pdf") 2147 from xhtml2pdf import pisa 2146 2148 pisa.startViewer(path) 2147 2149 except: 2148 msg = "This feature requires 'Preview' Application\n"2149 msg += "Please install it first..."2150 logging.error("Could not open the tutorial pdf with xhtml2pdf") 2151 msg = "This feature requires the 'Preview' application\n" 2150 2152 wx.MessageBox(msg, 'Error') 2151 2153 -
src/sas/perspectives/fitting/report_dialog.py
rd06ae30 r4ec242e 17 17 import os 18 18 import wx.html as html 19 import logging 19 20 20 21 _STATICBOX_WIDTH = 480 … … 297 298 """ 298 299 Create a PDF file from html source string. 300 Returns True is the file creation was successful. 299 301 300 302 : data: html string 301 303 : filename: name of file to be saved 302 304 """ 303 import ho.pisa as pisa 304 f = file(filename, "wb") 305 # pisa requires some extra packages, see their web-site 306 pdf = pisa.CreatePDF(data, f) 307 308 # close the file here otherwise it will be open until quitting 309 #the application. 310 f.close() 311 self.Update() 312 return not pdf.err 305 try: 306 from xhtml2pdf import pisa 307 # open output file for writing (truncated binary) 308 resultFile = open(filename, "w+b") 309 # convert HTML to PDF 310 pisaStatus = pisa.CreatePDF(data, dest=resultFile) 311 # close output file 312 resultFile.close() 313 self.Update() 314 return pisaStatus.err 315 except: 316 logging.error("Error creating pdf: %s" % sys.exc_value) 317 return False -
src/sas/perspectives/invariant/report_dialog.py
r79492222 r4ec242e 18 18 import os 19 19 import wx.html as html 20 import logging 20 21 ISPDF = False 21 22 if sys.platform == "win32": … … 246 247 def HTML2PDF(self, data, filename): 247 248 """ 248 Create a PDF file from html source string. 249 Create a PDF file from html source string. 250 Returns True is the file creation was successful. 249 251 250 252 : data: html string 251 253 : filename: name of file to be saved 252 254 """ 253 import ho.pisa as pisa 254 f = file(filename, "wb") 255 # pisa requires some extra packages, see their web-site 256 pdf = pisa.CreatePDF(data, f) 257 # close the file here otherwise it will be open until quitting 258 #the application. 259 f.close() 260 261 return not pdf.err 262 263 264 255 try: 256 from xhtml2pdf import pisa 257 # open output file for writing (truncated binary) 258 resultFile = open(filename, "w+b") 259 # convert HTML to PDF 260 pisaStatus = pisa.CreatePDF(data, dest=resultFile) 261 # close output file 262 resultFile.close() 263 self.Update() 264 return pisaStatus.err 265 except: 266 logging.error("Error creating pdf: %s" % sys.exc_value) 267 return False -
src/sas/guiframe/local_perspectives/data_loader/data_loader.py
rb45cde3 r8729965 57 57 Show a general help dialog. 58 58 """ 59 from help_panel import HelpWindow 60 frame = HelpWindow(None, -1) 61 if hasattr(frame, "IsIconized"): 62 if not frame.IsIconized(): 63 try: 64 icon = self.parent.GetIcon() 65 frame.SetIcon(icon) 66 except: 67 pass 68 frame.Show(True) 59 # from documentation_window import DocumentationWindow 60 # _sphinx_doc_viewer = DocumentationWindow(self, -1, "/user/guiframe/ \ 61 # data_explorer_help.html", "DataLoader Help") 62 # from help_panel import HelpWindow 63 # frame = HelpWindow(None, -1) 64 # if hasattr(frame, "IsIconized"): 65 # if not frame.IsIconized(): 66 # try: 67 # icon = self.parent.GetIcon() 68 # frame.SetIcon(icon) 69 # except: 70 # pass 71 # frame.Show(True) 69 72 70 73 def populate_file_menu(self):
Note: See TracChangeset
for help on using the changeset viewer.