Changeset 25427d9 in sasview for src/sas/sasgui/perspectives


Ignore:
Timestamp:
Mar 21, 2016 6:32:15 AM (9 years ago)
Author:
awashington
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:
cf92b1f, 5757bbe
Parents:
1c0e3b0 (diff), bb0c836 (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 github.com:SasView/sasview

Location:
src/sas/sasgui/perspectives
Files:
6 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/perspectives/calculator/data_operator.py

    rd85c194 re871a2d  
    634634    """ 
    635635 
    636         _TreeLocation = "user/perspectives/calculator/data_operator_help.html" 
     636        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     637        _TreeLocation += "data_operator_help.html" 
    637638        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    638639                                          "Data Operation Help") 

  • src/sas/sasgui/perspectives/calculator/density_panel.py

    rd85c194 r02b4d10  
    384384    """ 
    385385 
    386         _TreeLocation = "user/perspectives/calculator/density_calculator_help.html" 
     386        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     387        _TreeLocation += "density_calculator_help.html" 
    387388        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    388389                                          "Density/Volume Calculator Help") 

  • src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py

    rd85c194 rd0248bd  
    913913    """ 
    914914 
    915         _TreeLocation = "user/perspectives/calculator/sas_calculator_help.html" 
     915        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     916        _TreeLocation += "sas_calculator_help.html" 
    916917        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    917918                                          "General Scattering Calculator Help") 

  • src/sas/sasgui/perspectives/calculator/image_viewer.py

    rd85c194 rd0248bd  
    149149        """ 
    150150 
    151         _TreeLocation = "user/perspectives/calculator/image_viewer_help.html" 
     151        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     152        _TreeLocation += "image_viewer_help.html" 
    152153        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    153154                                          "Image Viewer Help") 

  • src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py

    rd85c194 rd0248bd  
    172172    :param evt: Triggers on clicking the help button 
    173173    """ 
    174         _TreeLocation = "user/perspectives/calculator/kiessig_calculator_help.html" 
     174        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     175        _TreeLocation += "kiessig_calculator_help.html" 
    175176        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    176177                                          "Density/Volume Calculator Help") 

  • src/sas/sasgui/perspectives/calculator/model_editor.py

    rec36e48 r5876f7e  
    417417    """ 
    418418 
    419         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
     419        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    420420        _PageAnchor = "#sum-multi-p1-p2" 
    421421        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor, 
    … …  
    11451145    """ 
    11461146 
    1147         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
     1147        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    11481148        _PageAnchor = "#custom-model-editor" 
    11491149        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor, 

  • src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

    rd85c194 rd0248bd  
    641641    """ 
    642642 
    643         _TreeLocation = "user/perspectives/calculator/resolution_calculator_help.html" 
     643        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     644        _TreeLocation += "resolution_calculator_help.html" 
    644645        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    645646                                          "Resolution Calculator Help") 

  • src/sas/sasgui/perspectives/calculator/sld_panel.py

    rd85c194 rd0248bd  
    325325    """ 
    326326 
    327         _TreeLocation = "user/perspectives/calculator/sld_calculator_help.html" 
     327        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     328        _TreeLocation += "sld_calculator_help.html" 
    328329        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    329330                                          "General Scattering Calculator Help") 

  • src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py

    rd85c194 rd0248bd  
    186186    """ 
    187187 
    188         _TreeLocation = "user/perspectives/calculator/slit_calculator_help.html" 
     188        _TreeLocation = "user/sasgui/perspectives/calculator/" 
     189        _TreeLocation += "slit_calculator_help.html" 
    189190        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    190191                                          "Slit Length Calculator Help") 

  • 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/basepage.py

    rbac3988 reb04d59  
    18951895            if mod_cat == custom_model: 
    18961896                for model in self.model_list_box[mod_cat]: 
    1897                     str_m = str(model).split(".")[0] 
     1897                    if 'sasmodels.sasview_model.' in str(model): 
     1898                        str_m = model._model_info['id'] 
     1899                    else: 
     1900                        str_m = str(model).split(".")[0] 
    18981901                    #self.model_box.Append(str_m) 
    18991902                    m_list.append(self.model_dict[str_m]) 
    … …  
    28612864        """ 
    28622865 
    2863         _TreeLocation = 'user/models/model_functions.html' 
    28642866        if self.model != None: 
    28652867            name = self.formfactorbox.GetValue() 
    2866             _PageAnchor = '#' + name.lower() 
     2868            _TreeLocation = 'user/models/'+ name.lower()+'.html' 
    28672869            _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, 
    2868                                               _PageAnchor, name + " Help") 
     2870                                              "", name + " Help") 
    28692871        else: 
     2872            _TreeLocation = 'user/index.html' 
    28702873            _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, 
    28712874                                              "", "General Model Help") 
    … …  
    29392942        """ 
    29402943 
    2941         _TreeLocation = "user/perspectives/fitting/mag_help.html" 
     2944        _TreeLocation = "user/sasgui/perspectives/fitting/mag_help.html" 
    29422945        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "", 
    29432946                                          "Polarized Beam/Magnetc Help") 
    … …  
    29852988        """ 
    29862989 
    2987         _TreeLocation = "user/perspectives/fitting/pd_help.html" 
     2990        _TreeLocation = "user/sasgui/perspectives/fitting/pd_help.html" 
    29882991        _PageAnchor = "" 
    29892992        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, 

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

    ra0b355b rf27dd1e  
    10811081    """ 
    10821082 
    1083         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
     1083        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    10841084        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "", 
    10851085                                          "General Fitting Help") 
    … …  
    11001100    """ 
    11011101 
    1102         _TreeLocation = "user/perspectives/fitting/sm_help.html" 
     1102        _TreeLocation = "user/sasgui/perspectives/fitting/sm_help.html" 
    11031103        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "", 
    11041104                                          "Instrumental Resolution Smearing \ 

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

    raac161f1 r86b049b  
    299299        self.new_model_frame.Show(True) 
    300300 
     301    def load_plugin_models(self, event): 
     302        """ 
     303        Update of models in plugin_models folder 
     304        """ 
     305        event_id = event.GetId() 
     306        self.update_custom_combo()         
     307 
    301308    def update_custom_combo(self): 
    302309        """ 
    … …  
    338345                                   'Add a new model function') 
    339346        wx.EVT_MENU(owner, wx_id, self.make_new_model) 
     347         
    340348        wx_id = wx.NewId() 
    341349        self.edit_model_menu.Append(wx_id, 'Sum|Multi(p1, p2)', 
    342350                                    'Sum of two model functions') 
    343351        wx.EVT_MENU(owner, wx_id, self.make_sum_model) 
     352 
    344353        e_id = wx.NewId() 
    345354        self.edit_menu = wx.Menu() 
    … …  
    353362                                        'Delete', self.delete_menu) 
    354363        self.set_edit_menu_helper(owner, self.delete_custom_model) 
     364 
     365        wx_id = wx.NewId() 
     366        self.edit_model_menu.Append(wx_id, 'Load Models', 
     367          '(Re)Load all models present in user plugin_models folder') 
     368        wx.EVT_MENU(owner, wx_id, self.load_plugin_models) 
    355369 
    356370    def set_edit_menu_helper(self, owner=None, menu=None): 
    … …  
    758772 
    759773    def on_help(self, algorithm_id): 
    760         _TreeLocation = "user/perspectives/fitting/optimizer.html" 
     774        _TreeLocation = "user/sasgui/perspectives/fitting/optimizer.html" 
    761775        _anchor = "#fit-"+algorithm_id 
    762776        DocumentationWindow(self.parent, wx.ID_ANY, _TreeLocation, _anchor, "Optimizer Help") 

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

    ra0b355b 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 
    … …  
    181181            if toks[1] == '.py' and not toks[0] == '__init__': 
    182182                name = toks[0] 
    183  
    184183                path = [os.path.abspath(dir)] 
    185184                file = None 
    … …  
    197196                                                         sys.exc_info()[1]) 
    198197                            log(msg) 
     198                    else: 
     199                        filename = os.path.join(dir, item) 
     200                        plugins[name] = sasview_model.make_class_from_file(filename)  
     201 
    199202                except: 
    200203                    msg = "Error accessing Model" 
    … …  
    211214        msg = "Could not import model plugin: %s" % sys.exc_info()[1] 
    212215        log(msg) 
     216 
    213217    return plugins 
    214218 
    … …  
    311315                self.multiplication_factor.append(model) 
    312316 
    313  
    314317        #Looking for plugins 
    315318        self.stored_plugins = self.findModels() 
    … …  
    317320        for name, plug in self.stored_plugins.iteritems(): 
    318321            self.model_dictionary[name] = plug 
    319  
     322         
    320323        self._get_multifunc_models() 
    321324 

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

    raac161f1 r4cafdff  
    499499    :param evt: Triggers on clicking the help button 
    500500    """ 
    501         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
     501        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    502502        _PageAnchor = "#simultaneous-fit-mode" 
    503503        _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 

  • src/sas/sasgui/perspectives/invariant/invariant_panel.py

    rd85c194 rc12f9b4  
    18981898    """ 
    18991899 
    1900         _TreeLocation = "user/perspectives/invariant/invariant_help.html" 
     1900        _TreeLocation = "user/sasgui/perspectives/invariant/invariant_help.html" 
    19011901        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    19021902                                          "Invariant Help") 

  • src/sas/sasgui/perspectives/pr/inversion_panel.py

    rd85c194 r5a58656  
    955955    """ 
    956956 
    957         _TreeLocation = "user/perspectives/pr/pr_help.html" 
     957        _TreeLocation = "user/sasgui/perspectives/pr/pr_help.html" 
    958958        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    959959                                          "P(r) Help") 
Note: See TracChangeset for help on using the changeset viewer.