Changeset 55a8a39 in sasview


Ignore:
Timestamp:
Dec 3, 2018 2:16:30 AM (11 days ago)
Author:
GitHub <noreply@…>
Parents:
175b83f (diff), 93b34cc (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.
git-author:
Paul Kienzle <pkienzle@…> (12/03/18 02:16:30)
git-committer:
GitHub <noreply@…> (12/03/18 02:16:30)
Message:

Merge 93b34cc20c889f8987e6e4767a8fefae8cea7f78 into 175b83fd92c67464de6cb1cd8c39db1d05503c91

Location:
src/sas
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/sas/_config.py

    rb963b20 r93b34cc  
    8686def setup_custom_config(app_dir, user_dir): 
    8787    path = make_custom_config_path(user_dir) 
     88    #logger.info("custom config path %s", path) 
    8889    if not os.path.isfile(path): 
    8990        try: 
     
    9495            logger.error("Could not copy default custom config.") 
    9596 
     97    custom_config = load_custom_config(path) 
     98 
    9699    #Adding SAS_OPENCL if it doesn't exist in the config file 
    97100    # - to support backcompability 
    98     if not "SAS_OPENCL" in open(path).read(): 
     101    if not hasattr(custom_config, "SAS_OPENCL"): 
     102        custom_config.SAS_OPENCL = None 
    99103        try: 
    100             open(config_file, "a+").write("SAS_OPENCL = \"None\"\n") 
     104            open(path, "a+").write("SAS_OPENCL = \"None\"\n") 
    101105        except Exception: 
    102106            logger.error("Could not update custom config with SAS_OPENCL.") 
    103107 
    104     custom_config = load_custom_config(path) 
    105108    return custom_config 
    106  
    107109 
    108110def load_custom_config(path): 
  • src/sas/sasgui/guiframe/gui_manager.py

    r8ac05a5 r47be5a1  
    6262SPLASH_SCREEN_HEIGHT = config.SPLASH_SCREEN_HEIGHT 
    6363SS_MAX_DISPLAY_TIME = config.SS_MAX_DISPLAY_TIME 
    64 if not WELCOME_PANEL_ON: 
    65     WELCOME_PANEL_SHOW = False 
     64 
     65def custom_value(name, default=None): 
     66    """ 
     67    Fetch a config value from custom_config.  Fallback to config, and then 
     68    to default if it doesn't exist in config. 
     69    """ 
     70    default = getattr(config, name, default) 
     71    return getattr(custom_config, name, default) 
     72 
     73# Custom config values in the order they appear. 
     74DATAPANEL_WIDTH = custom_value('DATAPANEL_WIDTH', -1) 
     75CLEANUP_PLOT = custom_value('CLEANUP_PLOT', False) 
     76FIXED_PANEL = custom_value('FIXED_PANEL', True) 
     77PLOPANEL_WIDTH = custom_value('PLOPANEL_WIDTH', -1) 
     78DATALOADER_SHOW = custom_value('DATALOADER_SHOW', True) 
     79GUIFRAME_HEIGHT = custom_value('GUIFRAME_HEIGHT', -1) 
     80GUIFRAME_WIDTH = custom_value('GUIFRAME_WIDTH', -1) 
     81CONTROL_WIDTH = custom_value('CONTROL_WIDTH', -1) 
     82CONTROL_HEIGHT = custom_value('CONTROL_HEIGHT', -1) 
     83open_folder = custom_value('DEFAULT_OPEN_FOLDER', None) 
     84if open_folder is not None and os.path.isdir(open_folder): 
     85    DEFAULT_OPEN_FOLDER = os.path.abspath(open_folder) 
    6686else: 
    67     WELCOME_PANEL_SHOW = True 
    68 try: 
    69     DATALOADER_SHOW = custom_config.DATALOADER_SHOW 
    70     TOOLBAR_SHOW = custom_config.TOOLBAR_SHOW 
    71     FIXED_PANEL = custom_config.FIXED_PANEL 
    72     if WELCOME_PANEL_ON: 
    73         WELCOME_PANEL_SHOW = custom_config.WELCOME_PANEL_SHOW 
    74     PLOPANEL_WIDTH = custom_config.PLOPANEL_WIDTH 
    75     DATAPANEL_WIDTH = custom_config.DATAPANEL_WIDTH 
    76     GUIFRAME_WIDTH = custom_config.GUIFRAME_WIDTH 
    77     GUIFRAME_HEIGHT = custom_config.GUIFRAME_HEIGHT 
    78     CONTROL_WIDTH = custom_config.CONTROL_WIDTH 
    79     CONTROL_HEIGHT = custom_config.CONTROL_HEIGHT 
    80     DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE 
    81     CLEANUP_PLOT = custom_config.CLEANUP_PLOT 
    82     # custom open_path 
    83     open_folder = custom_config.DEFAULT_OPEN_FOLDER 
    84     if open_folder is not None and os.path.isdir(open_folder): 
    85         DEFAULT_OPEN_FOLDER = os.path.abspath(open_folder) 
    86     else: 
    87         DEFAULT_OPEN_FOLDER = get_app_dir() 
    88     SAS_OPENCL = custom_config.SAS_OPENCL 
    89 except: 
    90     DATALOADER_SHOW = True 
    91     TOOLBAR_SHOW = True 
    92     FIXED_PANEL = True 
    93     WELCOME_PANEL_SHOW = False 
    94     PLOPANEL_WIDTH = config.PLOPANEL_WIDTH 
    95     DATAPANEL_WIDTH = config.DATAPANEL_WIDTH 
    96     GUIFRAME_WIDTH = config.GUIFRAME_WIDTH 
    97     GUIFRAME_HEIGHT = config.GUIFRAME_HEIGHT 
    98     CONTROL_WIDTH = -1 
    99     CONTROL_HEIGHT = -1 
    100     DEFAULT_PERSPECTIVE = None 
    101     CLEANUP_PLOT = False 
    10287    DEFAULT_OPEN_FOLDER = get_app_dir() 
    103     DEFAULT_OPEN_FOLDER = PATH_APP 
    104     SAS_OPENCL = None 
     88WELCOME_PANEL_SHOW = (custom_value('WELCOME_PANEL_SHOW', False) 
     89                      if WELCOME_PANEL_ON else False) 
     90TOOLBAR_SHOW = custom_value('TOOLBAR_SHOW', True) 
     91DEFAULT_PERSPECTIVE = custom_value('DEFAULT_PERSPECTIVE', 'Fitting') 
     92SAS_OPENCL = custom_value('SAS_OPENCL', 'None') 
     93 
    10594DEFAULT_STYLE = config.DEFAULT_STYLE 
    106  
    10795PLUGIN_STATE_EXTENSIONS = config.PLUGIN_STATE_EXTENSIONS 
    10896OPEN_SAVE_MENU = config.OPEN_SAVE_PROJECT_MENU 
     
    21702158        # original 2.x tutorial. 
    21712159        # Code below, implemented from 4.2.0, redirects 
    2172         # action to the Tutorials page of the help  
     2160        # action to the Tutorials page of the help 
    21732161        # documentation to give access to all available 
    21742162        # tutorials 
  • src/sas/sascalc/dataloader/file_reader_base_class.py

    r4a8d55c rfee520ec  
    276276                    dataset.xmax = np.max(dataset.qx_data) 
    277277                    dataset.ymin = np.min(dataset.qy_data) 
    278                     dataset.ymax = np.max(dataset.qx_data) 
     278                    dataset.ymax = np.max(dataset.qy_data) 
    279279 
    280280    def format_unit(self, unit=None): 
  • src/sas/sasgui/perspectives/fitting/fitting.py

    raba4559 ra5cffe5  
    776776        :param weight: current dy data 
    777777        """ 
    778         # If we are not dealing with a specific fit problem, then 
    779         # there is no point setting the weights. 
    780         if fid is None: 
    781             return 
     778        # Note: this is used to set the data weights for the fit based on 
     779        # the weight selection in the GUI. 
    782780        if uid in self.page_finder.keys(): 
    783781            self.page_finder[uid].set_weight(flag=flag, is2d=is2d) 
  • src/sas/sasgui/perspectives/fitting/gpu_options.py

    r8e109f9 r895703d  
    2323import sasmodels 
    2424import sasmodels.model_test 
    25 import sasmodels.kernelcl 
     25import sasmodels.sasview_model 
    2626 
    2727from sas.sasgui.guiframe.documentation_window import DocumentationWindow 
     
    239239            if "SAS_OPENCL" in os.environ: 
    240240                del os.environ["SAS_OPENCL"] 
    241         sasmodels.kernelcl.reset_environment() 
     241        sasmodels.sasview_model.reset_environment() 
    242242        event.Skip() 
    243243 
     
    265265            if "SAS_OPENCL" in os.environ: 
    266266                del os.environ["SAS_OPENCL"] 
    267         sasmodels.kernelcl.reset_environment() 
     267        sasmodels.sasview_model.reset_environment() 
    268268 
    269269        try: 
Note: See TracChangeset for help on using the changeset viewer.