Made sync_workers get called well! Roar!

Ram Rachum · Ram Rachum · commit 38bdf56779ed · 2009-08-14T20:55:53.000+02:00
diff --git a/src/garlicsim/edgecruncher.py b/src/garlicsim/edgecruncher.py
@@ -33,7 +33,11 @@
 
 #from core import *
 import threading
-import Queue as queue
+
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 
 try:
     from misc.processpriority import set_process_priority
@@ -52,7 +56,7 @@ class EdgeCruncher(threading.Thread):
     most of the smart work is being done by sync_workers.
     """
     def __init__(self,starter,step_function,*args,**kwargs):
-        Process.__init__(self,*args,**kwargs)
+        threading.Thread.__init__(self,*args,**kwargs)
 
         self.step=step_function
         self.starter=starter
@@ -92,21 +96,22 @@ def run(self):
         #import psyco #These two belong here?
         #psyco.full()
 
-        current=self.starter
-        order=None
+        current = self.starter
+        order = None
         while True:
-            next=self.step(current)
+            next = self.step(current)
             self.work_queue.put(next)
-            current=next
+            current = next
 
             try:
                 order=self.message_queue.get(block=False)
                 #do something with order
-                if order=="???":
-                    #do ???
-                    pass
-
-                order=None
-            except QueueModule.Empty:
+                if order=="Terminate":
+                    return
+                order = None
+            except queue.Empty:
                 pass
 
+    def terminate(self):
+        self.message_queue.put("Terminate")
+
diff --git a/src/garlicsimwx/applicationwindow.py b/src/garlicsimwx/applicationwindow.py
@@ -1,4 +1,5 @@
 import os, sys
+import random
 
 import wx
 
@@ -8,6 +9,7 @@
 import misc.notebookctrl as notebookctrl
 import customwidgets
 
+import misc.threadtimer as threadtimer
 
 #import psyco
 #psyco.full()
@@ -23,6 +25,11 @@ def get_program_path():
 sys.path.append(get_program_path())
 ########################
 
+
+wxEVT_RUN_BACKGROUND = wx.NewEventType()
+EVT_RUN_BACKGROUND = wx.PyEventBinder(wxEVT_RUN_BACKGROUND, 1)
+
+
 class ApplicationWindow(wx.Frame):
     """
     An application window that allows the user to open multiple GuiProjects
@@ -58,9 +65,19 @@ def __init__(self,*args,**keywords):
         self.Bind(wx.EVT_TOOL, self.on_new, id=s2i("Button New"))
         self.Bind(wx.EVT_TOOL, self.done_editing, id=s2i("Button Done editing"))
 
+        """
+        self.Bind(EVT_RUN_BACKGROUND, self.on_run_background)
+
+        event = wx.PyEvent()
+        event.SetEventType(wxEVT_RUN_BACKGROUND)
+        wx.PostEvent(self, event)
+
+        self.run_background_block=False
+        """
 
-        self.Bind(wx.EVT_IDLE,self.sync_workers_wrapper)
-        self.idle_block=False
+        self.background_timer = threadtimer.ThreadTimer(self)
+        self.background_timer.start(150)
+        self.Bind(threadtimer.EVT_THREAD_TIMER, self.background_stuff)
 
         self.Show()
 
@@ -78,6 +95,7 @@ def delete_gui_project(self,gui_project):
     """
 
     def exit(self,e):
+        self.background_timer.stop()
         self.Close()
 
     def done_editing(self,e=None):
@@ -103,27 +121,14 @@ def on_new(self,e):
         gui_project=guiproject.GuiProject(simulation_package,self.notebook)
         self.add_gui_project(gui_project)
 
-    def sync_workers_wrapper(self,e=None):
+    def background_stuff(self, e=None):
         """
         A function that calls `sync_workers` for all the
         open GuiProjects.
         """
+        for gui_project in self.gui_projects:
+            gui_project.sync_workers()
 
-        if self.idle_block==True:
-            return
-
-
-        for thing in self.gui_projects:
-            thing.sync_workers()
-
-        wx.CallLater(150,self._clear_idle_block_and_do) # Should make the delay customizable?
-        self.idle_block=True
-
-    def _clear_idle_block_and_do(self):
-        self.idle_block=False
-        event=wx.PyEvent()
-        event.SetEventType(wx.wxEVT_IDLE)
-        wx.PostEvent(self,event)
 
 
 def main():
diff --git a/src/garlicsimwx/guiproject.py b/src/garlicsimwx/guiproject.py
@@ -194,10 +194,10 @@ def toggle_playing(self):
 
     def __play_next(self,node):
         """
-        A function called repeatedly while playing the simualtion.
+        A function called repeatedly while playing the simulation.
         """
         self.show_state(node.state)
-        self.main_window.Refresh()
+        self.main_window.Refresh() # Make more efficient?
         self.active_node=node
         try:
             next_node=self.path.next_node(node)
@@ -253,7 +253,7 @@ def sync_workers(self):
         """
 
         if added_nodes>0:
-            self.main_window.Refresh()
+            self.tree_modify_refresh()
         if self.ran_out_of_tree_while_playing==True:
             self.ran_out_of_tree_while_playing=False
             self.stop_playing()
@@ -286,3 +286,7 @@ def make_generic_initial_dialog(self):
                 self.make_plain_root()
         initial_dialog.Destroy()
 
+    def tree_modify_refresh(self):
+        self.seek_bar.Refresh()
+        self.tree_browser.Refresh()
+
diff --git a/src/garlicsimwx/misc/threadtimer.py b/src/garlicsimwx/misc/threadtimer.py
@@ -0,0 +1,29 @@
+import threading
+import time
+import wx
+
+wxEVT_THREAD_TIMER = wx.NewEventType()
+EVT_THREAD_TIMER = wx.PyEventBinder(wxEVT_THREAD_TIMER, 1)
+
+class ThreadTimer(object):
+   def __init__(self, parent):
+        self.parent = parent
+        self.thread = Thread()
+        self.thread.parent = self
+        self.alive = False
+
+   def start(self, interval):
+       self.interval = interval
+       self.alive = True
+       self.thread.start()
+
+   def stop(self):
+       self.alive = False
+
+class Thread(threading.Thread):
+    def run(self):
+       while self.parent.alive:
+           time.sleep(self.parent.interval / 1000.0)
+           event = wx.PyEvent()
+           event.SetEventType(wxEVT_THREAD_TIMER)
+           wx.PostEvent(self.parent.parent, event)
