Changeset d4c19e5 in sasview


Ignore:
Timestamp:
Aug 12, 2011 1:48:47 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:
390742c
Parents:
38cfa7a
Message:

fixing setup_exe-ing of sansview app

Location:
sansview
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • sansview/installer_new.iss

    rfa597990 rd4c19e5  
    1919LicenseFile=license.txt 
    2020OutputBaseFilename=setupSansView 
    21 SetupIconFile=C:\Documents and Settings\galina\workspace\trunk\sansview\images\ball.ico 
     21SetupIconFile=images\ball.ico 
    2222Compression=lzma 
    2323SolidCompression=yes 
    … …  
    2626 
    2727[Registry] 
    28 Root: HKCR;     Subkey: ".xml"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    29 Root: HKCR;     Subkey: ".txt"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    30 Root: HKCR;     Subkey: ".asc"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    31 Root: HKCR;     Subkey: ".dat"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    32 Root: HKCR;     Subkey: ".tif"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    33 Root: HKCR;     Subkey: ".abs"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    34 Root: HKCR;     Subkey: ".d1d"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    35 Root: HKCR;     Subkey: ".sans";        ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
     28Root: HKCR;     Subkey: ".txt\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     29Root: HKCR;     Subkey: ".xml\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     30Root: HKCR;     Subkey: ".tif\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     31Root: HKCR;     Subkey: ".tiff\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     32Root: HKCR;     Subkey: ".asc\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     33Root: HKCR;     Subkey: ".dat\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     34Root: HKCR;     Subkey: ".sans\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     35Root: HKCR; Subkey: "applications\SansView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""" ; Flags: uninsdeletevalue noerror 
     36Root: HKCU;     Subkey: "Software\Classes\.txt\OpenWithList\SansView.exe"; Flags: uninsdeletekey noerror 
     37Root: HKCU;     Subkey: "Software\Classes\.xml\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     38Root: HKCU;     Subkey: "Software\Classes\.asc\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     39Root: HKCU;     Subkey: "Software\Classes\.dat\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     40Root: HKCU;     Subkey: "Software\Classes\.tif\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     41Root: HKCU;     Subkey: "Software\Classes\.tiff\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     42Root: HKCU;     Subkey: "Software\Classes\.sans\openwithlist\SansView.exe"; Flags: uninsdeletekey noerror 
     43Root: HKCU; Subkey: "Software\Classes\applications\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""" ; Flags: uninsdeletevalue noerror 
    3644Root: HKCR;     Subkey: ".svs"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    37 Root: HKCR;     Subkey: ".fitv";        ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
     45Root: HKCR;     Subkey: ".fitv"; ValueType: string;     ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    3846Root: HKCR;     Subkey: ".inv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    3947Root: HKCR;     Subkey: ".prv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue 
    40 Root: HKCR; Subkey: "{app}\C:\Documents and Settings\galina\workspace\trunk\sansview\images\ball.ico";  ValueType: string; ValueName: "";       ValueData: "{app}\SansView.exe,0" 
    41 Root: HKCR; Subkey: "{app}\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""" 
     48Root: HKCR; Subkey: "{app}\SansView.exe"; ValueType: string; ValueName: ""; ValueData: "SansView File"; Flags: uninsdeletekey  
     49Root: HKCR; Subkey: "{app}\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""" ; Flags: uninsdeletevalue noerror 
     50Root: HKCR; Subkey: "{app}\images\ball.ico";    ValueType: string; ValueName: "";       ValueData: "{app}\SansView.exe,0" 
    4251Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";     ValueType: expandsz; ValueName: "SANSVIEWPATH"; ValueData: "{app}";      Flags: uninsdeletevalue 
    4352; Write to PATH (below) is disabled; need more work 
    … …  
    5362 
    5463 
     64 
    5565[Files] 
    56 Source: "C:\Documents and Settings\galina\workspace\trunk\sansview\scripts\dist\SansView.exe";  DestDir: "{app}";       Flags: ignoreversion 
     66Source: "dist\SansView.exe";    DestDir: "{app}";       Flags: ignoreversion 
    5767Source: "dist\*";       DestDir: "{app}";       Flags: ignoreversion recursesubdirs createallsubdirs 
    58 Source: "C:\Documents and Settings\galina\workspace\trunk\sansview\images\*";   DestDir: "{app}\images";        Flags: ignoreversion recursesubdirs createallsubdirs 
    59 Source: "C:\Documents and Settings\galina\workspace\trunk\sansview\test\*";     DestDir: "{app}\test";  Flags: ignoreversion recursesubdirs createallsubdirs 
     68Source: "images\*";     DestDir: "{app}\images";        Flags: ignoreversion recursesubdirs createallsubdirs 
     69Source: "media\*";      DestDir: "{app}\media"; Flags: ignoreversion recursesubdirs createallsubdirs 
     70Source: "test\*";       DestDir: "{app}\test";  Flags: ignoreversion recursesubdirs createallsubdirs 
    6071;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    6172 

  • sansview/local_config.py

    rfa597990 rd4c19e5  
    3737_license = "mailto:sansdanse@gmail.com" 
    3838 
    39 _nsf_logo = "images/nsf_logo.png" 
    40 _danse_logo = "images/danse_logo.png" 
    41 _inst_logo = "images/utlogo.gif" 
     39path = os.getcwd() 
     40icon_path = os.path.join(path, "images") 
     41media_path = os.path.join(path, "media") 
     42test_path = os.path.join(path, "test") 
     43 
     44_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
     45_danse_logo = os.path.join(icon_path, "danse_logo.png") 
     46_inst_logo = os.path.join(icon_path, "utlogo.gif") 
    4247_nsf_url = "http://www.nsf.gov" 
    4348_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    4449_inst_url = "http://www.utk.edu" 
    45 _corner_image = "images/angles_flat.png" 
    46 _welcome_image = "images/SVwelcome.png" 
     50_corner_image = os.path.join(icon_path, "angles_flat.png") 
     51_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    4752_copyright = "(c) 2009, University of Tennessee" 
    4853 
    49 path, _= os.path.split(os.getcwd()) 
    50 icon_path = os.path.join(path, "images") 
    51 media_path = os.path.join(path, "media") 
    52 test_path = os.path.join(path, "test") 
     54 
    5355#edit the list of file state your plugin can read 
    5456APPLICATION_WLIST = 'SansView files (*.svs)|*.svs' 

  • sansview/sansview.py

    rfa597990 rd4c19e5  
    5050        # modules. We load the fitting module here 
    5151        # to ensure a complete Windows executable build. 
    52  
     52         
    5353        # Fitting perspective 
    54         import sans.perspectives.fitting as module     
    55         fitting_plug = module.Plugin() 
    56         self.gui.add_perspective(fitting_plug) 
    57  
     54        try: 
     55            import sans.perspectives.fitting as module     
     56            fitting_plug = module.Plugin() 
     57            self.gui.add_perspective(fitting_plug) 
     58        except: 
     59            logging.error("SansView: could not find Fitting plug-in module") 
     60            logging.error(sys.exc_value)   
     61             
    5862        # P(r) perspective 
    5963        try: 
    … …  
    8488            logging.error("SansView: could not find Calculator plug-in module") 
    8589            logging.error(sys.exc_value)   
    86     
     90 
     91             
    8792        # Add welcome page 
    8893        self.gui.set_welcome_panel(WelcomePanel) 

  • sansview/setup_exe.py

    rfa597990 rd4c19e5  
    7575# to use the MatPlotLib. 
    7676# 
    77 current_dir = os.getcwd() 
    78 path, _ = os.path.split(current_dir) 
     77path = os.getcwd() 
     78 
    7979plugins_dir = os.path.join(path, "plugins") 
    8080media_dir = os.path.join(path, "media") 
    … …  
    8585matplotlibdata = findall(matplotlibdatadir) 
    8686data_files = [] 
    87 from glob import glob 
    88 data_files = [("Microsoft.VC90.CRT", glob(r'C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*'))] 
    89 sys.path.append("C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\redist\\x86\\Microsoft.VC90.CRT") 
    9087# Copying SLD data 
    9188import periodictable 
    9289import logging 
    9390data_files += periodictable.data_files() 
     91 
     92import sans.perspectives.fitting as fitting 
     93data_files += fitting.data_files() 
    9494 
    9595import sans.perspectives.calculator as calculator 
    … …  
    9898import sans.perspectives.invariant as invariant 
    9999data_files += invariant.data_files() 
     100 
    100101import sans.guiframe as guiframe 
    101102data_files += guiframe.data_files() 
    … …  
    114115    data_files.append(('.', [f])) 
    115116f = 'custom_config.py' 
     117if os.path.isfile(f): 
     118    data_files.append(('.', [f])) 
     119f = 'local_config.py' 
    116120if os.path.isfile(f): 
    117121    data_files.append(('.', [f])) 
    … …  
    134138for f in findall(plugins_dir): 
    135139    if os.path.split(f)[0].count('.svn')==0: 
    136         data_files.append((os.path.split(f)[0], [f])) 
     140        data_files.append(('plugins', [f])) 
    137141 
    138142     

  • sansview/welcome_panel.py

    rfa597990 rd4c19e5  
    9595        ScrolledPanel.__init__(self, parent, **kwds) 
    9696        self.SetupScrolling() 
    97         image = os.path.join("images","SVwelcome.png") 
     97        path = os.getcwd() 
     98        import local_config 
     99        #icon_path = os.path.join(path, "images") 
     100        #print "PPP", icon_path,path 
     101        image = os.path.join(local_config._welcome_image) 
    98102        self.SetWindowVariant(variant = FONT_VARIANT) 
    99103        self.bitmap_logo = wx.StaticBitmap(self, -1, wx.Bitmap(image)) 
Note: See TracChangeset for help on using the changeset viewer.