Changeset 5ea34ec in sasview for sansguiframe/src

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:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -962 +962 @@
         if hasattr(p, "CENTER_PANE") and p.CENTER_PANE:
             panel_width = self._window_width * 0.45
-            if custom_config != None:
-                if custom_config.CONTROL_WIDTH > 0:
-                    panel_width = CONTROL_WIDTH
-                if custom_config.CONTROL_HEIGHT > 0:
-                    panel_height = CONTROL_HEIGHT
+            if CONTROL_WIDTH > 0:
+                panel_width = CONTROL_WIDTH
+            if CONTROL_HEIGHT > 0:
+                panel_height = CONTROL_HEIGHT
             return panel_width, panel_height
         elif p == self.defaultPanel: