Changeset 9706d88 in sasview


Ignore:
Timestamp:
Sep 22, 2017 12:21:37 PM (5 years ago)
Author:
Paul Kienzle <pkienzle@…>
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
d3b0c77, 574adc7
Parents:
ab0b93f
Message:

merge fixups

Location:
src/sas
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/fit/models.py

    r69363c7 r9706d88  
    9595    path = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR) 
    9696 
    97     # TODO: initializing ~/.sasview/plugin_models doesn't belong in sascalc 
     97    # TODO: trigger initialization of plugins dir from installer or startup 
    9898    # If the plugin directory doesn't exist, create it 
    9999    if not os.path.isdir(path): 
    100100        os.makedirs(path) 
    101101    # TODO: should we be checking for new default models every time? 
    102     initialize_plugins_dir(path) 
     102    # TODO: restore support for default plugins 
     103    #initialize_plugins_dir(path) 
    103104    return path 
    104105 
     
    106107def initialize_plugins_dir(path): 
    107108    # TODO: There are no default plugins 
     109    # TODO: Default plugins directory is in sasgui, but models.py is in sascalc 
    108110    # TODO: Move default plugins beside sample data files 
    109111    # TODO: Should not look for defaults above the root of the sasview install 
  • src/sas/sasgui/perspectives/fitting/fitpage.py

    r69363c7 r9706d88  
    17261726                and not self.temp_multi_functional: 
    17271727            return None 
    1728         print("_set_fun_box_list", self.model.name) 
    17291728        # Get the func name list 
    17301729        list = self.model.fun_list 
  • src/sas/sasgui/perspectives/fitting/fitting.py

    r69363c7 r9706d88  
    5151from sas.sasgui.perspectives.calculator.model_editor import TextDialog 
    5252from sas.sasgui.perspectives.calculator.model_editor import EditorWindow 
     53from sas.sasgui.perspectives.calculator.pyconsole import PyConsole 
    5354 
    5455from .fitting_widgets import DataDialog 
     
    242243        Get the python editor panel 
    243244        """ 
    244         from sas.sasgui.perspectives.calculator.pyconsole import PyConsole 
    245  
    246245        event_id = event.GetId() 
    247246        label = self.edit_menu.GetLabel(event_id) 
     
    368367                        if model and new_model != model: 
    369368                            page._on_select_model(keep_pars=True) 
    370                     if hasattr(page, 'structurebox'): 
     369                    if hasattr(page, "structurebox"): 
    371370                        selected_name = page.structurebox.GetStringSelection() 
    372371 
     
    17691768            @param unsmeared_error: data error, rescaled to unsmeared model 
    17701769        """ 
    1771 <<<<<<< HEAD 
    1772  
    1773 ======= 
    1774 >>>>>>> master 
    17751770        number_finite = np.count_nonzero(np.isfinite(y)) 
    17761771        np.nan_to_num(y) 
Note: See TracChangeset for help on using the changeset viewer.