Changeset 4d7e5d5 in sasview

Timestamp:

Apr 5, 2014 6:03:12 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:

da6c9847

Parents:

49d019c

Message:

refactor silly if statements

File:

• src/sans/guiframe/gui_manager.py (modified) (3 diffs)

src/sans/guiframe/gui_manager.py

@@ -1011 +1011 @@
         d_panel_width, h = self._get_panels_size(self._data_panel)
         win.SetSize((d_panel_width, h))
-        style = self.__gui_style & GUIFRAME.MANAGER_ON
-        if style != GUIFRAME.MANAGER_ON:
-            flag = False
-        else:
-            flag = True
+        is_visible = self.__gui_style & GUIFRAME.MANAGER_ON == GUIFRAME.MANAGER_ON
         if not IS_WIN:
             win.SetPosition((0, mac_pos_y + size_t_bar))
-        win.Show(flag)
+        win.Show(is_visible)
         # Add the panels to the AUI manager
         for panel_class in panels:
             frame = panel_class.get_frame()
             id = wx.NewId()
-            # Check whether we need to put this panel
-            # in the center pane
-            
+            # Check whether we need to put this panel in the center pane
             if hasattr(panel_class, "CENTER_PANE") and panel_class.CENTER_PANE:
                 w, h = self._get_panels_size(panel_class)
@@ -1035 +1029 @@
                     frame.Show(False)
             elif panel_class == self._data_panel:
-                panel_class.frame.Show(flag)
+                panel_class.frame.Show(is_visible)
                 continue
             else:
@@ -1042 +1036 @@
                 frame.Show(False)
             if not IS_WIN:
-                x_pos, _ = frame.GetPositionTuple()
                 frame.SetPosition((d_panel_width + 1, mac_pos_y + size_t_bar))