- Timestamp:
- Aug 19, 2016 7:21:28 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:
- c476457
- Parents:
- d3e1870 (diff), 4abcc93a (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:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/installer_generator.py
r6a698c0 r09afe90 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"""203 201 msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 204 202 msg += """Flags: recursesubdirs createallsubdirs\n""" -
sasview/sasview.py
r7f71637 rfdd3ba1 100 100 101 101 from matplotlib import backend_bases 102 backend_bases. _default_filetypes.pop('pgf', None)102 backend_bases.FigureCanvasBase.filetypes.pop('pgf', None) 103 103 104 104 class SasView(): -
sasview/setup_exe.py
r98d89df r09afe90 209 209 data_files += guiframe.data_files() 210 210 211 # precompile sas models into the sasview build path; doesn't matter too much212 # where it is so long as it is a place that will get cleaned up afterwards.213 import sasmodels.core214 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 the218 # data with installer_generator.py219 data_files.append(('compiled_models', compiled_dlls))220 221 211 import sasmodels 222 212 data_files += sasmodels.data_files()
Note: See TracChangeset
for help on using the changeset viewer.