Changeset 1461

Timestamp:

07/07/08 07:41:07 (8 weeks ago)

Author:

rob

Message:

Changed from idle processing to polling timer to get output from subprocesses

Location:

trunk/peppy

Files:

• lib/processmanager.py (modified) (5 diffs)
• main.py (modified) (1 diff)

trunk/peppy/lib/processmanager.py

@@ -49 +49 @@
         _GlobalProcessManager = _ProcessManager()
         wx.GetApp().Bind(wx.EVT_END_PROCESS, ProcessManager().OnProcessEnded)
+        wx.GetApp().Bind(wx.EVT_TIMER, ProcessManager().OnUpdateOutput)
 
     return _GlobalProcessManager
@@ -209 +210 @@
     debuglevel = 0
     autoclean = True
+    timer = None
     
     jobs = []
@@ -217 +219 @@
             if job.process:
                 job.readStreams()
+    
+    def OnUpdateOutput(self, evt):
+        self.idle()
     
     def run(self, cmd, working_dir, job_output, input=""):
@@ -226 +231 @@
             self.job_lookup[job.pid] = job
             Publisher().sendMessage('peppy.processmanager.started', job)
+        if not self.timer:
+            self.__class__.timer = wx.Timer(wx.GetApp())
+            self.__class__.timer.Start(500)
         return job
 
@@ -255 +263 @@
         if self.autoclean:
             self.removeJob(job)
+        if not self.jobs:
+            self.__class__.timer.Stop()
+            self.__class__.timer = None
         self.finished(job)
 

trunk/peppy/main.py

@@ -411 +411 @@
         wx.SetDefaultPyEncoding(self.classprefs.default_text_encoding)
         
-        self.Bind(wx.EVT_IDLE, self.OnIdle)
         self.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
 
         return True
     
-    def OnIdle(self, evt):
-        """Application-wide idle update events are processed here.
-        """
-        # The process manager is a global, so it should be updated here
-        ProcessManager().idle()
-        evt.Skip()
-
     def OnKeyDown(self, evt):
         """Last chance to handle keystroke processing.