Changeset 1c1b037 in sasview for src/sans/guiframe


Ignore:
Timestamp:
Oct 23, 2013 11:08:38 AM (11 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
abf7eed
Parents:
17b1873
Message:

From commit 6775: Fix to gui_manager to account for lack of CONTROL_HEIGHT and CONTROL_WIDTH in old sasview config files that prevented startup.
https://sourceforge.net/p/sasview/code/6775/

File:
1 edited

Legend:

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

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