Changeset 213b445 in sasview


Ignore:
Timestamp:
Apr 4, 2012 12:27:00 PM (12 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:
7954acd
Parents:
93f0a862
Message:

'report save as pdf' enabled on windows

Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r091c702 r213b445  
    3333elif sys.platform == "darwin": 
    3434    ISMAC = True 
    35      
     35ISPDF = True    
    3636 
    3737         
    … …  
    5858        self.SetWindowVariant(variant=FONT_VARIANT) 
    5959        # check if tit is MAC 
    60         self.is_mac = ISMAC 
     60        self.is_pdf = ISPDF 
    6161        # report string 
    6262        self.report_list = list 
    … …  
    139139        """ 
    140140        # pdf supporting only on MAC, not on exe 
    141         if self.is_mac: 
     141        if self.is_pdf: 
    142142            wild_card = ' PDF files (*.pdf)|*.pdf|' 
    143143            ind_cor = 0  

  • sansview/setup_exe.py

    rd0f5103 r213b445  
    287287# packages 
    288288# 
    289 packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com'] 
     289packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com', 'ho.pisa'] 
     290packages.extend([ 
     291'reportlab', 
     292'reportlab.graphics.charts', 
     293'reportlab.graphics.samples', 
     294'reportlab.graphics.widgets', 
     295'reportlab.graphics.barcode', 
     296'reportlab.graphics', 
     297'reportlab.lib', 
     298'reportlab.pdfbase', 
     299'reportlab.pdfgen', 
     300'reportlab.platypus', 
     301]) 
    290302includes = ['site'] 
    291303 

  • setup.py

    r2d48360 r213b445  
    307307#            'periodictable>=1.3.0', 'scipy>=0.7.2'] 
    308308required = ['lxml','periodictable>=1.3.0'] 
    309 """ 
     309 
    310310if os.name=='nt': 
    311     #required.extend(['comtypes', 'pisa', 'html5lib', 'reportlab']) 
    312     #required.extend(['pisa', 'html5lib']) 
    313     #if sys.version_info < (2, 5): 
    314     #required.append('comtypes==0.6.2') 
     311    required.extend(['pisa', 'html5lib', 'reportlab']) 
    315312else: 
    316 """ 
    317 if os.name != 'nt': 
    318313    required.extend(['pil']) 
    319314    
Note: See TracChangeset for help on using the changeset viewer.