Changeset 069aae2 in sasview


Ignore:
Timestamp:
Jul 19, 2015 2:57:30 PM (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:
957af0d
Parents:
24386b9
Message:

Removes traceback logging from check_updates - single line of "cannot
connect to sasview.org" seems sufficient here given the number of times
this is likely to happen if behind a firewall.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/guiframe/gui_manager.py

    r24386b9 r069aae2  
    5252        The application directory is the one where the default custom_config.py 
    5353        file resides. 
     54 
     55        :returns: app_path - the path to the applicatin directory 
    5456    """ 
    5557    # First, try the directory of the executable we are running 
     
    6870 
    6971    # Finally, try the directory of the sasview module 
    70     #TODO: gui_manager will have to know about sasview until we 
     72    # TODO: gui_manager will have to know about sasview until we 
    7173    # clean all these module variables and put them into a config class 
    7274    # that can be passed by sasview.py. 
     
    834836    def PushStatusText(self, *args, **kwds): 
    835837        """ 
    836             FIXME: No message is passed. What is this supposed to do? 
     838        .. todo:: No message is passed. What is this supposed to do? 
    837839        """ 
    838840        field = self.sb.get_msg_position() 
    839841        wx.Frame.PushStatusText(self, field=field, 
    840                                 string="FIXME: PushStatusText called without text") 
     842                                string="FIXME - PushStatusText called without text") 
    841843 
    842844    def add_perspective(self, plugin): 
     
    894896        :param dir: directory in which to look for plug-ins 
    895897 
    896         :return: list of plug-ins 
     898        :returns: list of plug-ins 
    897899 
    898900        """ 
     
    945947                            file.close() 
    946948        except: 
    947             # Should raise and catch at a higher level and  
     949            # Should raise and catch at a higher level and 
    948950            # display error on status bar 
    949951            logging.error(sys.exc_value) 
     
    992994 
    993995        # Set up welcome panel 
    994         #TODO: this needs serious simplification 
     996        # TODO: this needs serious simplification 
    995997        if self.welcome_panel_class is not None: 
    996998            welcome_panel = MDIFrame(self, None, 'None', (100, 200)) 
     
    10821084    def onfreeze(self, theory_id): 
    10831085        """ 
     1086        Saves theory/model and passes to data loader. 
     1087 
     1088        ..warning:: This seems to be the exact same code as the next 
     1089        function called simply freeze. This probably needs fixing 
    10841090        """ 
    10851091        data_state_list = self._data_manager.freeze(theory_id) 
     
    10931099    def freeze(self, data_id, theory_id): 
    10941100        """ 
     1101        Saves theory/model and passes to data loader. 
     1102 
     1103        ..warning:: This seems to be the exact same code as the next 
     1104        function called simply freeze. This probably needs fixing 
    10951105        """ 
    10961106        data_state_list = self._data_manager.freeze_theory(data_id=data_id, 
     
    11571167        :param p: panel object to add to the AUI manager 
    11581168 
    1159         :return: ID of the event associated with the new panel [int] 
     1169        :returns: ID of the event associated with the new panel [int] 
    11601170 
    11611171        """ 
     
    11781188        # Append nummber 
    11791189        captions = self._get_plotpanel_captions() 
    1180         #FIXME: Fix this aweful loop 
     1190        # FIXME: Fix this awful loop 
    11811191        while (1): 
    11821192            caption = windowcaption + '%s' % str(self.graph_num) 
     
    20502060            version_info = json.loads(content) 
    20512061        except: 
    2052             msg = traceback.format_exc() 
    2053             logging.info(msg) 
    20542062            logging.info("Failed to connect to www.sasview.org") 
    20552063            version_info = {"version": "0.0.0"} 
     
    24582466        """ 
    24592467        Save file as txt 
    2460         :TODO: Refactor and remove this method. See TODO in _onSave. 
     2468 
     2469        .. todo:: Refactor and remove this method. See 'TODO' in _onSave. 
    24612470        """ 
    24622471        if not path == None: 
     
    28862895                    # Append nummber 
    28872896                    inc = 1 
    2888                     #FIXME: fix this terrible loop 
     2897                    # FIXME: fix this terrible loop 
    28892898                    while (1): 
    28902899                        caption = new_caption + '_%s' % str(inc) 
     
    29092918 
    29102919        :param name: window_name in AuiPaneInfo 
    2911         :return: AuiPaneInfo of the name 
     2920        :returns: AuiPaneInfo of the name 
    29122921        """ 
    29132922        for panel in self.plot_panels.values(): 
     
    30813090                pass 
    30823091 
    3083         # Draw all panels  
     3092        # Draw all panels 
    30843093        if count == 1: 
    30853094            f_draw(self.schedule_full_draw_list[0]) 
    30863095        else: 
    30873096            map(f_draw, self.schedule_full_draw_list) 
    3088         # Reset the attr   
     3097        # Reset the attr 
    30893098        if len(self.schedule_full_draw_list) == 0: 
    30903099            self.set_schedule(False) 
     
    31273136        Get window size 
    31283137 
    3129         :return size: tuple 
     3138        :returns: size 
     3139        :rtype: tuple 
    31303140        """ 
    31313141        width, height = self.GetSizeTuple() 
     
    31483158            pass 
    31493159 
    3150         # restart idle         
     3160        # restart idle 
    31513161        self._redraw_idle(*args, **kwargs) 
    31523162 
     
    31563166        Restart Idle 
    31573167        """ 
    3158         # restart idle    
     3168        # restart idle 
    31593169        self.idletimer.Restart(100 * TIME_FACTOR, *args, **kwargs) 
    31603170 
     
    33163326        """ 
    33173327        is_maximized = False 
    3318         # Get size of screen without  
     3328        # Get size of screen without 
    33193329        for screenCount in range(wx.Display().GetCount()): 
    33203330            screen = wx.Display(screenCount) 
     
    33333343            customHeight = displayHeight * 0.9 
    33343344        else: 
    3335             # If the custom screen is bigger than the  
     3345            # If the custom screen is bigger than the 
    33363346            # window screen than make maximum size 
    33373347            if customWidth > displayWidth: 
     
    34313441    def show_data_panel(self, action): 
    34323442        """ 
     3443        Turns on the data panel 
     3444 
     3445        The the data panel is optional.  Most of its functions can be 
     3446        performed from the menu bar and from the plots. 
    34333447        """ 
    34343448        self.parent.show_data_panel(action) 
Note: See TracChangeset for help on using the changeset viewer.