Changeset 657e52c in sasview for sansview


Ignore:
Timestamp:
Dec 14, 2012 2:50:24 PM (11 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:
0203ade
Parents:
aa01d07b
Message:

merging from the release 2.2.0

Location:
sansview
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed

  • sansview/default_categories.p

    r8e24480 r657e52c  
    211211I01 
    212212tp107 
     213a(S'MassSurfaceFractal' 
     214p108 
     215I01 
     216tp109 
     217a(S'Core2ndMomentModel' 
     218p110 
     219I01 
     220tp111 
     221a(S'RPA10Model' 
     222p112 
     223I01 
     224tp113 
     225a(S'TwoLorentzianModel' 
     226p114 
     227I01 
     228tp115 
     229a(S'DebyeModel' 
     230p116 
     231I01 
     232tp117 
     233a(S'MassFractalModel' 
     234p118 
     235I01 
     236tp119 
    213237a(S'GuinierPorodModel' 
    214 p108 
    215 I01 
    216 tp109 
    217 a(S'MassSurfaceFractal' 
    218 p110 
    219 I01 
    220 tp111 
    221 a(S'Core2ndMomentModel' 
    222 p112 
    223 I01 
    224 tp113 
    225 a(S'RPA10Model' 
    226 p114 
    227 I01 
    228 tp115 
    229 a(S'TwoLorentzianModel' 
    230 p116 
    231 I01 
    232 tp117 
    233 a(S'DebyeModel' 
    234 p118 
    235 I01 
    236 tp119 
    237 a(S'MassFractalModel' 
    238238p120 
    239239I01 
    240240tp121 
     241a(S'CorrLengthModel' 
     242p122 
     243I01 
     244tp123 
     245a(S'PolymerExclVolume' 
     246p124 
     247I01 
     248tp125 
     249a(S'FractalModel' 
     250p126 
     251I01 
     252tp127 
     253a(S'ReflectivityModel' 
     254p128 
     255I01 
     256tp129 
     257a(S'PeakLorentzModel' 
     258p130 
     259I01 
     260tp131 
     261a(S'BroadPeakModel' 
     262p132 
     263I01 
     264tp133 
     265a(S'ReflectivityIIModel' 
     266p134 
     267I01 
     268tp135 
     269a(S'PeakGaussModel' 
     270p136 
     271I01 
     272tp137 
     273a(S'FractalCoreShellModel' 
     274p138 
     275I01 
     276tp139 
    241277a(S'Poly_GaussCoil' 
    242 p122 
    243 I01 
    244 tp123 
    245 a(S'CorrLengthModel' 
    246 p124 
    247 I01 
    248 tp125 
    249 a(S'PolymerExclVolume' 
    250 p126 
    251 I01 
    252 tp127 
    253 a(S'FractalModel' 
    254 p128 
    255 I01 
    256 tp129 
    257 a(S'ReflectivityModel' 
    258 p130 
    259 I01 
    260 tp131 
    261 a(S'PeakLorentzModel' 
    262 p132 
    263 I01 
    264 tp133 
    265 a(S'BroadPeakModel' 
    266 p134 
    267 I01 
    268 tp135 
    269 a(S'ReflectivityIIModel' 
    270 p136 
    271 I01 
    272 tp137 
    273 a(S'PeakGaussModel' 
    274 p138 
    275 I01 
    276 tp139 
    277 a(S'FractalCoreShellModel' 
    278278p140 
    279279I01 

  • sansview/local_config.py

    r9cd75d7 r657e52c  
    1212__version__ = sans.sansview.__version__ 
    1313__build__ = sans.sansview.__build__ 
    14 __download_page__ = 'https://sourceforge.net/projects/sansviewproject/files/' 
    15 __update_URL__ = 'http://sansviewproject.svn.sourceforge.net/viewvc/sansviewproject/trunk/sansview.latestversion' 
     14__download_page__ = 'http://sourceforge.net/projects/sasview/files/' 
     15__update_URL__ = ['svn.code.sf.net',  
     16                  '/p/sasview/code/trunk/sansview.latestversion'] 
    1617 
    1718 
    … …  
    3536 
    3637''' 
    37 _homepage = "http://danse.chem.utk.edu" 
    38 _download = "https://sourceforge.net/projects/sansviewproject/" 
     38_homepage = "http://www.sasview.org" 
     39_download = __download_page__ 
    3940_authors = [] 
    40 _paper = "http://sourceforge.net/apps/trac/sansviewproject/report" 
    41 _license = "mailto:sansviewproject-developers@lists.sourceforge.net" 
     41_paper = "http://sourceforge.net/p/sasview/tickets/" 
     42_license = "mailto:help@sasview.org" 
    4243 
    4344 
    … …  
    4748test_path =  os.path.abspath(os.path.join(os.path.dirname(__file__), "test")) 
    4849 
    49 _nist_logo = "images/nist_logo.png" 
    50 _umd_logo = "images/umd_logo.png" 
    51 _sns_logo = "images/sns_logo.png" 
     50_nist_logo = os.path.join(icon_path, "nist_logo.png") 
     51_umd_logo = os.path.join(icon_path, "umd_logo.png") 
     52_sns_logo = os.path.join(icon_path, "sns_logo.png") 
     53_isis_logo = os.path.join(icon_path, "isis_logo.png") 
     54_ess_logo = os.path.join(icon_path, "ess_logo.png") 
     55_ill_logo = os.path.join(icon_path, "ill_logo.png") 
    5256_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    5357_danse_logo = os.path.join(icon_path, "danse_logo.png") 
    … …  
    5761_sns_url = "http://neutrons.ornl.gov/" 
    5862_nsf_url = "http://www.nsf.gov" 
     63_isis_url = "http://www.isis.stfc.ac.uk/" 
     64_ess_url = "http://ess-scandinavia.eu/" 
     65_ill_url = "http://www.ill.eu/" 
    5966_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    6067_inst_url = "http://www.utk.edu" 

  • sansview/welcome_panel.py

    r0b96d74 r657e52c  
    9595                                               "Comments? Bugs? Requests?") 
    9696        send_ticket = "Send us a ticket at: " 
    97         send_ticket += "sansviewproject-developers@lists.sourceforge.net" 
     97        send_ticket += "help@sasview.org" 
    9898        self.hyperlink_paper = wx.lib.hyperlink.HyperLinkCtrl(self, -1, 
    9999            send_ticket, URL=config._license) 
Note: See TracChangeset for help on using the changeset viewer.