Text archives Help
- From:
- To:
- Subject: [Manta] r2372 - trunk/SwigInterface
- Date: Wed, 4 Feb 2009 16:17:01 -0700 (MST)
Author: dav
Date: Wed Feb 4 16:16:59 2009
New Revision: 2372
Modified:
trunk/SwigInterface/BackgroundFrame.py
trunk/SwigInterface/CameraFrame.py
trunk/SwigInterface/MantaCameraPath.py
trunk/SwigInterface/MantaCapture.py
trunk/SwigInterface/wxManta.py
Log:
Don't destroy these windows as they are reused... Just don't show them
when they aren't needed.
Modified: trunk/SwigInterface/BackgroundFrame.py
==============================================================================
--- trunk/SwigInterface/BackgroundFrame.py (original)
+++ trunk/SwigInterface/BackgroundFrame.py Wed Feb 4 16:16:59 2009
@@ -68,10 +68,10 @@
def OnClickOK(self, evt):
self.ApplySettings()
- self.Close(True)
+ self.Show(False)
def OnClickCancel(self, evt):
- self.Close(True)
+ self.Show(False)
def OnClickApply(self, evt):
self.ApplySettings()
@@ -80,10 +80,8 @@
self.constantPanel.Apply()
# self.engine.addTransaction("Apply background settings",
manta_new(createMantaTransaction(self.constantPanel.Apply, ())))
-
def OnCloseWindow(self, evt):
- self.Close(True)
-
+ self.Show(False)
class ConstantBackgroundPanel(wx.Panel):
Modified: trunk/SwigInterface/CameraFrame.py
==============================================================================
--- trunk/SwigInterface/CameraFrame.py (original)
+++ trunk/SwigInterface/CameraFrame.py Wed Feb 4 16:16:59 2009
@@ -190,7 +190,7 @@
def OnClickOK(self, evt):
self.ApplySettings()
- self.Close(True)
+ self.Show(False)
def OnClickApply(self, evt):
self.ApplySettings()
@@ -226,10 +226,11 @@
def OnCloseWindow(self, evt):
- # Disconnect from events...
- EventManager.DeregisterListener( self.OnManipulation );
+ # I don't think we want to do this, as we aren't killing the window
anymore...
+ # Disconnect from events...
+ # EventManager.DeregisterListener( self.OnManipulation );
- self.Destroy()
+ self.Show( False )
Modified: trunk/SwigInterface/MantaCameraPath.py
==============================================================================
--- trunk/SwigInterface/MantaCameraPath.py (original)
+++ trunk/SwigInterface/MantaCameraPath.py Wed Feb 4 16:16:59 2009
@@ -550,5 +550,5 @@
def OnCloseWindow(self, event):
- self.Destroy()
+ self.Show( False )
Modified: trunk/SwigInterface/MantaCapture.py
==============================================================================
--- trunk/SwigInterface/MantaCapture.py (original)
+++ trunk/SwigInterface/MantaCapture.py Wed Feb 4 16:16:59 2009
@@ -203,7 +203,7 @@
def OnCloseWindow(self, event):
- self.Destroy()
+ self.Show( False )
def ResampleCapturedFrames( prefix, performance ):
Modified: trunk/SwigInterface/wxManta.py
==============================================================================
--- trunk/SwigInterface/wxManta.py (original)
+++ trunk/SwigInterface/wxManta.py Wed Feb 4 16:16:59 2009
@@ -317,7 +317,7 @@
self.Bind(wx.EVT_MENU, self.OnShowDialog,
self.view_menu.Append(dialog_id, "Edit Camera"))
- #Edit Background dialog.
+ # Edit Background dialog.
dialog_id = wx.NewId()
self.dialog_id_map[dialog_id] = BackgroundFrame
self.Bind(wx.EVT_MENU, self.OnShowDialog,
- [Manta] r2372 - trunk/SwigInterface, dav, 02/04/2009
Archive powered by MHonArc 2.6.16.