Ignore:
Timestamp:
Aug 27, 2013 11:29:55 AM (11 years ago)
Author:
ajj
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:
12c4933
Parents:
51e5a87
Message:

Fix to gui_manager to account for lack of CONTROL_HEIGHT and CONTROL_WIDTH in old sasview config files that prevented startup.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansguiframe/src/sans/guiframe/gui_manager.py

    r6d4df13 r5ea34ec  
    962962        if hasattr(p, "CENTER_PANE") and p.CENTER_PANE: 
    963963            panel_width = self._window_width * 0.45 
    964             if custom_config != None: 
    965                 if custom_config.CONTROL_WIDTH > 0: 
    966                     panel_width = CONTROL_WIDTH 
    967                 if custom_config.CONTROL_HEIGHT > 0: 
    968                     panel_height = CONTROL_HEIGHT 
     964            if CONTROL_WIDTH > 0: 
     965                panel_width = CONTROL_WIDTH 
     966            if CONTROL_HEIGHT > 0: 
     967                panel_height = CONTROL_HEIGHT 
    969968            return panel_width, panel_height 
    970969        elif p == self.defaultPanel: 
Note: See TracChangeset for help on using the changeset viewer.