Changeset b85502d in sasview


Ignore:
Timestamp:
Mar 20, 2016 6:04:20 PM (9 years ago)
Author:
krzywon
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:
832fea2
Parents:
9e531f2 (diff), 5f5c596 (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:
4 added
13 edited
9 moved

Legend:

Unmodified
Added
Removed

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

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

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

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

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

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

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

    r9dcd5ed rc90bce6  
    1717    models/hollow_cylinder.rst 
    1818    models/pearl_necklace.rst 
     19    models/pringle.rst 
    1920    models/stacked_disks.rst 

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

    re565eaf re4ca2eb  
    1313    models/linear_pearls.rst 
    1414    models/multi_shell.rst 
     15    models/onion.rst 
    1516    models/raspberry.rst 
    1617    models/sphere.rst 

  • sasview/installer.iss

    r25f223b r50008e3  
    7171Source: "dist\plugin_models\*"; DestDir: "{userdesktop}\..\.sasview\plugin_models";     Flags: recursesubdirs createallsubdirs 
    7272Source: "dist\config\custom_config.py"; DestDir: "{userdesktop}\..\.sasview\config";    Flags: recursesubdirs createallsubdirs 
    73 Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "serialized_cat.json"; 
     73Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "categories.json"; 
    7474;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    7575 

  • sasview/installer_generator.py

    rb699768 r50008e3  
    202202    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    203203    msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t"""  
    204     msg += """DestName: "serialized_cat.json";\n""" 
     204    msg += """DestName: "categories.json";\n""" 
    205205    msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files""" 
    206206    return msg 

  • setup.py

    r9e531f2 rb85502d  
    4747    if os.path.isfile(f_path): 
    4848        os.remove(f_path) 
    49     f_path = os.path.join(sas_dir, "serialized_cat.json") 
     49    f_path = os.path.join(sas_dir, "categories.json") 
    5050    if os.path.isfile(f_path): 
    5151        os.remove(f_path) 

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

    r1ca0ac0 r50008e3  
    1515from collections import defaultdict 
    1616 
    17 USER_FILE = 'serialized_cat.json' 
     17USER_FILE = 'categories.json' 
    1818 
    1919class CategoryInstaller: 
    … …  
    111111    def get_user_file(): 
    112112        """ 
    113         returns the user data file, eg .sasview/serialized_cat.json 
     113        returns the user data file, eg .sasview/categories.json.json 
    114114        """ 
    115115        return os.path.join(CategoryInstaller._get_home_dir(), 
    … …  
    129129        """ 
    130130        the main method of this class 
    131         makes sure serialized_cat.json exists and if not 
     131        makes sure categories.json exists and if not 
    132132        compile it and install 
    133133        :param homefile: Override the default home directory 

  • run.py

    r50a77df r9e531f2  
    121121                                  joinpath(build_path, 'sas', 'sascalc', 'pr', 'core')) 
    122122 
     123    # Compiled modules need to be pulled from the build directory. 
     124    # Some packages are not where they are needed, so load them explicitly. 
     125    import sas.sascalc.calculator 
     126    sas.sascalc.calculator.core = import_package('sas.sascalc.calculator.core', 
     127                                  joinpath(build_path, 'sas', 'sascalc', 'calculator', 'core')) 
    123128 
    124129    # Pull the entire sas.models package from the build directory since it contains 
    125130    # a mixture of autogenerated python and C.  Any changes in models will require 
    126131    # a rebuild with setup.py build 
    127     sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models')) 
     132    # sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models')) 
    128133 
    129134    sys.path.append(build_path) 

  • src/sas/sascalc/calculator/c_extensions/libfunc.c

    r79492222 r9e531f2  
    33#include <math.h> 
    44 
    5 #include "libmultifunc/libfunc.h" 
     5#include "libfunc.h" 
    66 
    77#include <stdio.h> 

  • src/sas/sascalc/calculator/c_extensions/librefl.c

    ra6d2e3b r9e531f2  
    44 
    55#include <math.h> 
    6 #include "libmultifunc/librefl.h" 
     6#include "librefl.h" 
    77#include <stdio.h> 
    88#include <stdlib.h> 
    99#if defined(_MSC_VER) 
    10 #include "../libigor/winFuncs.h" 
     10#include "winFuncs.h" 
    1111#endif 
    1212 

  • src/sas/sascalc/calculator/c_extensions/sld2i.cpp

    r79492222 r9e531f2  
    77using namespace std; 
    88extern "C" { 
    9         #include "libmultifunc/libfunc.h" 
    10         #include "libmultifunc/librefl.h" 
     9        #include "libfunc.h" 
     10        #include "librefl.h" 
    1111} 
    1212/** 

  • src/sas/sascalc/calculator/sas_gen.py

    r06aaa75d r9e531f2  
    33SAS generic computation and sld file readers 
    44""" 
    5 from sas.models.BaseComponent import BaseComponent 
    6 import sas.models.sas_extension.sld2i as mod 
     5from sas.sascalc.calculator.BaseComponent import BaseComponent 
     6import sas.sascalc.calculator.core.sld2i as mod 
    77from periodictable import formula 
    88from periodictable import nsf 

  • src/sas/sasgui/perspectives/fitting/__init__.py

    rd85c194 r9e531f2  
    3939    data_files = [] 
    4040    path = os.path.dirname(__file__) 
    41     p_path = os.path.join(path, 'plugin_models') 
    42     for f in findall(p_path): 
    43         data_files.append(('plugin_models', [f])) 
    44     path = get_data_path(media="media") 
     41    # p_path = os.path.join(path, 'plugin_models') 
     42    # for f in findall(p_path): 
     43    #     data_files.append(('plugin_models', [f])) 
     44    # path = get_data_path(media="media") 
    4545    for f in findall(path): 
    4646        data_files.append(('media/fitting_media', [f])) 

  • src/sas/sasgui/perspectives/fitting/models.py

    rab3ed7e r9e531f2  
    1717# places it in the distribution. The Model1DPlugin class is used 
    1818# as the base class of plug-in models. 
    19 from sas.models.pluginmodel import Model1DPlugin 
    20 from sas.models.BaseComponent import BaseComponent 
     19from sas.sascalc.fit.pluginmodel import Model1DPlugin 
     20from sas.sascalc.calculator.BaseComponent import BaseComponent 
    2121from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller 
    2222from sasmodels import sasview_model,core 
Note: See TracChangeset for help on using the changeset viewer.