Changeset f718919 in sasview


Ignore:
Timestamp:
Mar 20, 2016 11:49:26 AM (9 years ago)
Author:
ajj
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:
66f21cd
Parents:
1ca0ac0 (diff), e2c22b5 (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.
Message:

Merge branch 'master' of ​https://github.com/sasview/sasview

Files:
5 added
8 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/user/analysis.rst

    r2dd1dd3 r8f46df7  
    1 SasView Documentation: Types of Analysis 
    2 ======================================== 
     1Types of Analysis 
     2================= 
    33 
    44.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 

  • docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting.rst

    r49148bb re2c22b5  
    11.. _Fitting_Documentation: 
    22 
    3 Fitting Documentation 
    4 ===================== 
     3Model Fitting 
     4============= 
    55 
    66.. toctree:: 

  • docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst

    r49148bb r8dcc9bc6  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55 
    6 Invariant Calculation Perspective 
    7 ================================= 
     6Invariant Calculation 
     7===================== 
    88 
    99Description 

  • docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.rst

    r49148bb rca5f55f  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55 
    6 P(r) Inversion Perspective 
    7 ========================== 
     6P(r) Inversion 
     7============== 
    88 
    99Description 

  • docs/sphinx-docs/source/user/tools.rst

    r2dd1dd3 r8f46df7  
    1 SasView Documentation: Tools 
    2 ============================ 
     1Tools 
     2===== 
    33 
    44.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 

  • docs/sphinx-docs/source/user/user.rst

    ra407a40 r8f46df7  
    77   :maxdepth: 1 
    88 
    9    Old SasView Model Documentation <models/olddocs/model_functions> 
     9   SasView (4.x.x) Model Documentation <index> 
     10 
     11   SasView (3.x.x) Model Documentation <models/olddocs/model_functions> 
    1012    
    11    New SasModels Model Documentation <index> 
     13   Analysis <analysis> 
    1214    
    1315   Tools <tools> 
    14     
    15    Types of Analysis <analysis> 
    16  
    17    Data Formats <sasgui/guiframe/data_formats_help> 
    18     
    19    Loading Data <sasgui/guiframe/data_explorer_help> 
    20     
    21    Plotting Data/Models <sasgui/guiframe/graph_help> 
    22        
    23    Test Data <../test/testdata_help.rst> 
     16          
     17   Working with SasView <working> 

  • sasview/sasview.py

    rd85c194 r558d64e  
    7979#wxcruft.trace_new_id() 
    8080 
    81 # The below will make sure that sasview application uses the matplotlib font 
    82 # bundled with sasview. 
    83 if hasattr(sys, 'frozen'): 
    84     mplconfigdir = os.path.join(os.path.expanduser("~"), '.matplotlib') 
    85     if not os.path.exists(mplconfigdir): 
    86         os.mkdir(mplconfigdir) 
    87     os.environ['MPLCONFIGDIR'] = mplconfigdir 
    88     reload(sys) 
    89     sys.setdefaultencoding("iso-8859-1") 
     81#Always use private .matplotlib setup to avoid conflicts with other 
     82#uses of matplotlib 
     83mplconfigdir = os.path.join(os.path.expanduser("~"),'.sasview','.matplotlib') 
     84if not os.path.exists(mplconfigdir): 
     85    os.mkdir(mplconfigdir) 
     86os.environ['MPLCONFIGDIR'] = mplconfigdir 
     87reload(sys) 
     88sys.setdefaultencoding("iso-8859-1") 
    9089from sas.sasgui.guiframe import gui_manager 
    9190from sas.sasgui.guiframe.gui_style import GUIFRAME 

  • src/sas/sasgui/guiframe/CategoryInstaller.py

    rd85c194 r1ca0ac0  
    176176            json.dump( master_category_dict, 
    177177                         open(serialized_file, 'wb') ) 
    178              
    179             try: 
    180                 #It happens only in source environment 
    181                 shutil.copyfile(serialized_file, default_file) 
    182             except: 
    183                 pass 
    184          
Note: See TracChangeset for help on using the changeset viewer.