Changeset d785914 in sasview

Timestamp:

May 19, 2011 3:40:05 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

accbb1b

Parents:

7a8faf8

Message:

fix float panel

Location:

guiframe

Files:

• data_panel.py (modified) (1 diff)
• gui_manager.py (modified) (6 diffs)

guiframe/data_panel.py

@@ -114 +114 @@
                  size=(PANEL_WIDTH, PANEL_HEIGHT),
                  list_of_perspective=None, manager=None, *args, **kwds):
-        print "size", size
         kwds['size']= size
         kwds['style'] = STYLE_FLAG

guiframe/gui_manager.py

@@ -770 +770 @@
             self._popup_floating_panel(p)
             
-        pane = self._mgr.GetPane(windowname)
-        self._mgr.MaximizePane(pane)
-        self._mgr.RestoreMaximizedPane()
         # Register for showing/hiding the panel
         wx.EVT_MENU(self, ID, self.on_view)
@@ -787 +784 @@
                 if caption not in self._data_panel.cb_plotpanel.GetItems():
                     self._data_panel.cb_plotpanel.Append(str(caption), p)
-
-        self._mgr.Update()
         return ID
         
@@ -1976 +1971 @@
         make the plot panel floatable
         """
+        
         self.__gui_style &= (~GUIFRAME.FIXED_PANEL)
         self.__gui_style |= GUIFRAME.FLOATING_PANEL
-        for p in self.panels.values():
+        plot_panel = []
+        if self._plotting_plugin is not None:
             plot_panel = self._plotting_plugin.plot_panels.values()
-            for p in self.panels.values():
-                if p in plot_panel:
-                    self._popup_floating_panel(p)
+            for p in plot_panel:
+                self._popup_floating_panel(p)
         
     def set_plotpanel_fixed(self, event=None):
@@ -1993 +1989 @@
         if self._plotting_plugin is not None:
             plot_panel = self._plotting_plugin.plot_panels.values()
-            for p in self.panels.values():
-                if p in plot_panel:
-                    self._popup_fixed_panel(p)
+            for p in plot_panel:
+                self._popup_fixed_panel(p)
                     
     def _popup_fixed_panel(self, p):
@@ -2009 +2004 @@
             self._mgr.GetPane(p.window_name).LeftDockable(False)
             self._mgr.GetPane(p.window_name).RightDockable(True)
-            flag = self._mgr.GetPane(p.window_name).IsShown()
-            self._mgr.GetPane(p.window_name).Show(flag)
             self._mgr.Update()
             
@@ -2021 +2014 @@
             self._mgr.GetPane(p.window_name).Float()
             self._mgr.GetPane(p.window_name).Dockable(False)
-            flag = self._mgr.GetPane(p.window_name).IsShown()
-            self._mgr.GetPane(p.window_name).Show(flag)
             self._mgr.Update()