ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'empty_DockArea_save-restore_fix' of https://github.com/lidstrom83/pyqtgraph into lidstrom83-empty_DockArea_save-restore_fix

Browse Source
This commit is contained in:
Luke Campagnola 2015-03-17 22:43:58 -04:00
commit 45cf6a32dd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pyqtgraph/dockarea/DockArea.py
View File

@ -197,7 +197,13 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
""" """
Return a serialized (storable) representation of the state of Return a serialized (storable) representation of the state of
all Docks in this DockArea.""" all Docks in this DockArea."""
state = {'main': self.childState(self.topContainer), 'float': []}
if self.topContainer is None:
main = None
else:
main = self.childState(self.topContainer)
state = {'main': main, 'float': []}
for a in self.tempAreas: for a in self.tempAreas:
geo = a.win.geometry() geo = a.win.geometry()
geo = (geo.x(), geo.y(), geo.width(), geo.height()) geo = (geo.x(), geo.y(), geo.width(), geo.height())
@ -229,7 +235,8 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
#print "found docks:", docks #print "found docks:", docks
## 2) create container structure, move docks into new containers ## 2) create container structure, move docks into new containers
self.buildFromState(state['main'], docks, self) if state['main'] is not None:
self.buildFromState(state['main'], docks, self)
## 3) create floating areas, populate ## 3) create floating areas, populate
for s in state['float']: for s in state['float']: