- Timestamp:
- Jul 28, 2015 10:14:38 AM (9 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:
- a910c788
- Parents:
- ae2a197 (diff), d06c34c (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:
- sasview
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/sasview.py
r199bb42b r78f75d02 91 91 APP_NAME = 'SasView' 92 92 93 class SasViewApp(gui_manager.ViewApp):94 """95 """96 97 98 93 class SasView(): 99 94 """ … … 104 99 """ 105 100 #from gui_manager import ViewApp 106 self.gui = SasViewApp(0)101 self.gui = gui_manager.SasViewApp(0) 107 102 # Set the application manager for the GUI 108 103 self.gui.set_manager(self) … … 126 121 try: 127 122 import sas.perspectives.pr as module 128 pr_plug = module.Plugin( standalone=False)123 pr_plug = module.Plugin() 129 124 self.gui.add_perspective(pr_plug) 130 125 except: … … 135 130 try: 136 131 import sas.perspectives.invariant as module 137 invariant_plug = module.Plugin( standalone=False)132 invariant_plug = module.Plugin() 138 133 self.gui.add_perspective(invariant_plug) 139 134 except: … … 145 140 try: 146 141 import sas.perspectives.calculator as module 147 calculator_plug = module.Plugin( standalone=False)142 calculator_plug = module.Plugin() 148 143 self.gui.add_perspective(calculator_plug) 149 144 except: -
sasview/README.txt
r8bea1519 r9533593 4 4 1- Features 5 5 =========== 6 7 - New in Version 3.1.1 8 -------------------- 9 - Fixes bug #457 that prevented SasView from starting if the user was not 10 connected to the internet, or was behind a proxy server. 6 11 7 12 - New in Version 3.1.0 … … 302 307 different browser and set that as your default browser. Issues have 303 308 been noted with Internet Explorer 11. 309 - Check for Updates may fail (with the status bar message ' Cannot 310 connect to the application server') if your internet connection uses 311 a proxy server. Tested resolutions for this are described on the 312 website FAQ. 304 313 - The copy and paste functions (^C, ^V) in the batch mode results grid 305 314 require two clicks: one to select the cell and a second to select the -
sasview/__init__.py
rbc84fa7 r9533593 1 __version__ = "3.1. 0"1 __version__ = "3.1.1" 2 2 __build__ = "1" -
sasview/local_config.py
r5846bb5 r957af0d 13 13 __build__ = sas.sasview.__build__ 14 14 __download_page__ = 'https://github.com/SasView/sasview/releases' 15 __update_URL__ = ['raw.githubusercontent.com', 16 '/SasView/sasview/master/sasview.latestversion'] 17 15 __update_URL__ = 'http://www.sasview.org/latestversion.json' 18 16 19 17 # Debug message flag … … 131 129 DEFAULT_PERSPECTIVE = 'None' 132 130 131 # Time out for updating sasview 132 UPDATE_TIMEOUT = 2 133 133 134 def printEVT(message): 134 135 if __EVT_DEBUG__: -
sasview/setup_mac.py
r018582f r49cd712 116 116 CFBundleTypeRole="Shell" )],) 117 117 118 #Get version - NB nasty hack. Need to find correct way to give path to installed sasview (AJJ) 119 import __init__ as sasviewver 120 121 VERSION = sasviewver.__version__ 122 APPNAME = "SasView "+VERSION 123 DMGNAME = "SasView-"+VERSION 124 118 125 APP = ['sasview.py'] 119 126 DATA_FILES += ['images','test','media'] … … 133 140 } 134 141 setup( 135 name= "sasview",142 name=APPNAME, 136 143 app=APP, 137 144 data_files=DATA_FILES, … … 140 147 setup_requires=['py2app'], 141 148 ) 149 150 #Build dmg 151 DMG="dist/%s.dmg"%DMGNAME 152 if os.path.exists(DMG): os.unlink(DMG) 153 os.system('cd dist && ../../build_tools/dmgpack.sh "%s" "%s.app"'%(DMGNAME,APPNAME)) 154 os.system('chmod a+r "%s"'%DMG) 155
Note: See TracChangeset
for help on using the changeset viewer.