Changes in / [e82a901:f202138] in sasview


Ignore:
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • .pydevproject

    r79492222 r79492222  
    44<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> 
    55<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 
    6 <path>/sasview/src</path> 
     6<path>/sasview-git/src</path> 
    77</pydev_pathproperty> 
    88</pydev_project> 

  • src/sas/guiframe/documentation_window.py

    rf202138 rf202138  
    1515 
    1616class DocumentationWindow(wx.Frame): 
    17     def __init__(self, parent, id, path, url_instruction, title, size=(850, 540)): 
     17    def __init__(self, parent, id, path, title, size=(850, 540)): 
    1818        wx.Frame.__init__(self, parent, id, title, size=size) 
    1919 
    … …  
    2828 
    2929        file_path = os.path.join(docs_path, path) 
    30         url = "file:///" + urllib.quote(file_path,'\:')+ url_instruction 
     30        url = "file:///" + urllib.quote(file_path) 
    3131 
    3232        if not os.path.exists(file_path): 
    … …  
    4848def main(): 
    4949    app = wx.App() 
    50     DocumentationWindow(None, -1, "index.html", "", "Documentation",) 
     50    DocumentationWindow(None, -1, "index.html", "Documentation",) 
    5151    app.MainLoop() 
    5252 

  • src/sas/guiframe/gui_manager.py

    r7801df8 r5276eeb  
    21662166        # different place than they would otherwise. 
    21672167        from documentation_window import DocumentationWindow 
    2168         DocumentationWindow(self, -1, "index.html", "", "SasView Documentation") 
     2168        DocumentationWindow(self, -1, "index.html", "General Help") 
    21692169 
    21702170    def set_manager(self, manager): 

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

    r3db44fb ra27e8b8  
    635635 
    636636        _TreeLocation = "user/perspectives/calculator/data_operator_help.html" 
    637         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    638                                          "Data Operation Help") 
     637        _doc_viewer = DocumentationWindow(self, -1, \ 
     638             _TreeLocation, "Data Operation Help") 
    639639 
    640640    def disconnect_panels(self): 

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

    r3db44fb rd5419f7f  
    385385 
    386386        _TreeLocation = "user/perspectives/calculator/density_calculator_help.html" 
    387         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    388                                          "Density/Volume Calculator Help") 
     387        _doc_viewer = DocumentationWindow(self, -1, \ 
     388             _TreeLocation, "Density/Volume Calculator Help") 
    389389 
    390390    def on_close(self, event): 

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

    r3db44fb rd5419f7f  
    914914 
    915915        _TreeLocation = "user/perspectives/calculator/sas_calculator_help.html" 
    916         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    917                                          "General Scattering Calculator Help") 
     916        _doc_viewer = DocumentationWindow(self, -1, \ 
     917             _TreeLocation, "General Scattering Calculator Help") 
    918918 
    919919    def _check_value(self): 

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

    r3db44fb r49ab5d7  
    150150 
    151151        _TreeLocation = "user/perspectives/calculator/image_viewer_help.html" 
    152         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    153                                          "Image Viewer Help") 
     152        _doc_viewer = DocumentationWindow(self, -1, \ 
     153             _TreeLocation, "Image Viewer Help") 
    154154 
    155155 

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

    r3db44fb rd5419f7f  
    173173    """ 
    174174        _TreeLocation = "user/perspectives/calculator/kiessig_calculator_help.html" 
    175         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
     175        _doc_viewer = DocumentationWindow(self, -1, 
     176                                          _TreeLocation, 
    176177                                          "Density/Volume Calculator Help") 
    177178 

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

    r7801df8 rac7be54  
    2929import re 
    3030from wx.py.editwindow import EditWindow 
    31 from sas.guiframe.documentation_window import DocumentationWindow 
    32  
    3331 
    3432if sys.platform.count("win32") > 0: 
    … …  
    273271        # Eventually need to add help here 
    274272        self.ok_button = wx.Button(self, wx.ID_OK, 'Apply') 
    275         _app_tip = "Save the new Model." 
    276         self.ok_button.SetToolTipString(_app_tip) 
    277273        self.ok_button.Bind(wx.EVT_BUTTON, self.check_name) 
    278         self.help_button = wx.Button(self, -1, 'HELP') 
    279         _app_tip = "Help on composite model creation." 
    280         self.help_button.SetToolTipString(_app_tip) 
    281         self.help_button.Bind(wx.EVT_BUTTON, self.on_help) 
    282274        self.close_button = wx.Button(self, wx.ID_CANCEL, 'Close') 
    283275        sizer_button = wx.BoxSizer(wx.HORIZONTAL) 
    284276        sizer_button.AddMany([((20, 20), 1, 0), 
    285277                              (self.ok_button, 0, 0), 
    286                               (self.help_button, 0, 0), 
    287278                              (self.close_button, 0, wx.LEFT | wx.RIGHT, 10)]) 
    288279        mainsizer.Add(sizer_button, 0, wx.EXPAND | wx.BOTTOM | wx.TOP, 10) 
    … …  
    401392        else: 
    402393            raise 
    403  
    404     def on_help(self, event): 
    405         """ 
    406         Bring up the Composite Model Editor Documentation whenever 
    407         the HELP button is clicked. 
    408  
    409         Calls DocumentationWindow with the path of the location within the 
    410         documentation tree (after /doc/ ....".  Note that when using old 
    411         versions of Wx (before 2.9) and thus not the release version of 
    412         installers, the help comes up at the top level of the file as 
    413         webbrowser does not pass anything past the # to the browser when it is 
    414         running "file:///...." 
    415  
    416     :param evt: Triggers on clicking the help button 
    417     """ 
    418  
    419         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
    420         _PageAnchor = "#sum-multi-p1-p2" 
    421         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor, 
    422                                           "Composite Model Editor Help") 
    423394 
    424395    def _set_model_list(self): 
    … …  
    785756        self.bt_apply.Bind(wx.EVT_BUTTON, self.on_click_apply) 
    786757 
    787         self.bt_help = wx.Button(self, -1, "HELP", size=(_BOX_WIDTH, -1)) 
    788         self.bt_help.SetToolTipString("Get Help For Model Editor") 
    789         self.bt_help.Bind(wx.EVT_BUTTON, self.on_help) 
    790  
    791758        self.bt_close = wx.Button(self, -1, 'Close', size=(_BOX_WIDTH, -1)) 
    792759        self.bt_close.Bind(wx.EVT_BUTTON, self.on_close) 
    … …  
    795762        self.button_sizer.AddMany([(self.bt_apply, 0, 
    796763                                    wx.LEFT, EDITOR_WIDTH * 0.8), 
    797                                    (self.bt_help, 0, 
    798                                     wx.LEFT,15), 
    799764                                   (self.bt_close, 0, 
    800765                                    wx.LEFT | wx.BOTTOM, 15)]) 
    … …  
    11241089        """ 
    11251090        return self.warning 
    1126  
    1127     def on_help(self, event): 
    1128         """ 
    1129         Bring up the Custom Model Editor Documentation whenever 
    1130         the HELP button is clicked. 
    1131  
    1132         Calls DocumentationWindow with the path of the location within the 
    1133         documentation tree (after /doc/ ....".  Note that when using old 
    1134         versions of Wx (before 2.9) and thus not the release version of 
    1135         installers, the help comes up at the top level of the file as 
    1136         webbrowser does not pass anything past the # to the browser when it is 
    1137         running "file:///...." 
    1138  
    1139     :param evt: Triggers on clicking the help button 
    1140     """ 
    1141  
    1142         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
    1143         _PageAnchor = "#custom-model-editor" 
    1144         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor, 
    1145                                           "Custom Model Editor Help") 
    11461091 
    11471092    def on_close(self, event): 

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

    r3db44fb rd5419f7f  
    642642 
    643643        _TreeLocation = "user/perspectives/calculator/resolution_calculator_help.html" 
    644         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    645                                           "Resolution Calculator Help") 
     644        _doc_viewer = DocumentationWindow(self, -1, 
     645                                          _TreeLocation, "Resolution Calculator Help") 
    646646 
    647647    def on_close(self, event): 

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

    r3db44fb rd5419f7f  
    326326 
    327327        _TreeLocation = "user/perspectives/calculator/sld_calculator_help.html" 
    328         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    329                                          "General Scattering Calculator Help") 
     328        _doc_viewer = DocumentationWindow(self, -1, \ 
     329             _TreeLocation, "General Scattering Calculator Help") 
    330330 
    331331    def on_close(self, event): 

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

    r3db44fb rd5419f7f  
    187187 
    188188        _TreeLocation = "user/perspectives/calculator/slit_calculator_help.html" 
    189         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    190                                          "Slit Length Calculator Help") 
     189        _doc_viewer = DocumentationWindow(self, -1, \ 
     190             _TreeLocation, "Slit Length Calculator Help") 
    191191 
    192192    def on_close(self, event): 

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

    r7801df8 r373d4ee  
    28472847        """ 
    28482848 
    2849         _TreeLocation = 'user/models/model_functions.html' 
     2849        if self.model == None: 
     2850            name = 'index.html' 
     2851        else: 
     2852            name = self.formfactorbox.GetValue() 
     2853 
    28502854        if self.model != None: 
    2851             name = self.formfactorbox.GetValue() 
    2852             _PageAnchor = '#' + name 
    2853             _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, 
    2854                                               _PageAnchor, name + "Help") 
     2855            _docspath = 'user/models/model_functions.html#' + name 
     2856            _doc_viewer = DocumentationWindow(self, -1, _docspath, name + "Help") 
    28552857        else: 
    2856             _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    2857                                                 "General Model Help") 
     2858            _doc_viewer = DocumentationWindow(self, -1, "index.html", \ 
     2859                                                "General Help") 
    28582860 
    28592861 
    … …  
    29062908 
    29072909        _TreeLocation = "_images/M_angles_pic.bmp" 
    2908         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    2909                                          "Magnetic Angle Defintions") 
     2910        _doc_viewer = DocumentationWindow(self, -1, \ 
     2911             _TreeLocation, "Magnetic Angle Defintions") 
    29102912 
    29112913    def _on_mag_on(self, event): 
    … …  
    29512953        """ 
    29522954 
    2953         _TreeLocation = "user/perspectives/fitting/pd_help.html" 
    2954         _PageAnchor = "" 
    2955         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, 
    2956                                           _PageAnchor, "Polydispersity Help") 
     2955        _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
     2956        _TreeLocation += "#polydispersity-distributions" 
     2957        _doc_viewer = DocumentationWindow(self, -1, \ 
     2958             _TreeLocation, "Polydispersity Help") 
    29572959 
    29582960    def on_left_down(self, event): 

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

    r7801df8 r5265420  
    1616from sas.guiframe.utils import format_number 
    1717from sas.guiframe.utils import check_float 
    18 from sas.guiframe.documentation_window import DocumentationWindow 
    1918 
    2019(Chi2UpdateEvent, EVT_CHI2_UPDATE) = wx.lib.newevent.NewEvent() 
    … …  
    189188    def _fill_range_sizer(self): 
    190189        """ 
    191         Fill the Fitting sizer on the fit panel which contains: the smearing 
    192         information (dq), the weighting information (dI or other), the plotting 
    193         range, access to the 2D mask editor, the compute, fit, and help 
    194         buttons, xi^2, number of points etc. 
     190        Fill the sizer containing the plotting range 
     191        add  access to npts 
    195192        """ 
    196193        is_2Ddata = False 
    … …  
    268265        weighting_box.Add(sizer_weighting) 
    269266 
    270         sizer_fit = wx.GridSizer(2, 5, 2, 6) 
     267        sizer_fit = wx.GridSizer(2, 4, 2, 6) 
    271268 
    272269        # combobox for smear2d accuracy selection 
    … …  
    287284        self.btFit.SetToolTipString("Start fitting.") 
    288285 
    289         #General Help button 
    290         self.btFitHelp = wx.Button(self, -1, 'HELP') 
    291         self.btFitHelp.SetToolTipString("General Fitting Help.") 
    292         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp) 
    293          
    294         #Resolution Smearing Help button 
    295         self.btSmearHelp = wx.Button(self, -1, '?') 
    296         self.btSmearHelp.SetToolTipString("Resolution Smearing Help.") 
    297         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp) 
    298          
    299286        #textcntrl for custom resolution 
    300287        self.smear_pinhole_max = ModelTextCtrl(self, -1, 
    … …  
    404391        #sizer_fit.Add(box_description_3, 0, 0) 
    405392        sizer_fit.Add(self.draw_button, 0, 0) 
    406         sizer_fit.Add((-1,5)) 
    407393        sizer_fit.Add(self.tcChi, 0, 0) 
    408394        sizer_fit.Add(self.Npts_fit, 0, 0) 
    409395        sizer_fit.Add(self.Npts_total, 0, 0) 
    410396        sizer_fit.Add(self.btFit, 0, 0) 
    411         sizer_fit.Add(self.btFitHelp, 0, 0) 
    412397 
    413398        # StaticText for smear 
    … …  
    10611046        self.fit_started = self._manager.onFit(uid=self.uid) 
    10621047        wx.CallAfter(self.set_fitbutton) 
    1063  
    1064     def _onFitHelp(self, event): 
    1065         """ 
    1066         Bring up the Full Fitting Documentation whenever the HELP button is 
    1067         clicked. 
    1068  
    1069         Calls DocumentationWindow with the path of the location within the 
    1070         documentation tree (after /doc/ ....".  Note that when using old 
    1071         versions of Wx (before 2.9) and thus not the release version of 
    1072         installers, the help comes up at the top level of the file as 
    1073         webbrowser does not pass anything past the # to the browser when it is 
    1074         running "file:///...." 
    1075  
    1076     :param evt: Triggers on clicking the help button 
    1077     """ 
    1078  
    1079         _TreeLocation = "user/perspectives/fitting/fitting_help.html" 
    1080         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    1081                                           "General Fitting Help") 
    1082  
    1083     def _onSmearHelp(self, event): 
    1084         """ 
    1085         Bring up the instrumental resolution smearing Documentation whenever 
    1086         the ? button in the smearing box is clicked. 
    1087  
    1088         Calls DocumentationWindow with the path of the location within the 
    1089         documentation tree (after /doc/ ....".  Note that when using old 
    1090         versions of Wx (before 2.9) and thus not the release version of 
    1091         installers, the help comes up at the top level of the file as 
    1092         webbrowser does not pass anything past the # to the browser when it is 
    1093         running "file:///...." 
    1094  
    1095     :param evt: Triggers on clicking the help button 
    1096     """ 
    1097  
    1098         _TreeLocation = "user/perspectives/fitting/sm_help.html" 
    1099         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    1100                                           "Instrumental Resolution Smearing \ 
    1101                                           Help") 
    11021048 
    11031049    def set_fitbutton(self): 

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

    r3db44fb rcce0ad3  
    18931893 
    18941894        _TreeLocation = "user/perspectives/invariant/invariant_help.html" 
    1895         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    1896                                          "Invariant Help") 
     1895        _doc_viewer = DocumentationWindow(self, -1, \ 
     1896             _TreeLocation, "Invariant Help") 
    18971897 
    18981898 

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

    r3db44fb r3d250da3  
    958958 
    959959        _TreeLocation = "user/perspectives/pr/pr_help.html" 
    960         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 
    961                                          "P(r) Help") 
     960        _doc_viewer = DocumentationWindow(self, -1, \ 
     961             _TreeLocation, "P(r) Help") 
    962962 
    963963 
Note: See TracChangeset for help on using the changeset viewer.