Changeset 31ac4a1 in sasview

Timestamp:

Apr 21, 2013 12:08:46 PM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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

Message:

trying to fix scrolleddatapanel: MAC

Location:

sansguiframe/src/sans/guiframe

Files:

• data_panel.py (modified) (2 diffs)
• gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -132 +132 @@
                  id=-1,
                  list_of_perspective=None, manager=None, *args, **kwds):
-        kwds['size'] = size
-        kwds['style'] = STYLE_FLAG
+        #kwds['size'] = size
+        #kwds['style'] = STYLE_FLAG
         ScrolledPanel.__init__(self, parent=parent, id=id, *args, **kwds)
-        PanelBase.__init__(self)
+        PanelBase.__init__(self, parent)
         self.SetupScrolling()
         #Set window's font size 
@@ -145 +145 @@
         self.parent = parent.parent
         self._manager = manager
-        self.frame = None
+        self.frame = parent
         if list is None:
             list = []

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -990 +990 @@
         data_panel = DataPanel(parent=win,  id=-1)
         win.set_panel(data_panel)
-        data_panel.set_frame(win)
+        #data_panel.set_frame(win)
         self.panels["data_panel"] = data_panel
         self._data_panel = data_panel
-        frame = self._data_panel.get_frame()
         w, h = self._get_panels_size(self._data_panel)
-        frame.SetSize((w, h))
+        win.SetSize((w, h))
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style != GUIFRAME.MANAGER_ON:
@@ -1003 +1002 @@
         if not IS_WIN:
             x_pos, _ = win.GetPositionTuple()
-            frame.SetPosition((x_pos, mac_pos_y + 70))
-        frame.Show(flag)
+            win.SetPosition((x_pos, mac_pos_y + 70))
+        win.Show(flag)
         d_panel_width = w
         # Add the panels to the AUI manager
@@ -1022 +1021 @@
                     frame.Show(False)
             elif panel_class == self._data_panel:
+                panel_class.frame.Show(flag)
                 continue
             else: