From cdd463d35bb3059f2e7f65c4d84adcbdb0308802 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Fri, 19 Nov 2010 08:55:10 +0100 Subject: [PATCH] Minor refactor of the snapshot code --- gui/chromeTabs.py | 7 +++---- gui/fittingView.py | 9 +++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index 0b2540a28..0b2f8d2fe 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -949,12 +949,11 @@ class PFTabsContainer(wx.Panel): if self.TabHitTest(tab, mposx, mposy): try: page = self.Parent.GetPage(self.GetTabIndex(tab)) - if page.CanUseSnapshot(): + if hasattr(page, "Snapshot"): if not self.previewTimer: self.previewTimer = wx.Timer(self, self.previewTimerID) self.previewTab = tab - self.previewBmp = page.FVsnapshot self.previewTimer.Start(1500, True) break except: @@ -1171,8 +1170,8 @@ class PFTabsContainer(wx.Panel): cposx, cposy = self.ScreenToClient((mposx, mposy)) if self.FindTabAtPos(cposx, cposy) == self.previewTab: if not self.previewTab.GetSelected(): - - self.previewWnd = PFNotebookPagePreview(self,(mposx+3,mposy+3), self.previewBmp, self.previewTab.text) + page = self.Parent.GetPage(self.GetTabIndex(self.previewTab)) + self.previewWnd = PFNotebookPagePreview(self,(mposx+3,mposy+3), page.Snapshot(), self.previewTab.text) self.previewWnd.Show() event.Skip() diff --git a/gui/fittingView.py b/gui/fittingView.py index bc8caa6f4..129e939ea 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -369,19 +369,20 @@ class FittingView(d.Display): def OnShow(self, event): if not event.GetShow(): - self.Snapshot() + self.MakeSnapshot() event.Skip() - def CanUseSnapshot(self): - return True - def Snapshot(self): + return self.FVsnapshot + + def MakeSnapshot(self): if self.FVsnapshot: del self.FVsnapshot wantedWidth = 0 for i in xrange(4): wantedWidth += self.GetColumnWidth(i) + rect = self.GetRect() rect.height = min(rect.height, 400) rect.width = min(rect.width, wantedWidth)