Changeset 31ac4a1 in sasview for sansguiframe
- Timestamp:
- Apr 21, 2013 2:08:46 PM (12 years ago)
- 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:
- 5cfa884
- Parents:
- 7d90e55
- Location:
- sansguiframe/src/sans/guiframe
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sansguiframe/src/sans/guiframe/data_panel.py
rcb6a2b7 r31ac4a1 132 132 id=-1, 133 133 list_of_perspective=None, manager=None, *args, **kwds): 134 kwds['size'] = size135 kwds['style'] = STYLE_FLAG134 #kwds['size'] = size 135 #kwds['style'] = STYLE_FLAG 136 136 ScrolledPanel.__init__(self, parent=parent, id=id, *args, **kwds) 137 PanelBase.__init__(self )137 PanelBase.__init__(self, parent) 138 138 self.SetupScrolling() 139 139 #Set window's font size … … 145 145 self.parent = parent.parent 146 146 self._manager = manager 147 self.frame = None147 self.frame = parent 148 148 if list is None: 149 149 list = [] -
sansguiframe/src/sans/guiframe/gui_manager.py
r7d90e55 r31ac4a1 990 990 data_panel = DataPanel(parent=win, id=-1) 991 991 win.set_panel(data_panel) 992 data_panel.set_frame(win)992 #data_panel.set_frame(win) 993 993 self.panels["data_panel"] = data_panel 994 994 self._data_panel = data_panel 995 frame = self._data_panel.get_frame()996 995 w, h = self._get_panels_size(self._data_panel) 997 frame.SetSize((w, h))996 win.SetSize((w, h)) 998 997 style = self.__gui_style & GUIFRAME.MANAGER_ON 999 998 if style != GUIFRAME.MANAGER_ON: … … 1003 1002 if not IS_WIN: 1004 1003 x_pos, _ = win.GetPositionTuple() 1005 frame.SetPosition((x_pos, mac_pos_y + 70))1006 frame.Show(flag)1004 win.SetPosition((x_pos, mac_pos_y + 70)) 1005 win.Show(flag) 1007 1006 d_panel_width = w 1008 1007 # Add the panels to the AUI manager … … 1022 1021 frame.Show(False) 1023 1022 elif panel_class == self._data_panel: 1023 panel_class.frame.Show(flag) 1024 1024 continue 1025 1025 else:
Note: See TracChangeset
for help on using the changeset viewer.