- Timestamp:
- Aug 22, 2016 4:08:36 AM (8 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- c97d76a
- Parents:
- 6f343e3 (diff), 525aaa2 (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/README.txt
r243fbc0 ree6d4ad 4 4 1- Features 5 5 =========== 6 7 - New in Version 4.0.0-beta 8 -------------------- 9 This beta adds support for the magnetic and multilevel models of 3.1.2 10 and along with a host of bug fixes found in the alpha. 11 12 - Model package changes and improvements 13 - All 3.1.2 models now available in new interface 14 - Old custom models should now still work 15 - '''NOTE:''' These will be deprecated in a future version. Old 16 custom models should be converted to the new model format which 17 is now the same as the built in models and offers much better 18 support. 19 - Custom model editor now creates new style models 20 - Custom model editor supports better error checking 21 - Documentation improvements 22 - Continued general cleanup 23 - Other improvements/additions 24 - Support for new canSAS 2D data files added 25 - Plot axes range can now be set manually as well as by zooming 26 - Plot annotations can now be moved around after being placed on plot. 27 - The active optimizer is now listed on the top of the fit panel. 28 - Linear fits now update qmin and max when the x scale limits are 29 changed. Also the plot range no longer resets after a fit. 30 - Bug fixes 31 - Fixes bug #511 Errors in linearized fits and clean up of interface 32 including Kratky representation 33 - Fixes bug #186 Data operation Tool now executes when something is 34 entered in the text box and does not wait for the user to hit enter 35 - Fixes bug #459 plot context menu bug 36 - Fixes bug #559 copy to clipboard in graph menu broken 37 - Fixes bug #466 cannot remove a linear fit from graph 38 - Numerous bugs introduced in the alpha 39 40 6 41 7 42 - New in Version 4.0.0-alpha -
sasview/__init__.py
r801a296 r4394be16 1 __version__ = "4.0.0- alpha"1 __version__ = "4.0.0-beta" 2 2 __build__ = "GIT_COMMIT" 3 3 try: -
sasview/installer_generator.py
r09afe90 r525aaa2 199 199 msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t""" 200 200 msg += """Flags: recursesubdirs createallsubdirs\n""" 201 msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t""" 202 msg += """Flags: recursesubdirs createallsubdirs\n""" 201 203 msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 202 204 msg += """Flags: recursesubdirs createallsubdirs\n""" -
sasview/setup_exe.py
r09afe90 r525aaa2 209 209 data_files += guiframe.data_files() 210 210 211 # precompile sas models into the sasview build path; doesn't matter too much 212 # where it is so long as it is a place that will get cleaned up afterwards. 213 import sasmodels.core 214 dll_path = os.path.join(build_path, 'compiled_models') 215 compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double') 216 217 # include the compiled models as data; coordinate the target path for the 218 # data with installer_generator.py 219 data_files.append(('compiled_models', compiled_dlls)) 220 211 221 import sasmodels 212 222 data_files += sasmodels.data_files() -
sasview/sasview.py
rcde6e52 r2387abc 148 148 logging.error(traceback.format_exc()) 149 149 150 # Corfunc perspective 151 try: 152 import sas.sasgui.perspectives.corfunc as module 153 corfunc_plug = module.Plugin() 154 self.gui.add_perspective(corfunc_plug) 155 except: 156 logging.error("Unable to load corfunc module") 157 150 158 #Calculator perspective 151 159 try:
Note: See TracChangeset
for help on using the changeset viewer.