Changeset c8d22ec in sasview


Ignore:
Timestamp:
Jun 22, 2015 12:21:22 AM (9 years ago)
Author:
butler
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:
74d5dbf
Parents:
d20eb45
Message:

Update the acknowldegement window information and some pyling cleanup

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • sasview/local_config.py

    r0ea31ca rc8d22ec  
    1212__version__ = sas.sasview.__version__ 
    1313__build__ = sas.sasview.__build__ 
    14 __download_page__ = 'http://sourceforge.net/projects/sasview/files/' 
    15 __update_URL__ = ['svn.code.sf.net',  
    16                   '/p/sasview/code/trunk/sasview.latestversion'] 
     14__download_page__ = 'https://github.com/SasView/sasview/releases' 
     15__update_URL__ = ['https://github.com/SasView/sasview.git'] 
    1716 
    1817 
    … …  
    2423 
    2524# Debug message should be written to a file? 
    26 __EVT_DEBUG_2_FILE__   = False 
     25__EVT_DEBUG_2_FILE__ = False 
    2726__EVT_DEBUG_FILENAME__ = "debug.log" 
    2827 
    … …  
    3938'''Reference the following website: http://www.sasview.org''' 
    4039_acknowledgement_preamble_bullet3 =\ 
    41 '''Send us your reference for our records: sansdanse@gmail.com''' 
     40'''Reference the model you used if appropriate (see documentation for refs)''' 
     41_acknowledgement_preamble_bullet4 =\ 
     42'''Send us your reference for our records: developers@sasview.org''' 
    4243_acknowledgement_publications = \ 
    43 '''This work benefited from the use of the SasView application, originally  
     44'''This work benefited from the use of the SasView application, originally 
    4445developed under NSF award DMR-0520547. 
    4546''' 
    4647_acknowledgement =  \ 
    4748'''This work originally developed as part of the DANSE project funded by the NSF 
    48 under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS  
     49under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
    4950and ILL. 
    5051 
    … …  
    6061logging.info("icon path: %s" % icon_path) 
    6162media_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "media")) 
    62 test_path =  os.path.abspath(os.path.join(os.path.dirname(__file__), "test")) 
     63test_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "test")) 
    6364 
    6465_nist_logo = os.path.join(icon_path, "nist_logo.png") 
    … …  
    9293PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv'] 
    9394PLUGINS_WLIST = ['Fitting files (*.fitv)|*.fitv', 
    94                   'Invariant files (*.inv)|*.inv', 
    95                   'P(r) files (*.prv)|*.prv'] 
     95                 'Invariant files (*.inv)|*.inv', 
     96                 'P(r) files (*.prv)|*.prv'] 
    9697PLOPANEL_WIDTH = 415 
    9798PLOPANEL_HEIGTH = 370 
    9899DATAPANEL_WIDTH = 235 
    99100DATAPANEL_HEIGHT = 700 
    100 SPLASH_SCREEN_PATH = os.path.join(icon_path,"SVwelcome_mini.png") 
    101 TUTORIAL_PATH = os.path.join(media_path,"Tutorial.pdf") 
     101SPLASH_SCREEN_PATH = os.path.join(icon_path, "SVwelcome_mini.png") 
     102TUTORIAL_PATH = os.path.join(media_path, "Tutorial.pdf") 
    102103DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\ 
    103104                    |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON 
    … …  
    105106SPLASH_SCREEN_HEIGHT = 366 
    106107SS_MAX_DISPLAY_TIME = 2000 
    107 WELCOME_PANEL_ON  = True 
     108WELCOME_PANEL_ON = True 
    108109WELCOME_PANEL_SHOW = False 
    109110CLEANUP_PLOT = False 
    … …  
    131132def printEVT(message): 
    132133    if __EVT_DEBUG__: 
     134        """ 
     135        :TODO - Need method doc string 
     136        """ 
    133137        print "%g:  %s" % (time.clock(), message) 
    134          
     138 
    135139        if __EVT_DEBUG_2_FILE__: 
    136140            out = open(__EVT_DEBUG_FILENAME__, 'a') 
    137141            out.write("%10g:  %s\n" % (time.clock(), message)) 
    138142            out.close() 
    139              

  • src/sas/guiframe/acknowledgebox.py

    r0ea31ca rc8d22ec  
    2121      (os.path.isfile("%s/%s.pyc" % (path, 'local_config'))): 
    2222        fObj, path, descr = imp.find_module('local_config', [path]) 
    23         config = imp.load_module('local_config', fObj, path, descr)   
     23        config = imp.load_module('local_config', fObj, path, descr) 
    2424    else: 
    2525        # Try simply importing local_config 
    2626        import local_config as config 
    2727except: 
    28     # Didn't find local config, load the default  
     28    # Didn't find local config, load the default 
    2929    import config 
    30      
     30 
    3131 
    3232class DialogAcknowledge(wx.Dialog): 
    3333    """ 
    3434    "Acknowledgement" Dialog Box 
    35      
     35 
    3636    Shows the current method for acknowledging SasView in 
    3737    scholarly publications. 
    38      
     38 
    3939    """ 
    40      
     40 
    4141    def __init__(self, *args, **kwds): 
    42          
     42 
    4343        kwds["style"] = wx.DEFAULT_DIALOG_STYLE 
    4444        wx.Dialog.__init__(self, *args, **kwds) 
    45          
     45 
    4646        self.ack = wx.TextCtrl(self, style=wx.TE_LEFT|wx.TE_MULTILINE|wx.TE_BESTWRAP|wx.TE_READONLY|wx.TE_NO_VSCROLL) 
    4747        self.ack.SetValue(config._acknowledgement_publications) 
    48         self.ack.SetMinSize((-1,55)) 
     48        self.ack.SetMinSize((-1, 55)) 
    4949        self.preamble = wx.StaticText(self, -1, config._acknowledgement_preamble) 
    5050        items = [config._acknowledgement_preamble_bullet1, 
    5151                 config._acknowledgement_preamble_bullet2, 
    52                  config._acknowledgement_preamble_bullet3] 
     52                 config._acknowledgement_preamble_bullet3, 
     53                 config._acknowledgement_preamble_bullet4] 
    5354        self.list1 = wx.StaticText(self, -1, "\t(1) " + items[0]) 
    5455        self.list2 = wx.StaticText(self, -1, "\t(2) " + items[1]) 
    5556        self.list3 = wx.StaticText(self, -1, "\t(3) " + items[2]) 
     57        self.list4 = wx.StaticText(self, -1, "\t(4) " + items[3]) 
    5658        self.static_line = wx.StaticLine(self, 0) 
    5759        self.__set_properties() 
    5860        self.__do_layout() 
    59          
     61 
    6062    def __set_properties(self): 
    6163        """ 
     64        :TODO - add method documentation 
    6265        """ 
    6366        # begin wxGlade: DialogAbout.__set_properties 
    … …  
    7073    def __do_layout(self): 
    7174        """ 
     75        :TODO - add method documentation 
    7276        """ 
    7377        # begin wxGlade: DialogAbout.__do_layout 
    … …  
    7882        sizer_titles.Add(self.list2, 0, wx.ALL|wx.EXPAND, 5) 
    7983        sizer_titles.Add(self.list3, 0, wx.ALL|wx.EXPAND, 5) 
     84        sizer_titles.Add(self.list4, 0, wx.ALL|wx.EXPAND, 5) 
    8085        sizer_titles.Add(self.static_line, 0, wx.ALL|wx.EXPAND, 0) 
    8186        sizer_titles.Add(self.ack, 0, wx.ALL|wx.EXPAND, 5) 
    … …  
    8691        self.Centre() 
    8792        # end wxGlade 
    88          
     93 
    8994 
    9095##### testing code ############################################################ 
    9196class MyApp(wx.App): 
    9297    """ 
     98    Class for running module as stand alone for testing 
    9399    """ 
    94100    def OnInit(self): 
    95101        """ 
     102        Defines an init when running as standalone 
    96103        """ 
    97104        wx.InitAllImageHandlers() 

  • src/sas/guiframe/config.py

    r0ea31ca rc8d22ec  
    99__version__ = '0.0.0' 
    1010__build__ = '1' 
    11 __download_page__ = 'http://sourceforge.net/projects/sasview/files/' 
    12 __update_URL__ = ['svn.code.sf.net',  
    13                   '/p/sasview/code/trunk/sasview.latestversion'] 
     11__download_page__ = 'https://github.com/SasView/sasview/releases' 
     12__update_URL__ = ['https://github.com/SasView/sasview.git'] 
    1413 
    1514 
    … …  
    2120 
    2221# Debug message should be written to a file? 
    23 __EVT_DEBUG_2_FILE__   = False 
     22__EVT_DEBUG_2_FILE__ = False 
    2423__EVT_DEBUG_FILENAME__ = "debug.log" 
    2524 
    … …  
    3635'''Reference the following website: http://www.sasview.org''' 
    3736_acknowledgement_preamble_bullet3 =\ 
    38 '''Send us your reference for our records: sansdanse@gmail.com''' 
     37'''Reference the model you used if appropriate (see documentation for refs)''' 
     38_acknowledgement_preamble_bullet4 =\ 
     39'''Send us your reference for our records: developers@sasview.org''' 
    3940_acknowledgement_publications = \ 
    40 '''This work benefited from the use of the SasView application, originally  
     41'''This work benefited from the use of the SasView application, originally 
    4142developed under NSF award DMR-0520547. 
    4243''' 
    4344_acknowledgement =  \ 
    4445'''This work originally developed as part of the DANSE project funded by the NSF 
    45 under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS  
     46under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
    4647and ILL. 
    4748 
    … …  
    8586PLUGINS_WLIST = [] 
    8687PLUGIN_STATE_EXTENSIONS = [] 
    87 SPLASH_SCREEN_PATH = "images/danse_logo.png"      
     88SPLASH_SCREEN_PATH = "images/danse_logo.png" 
    8889DEFAULT_STYLE = GUIFRAME.SINGLE_APPLICATION 
    8990SPLASH_SCREEN_WIDTH = 500 
    9091SPLASH_SCREEN_HEIGHT = 300 
    91 WELCOME_PANEL_ON  = False 
     92WELCOME_PANEL_ON = False 
    9293TUTORIAL_PATH = None 
    9394SS_MAX_DISPLAY_TIME = 1500 
    … …  
    125126 
    126127def printEVT(message): 
     128    """ 
     129    :TODO - need method documentation 
     130    """ 
    127131    if __EVT_DEBUG__: 
    128132        print "%g:  %s" % (time.clock(), message) 
    129          
     133     
    130134        if __EVT_DEBUG_2_FILE__: 
    131135            out = open(__EVT_DEBUG_FILENAME__, 'a') 

  • src/sas/guiframe/documentation_window.py

    rd20eb45 rc8d22ec  
    4141    called 
    4242    (self, parent, dummy_id, path, url_instruction, title, size=(850, 540)) 
    43      
    44     :param path: path to html file beginning AFTER /doc/ and ending in the  
     43 
     44    :param path: path to html file beginning AFTER /doc/ and ending in the 
    4545    file.html 
    4646    :param url_instructions: anchor string or other query e.g. '#MyAnchor 
    … …  
    6565        #file:/// be another constant at the beginning that yields // for Mac 
    6666        #and /// for PC. 
    67         #Note added June 21, 2015     PDB  
     67        #Note added June 21, 2015     PDB 
    6868        file_path = os.path.join(docs_path, path) 
    6969        url = "file:///" + urllib.quote(file_path, r'/\:')+ url_instruction 
Note: See TracChangeset for help on using the changeset viewer.