Changeset 18cdddb in sasview for sansview


Ignore:
Timestamp:
Feb 22, 2011 10:39:12 AM (14 years ago)
Author:
Jae Cho <jhjcho@…>
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:
d376d31
Parents:
e715e4f
Message:

moved modelfunction html files

Location:
sansview
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sansview/perspectives/fitting/basepage.py

    r20b228a0 r18cdddb  
    25682568        self._draw_model() 
    25692569 
     2570 
    25702571    def on_model_help_clicked(self,event): 
    25712572        """ 
    … …  
    25732574        """ 
    25742575        from help_panel import  HelpWindow 
    2575          
     2576        import sans.models as models  
     2577         
     2578        # Get models help model_function path 
     2579        path = models.get_data_path(media='media') 
     2580        model_path = os.path.join(path,"model_functions.html") 
    25762581        if self.model == None: 
    25772582            name = 'FuncHelp' 
    … …  
    25792584            name = self.model.origin_name 
    25802585 
    2581         frame = HelpWindow(None, -1,  pageToOpen="media/model_functions.html")     
     2586        frame = HelpWindow(None, -1,  pageToOpen=model_path)     
    25822587        frame.Show(True) 
    25832588        if frame.rhelp.HasAnchor(name): 
    … …  
    25862591           msg= "Model does not contains an available description " 
    25872592           msg +="Please try searching in the Help window" 
    2588            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))                     
     2593           wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))       
     2594                     
    25892595                 

  • sansview/perspectives/fitting/help_panel.py

    r5062bbf r18cdddb  
    4848        self.lhelp = html.HtmlWindow(lpanel, -1, style=wx.NO_BORDER) 
    4949        self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER, size=(500,-1)) 
     50 
     51        import sans.models as models  
     52        # get the media path 
     53        path = models.get_data_path(media='media') 
     54        self.path = os.path.join(path,"model_functions.html") 
     55                     
    5056        page1="""<html> 
    5157            <body> 
    … …  
    6470            <li><a href ="media/model_use_help.html" target ="showframe">Visualize Model</a><br></li> 
    6571            <li><a href ="media/averaging_help.html" target ="showframe">Data Averaging</a><br></li> 
    66             <li><a href ="media/model_functions.html" target ="showframe">Model Functions</a><br></li> 
     72            <li><a href ="%s" target ="showframe">Model Functions</a><br></li> 
    6773            </ul> 
    6874            </body> 
    69             </html>""" 
     75            </html>""" % self.path 
     76         
    7077        self.rhelp.SetPage(page1) 
    7178        self.lhelp.SetPage(page) 
    … …  
    95102        Function to diplay html page related to the hyperlinktext selected 
    96103        """ 
    97         self.rhelp.LoadPage("media/modelfunction.html") 
     104         
     105        self.rhelp.LoadPage(self.path) 
    98106         
    99107    def OnLinkClicked(self, event): 

  • sansview/setup_exe.py

    r8cd029b r18cdddb  
    9191data_files += guiframe.data_files() 
    9292 
     93import sans.models as models 
     94data_files += models.data_files() 
     95 
    9396for f in matplotlibdata: 
    9497    dirname = os.path.join('mpl-data', f[len(matplotlibdatadir)+1:]) 
Note: See TracChangeset for help on using the changeset viewer.