From 42b83d4ec47669f8d88180ebb750dd20fe644079 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Thu, 28 Dec 2017 19:55:04 -0500
Subject: fix trailing whitespace

---
 embroider_params.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 4e69ac33..8754f273 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -305,7 +305,7 @@ class SettingsFrame(wx.Frame):
     def __init__(self, *args, **kwargs):
         # begin wxGlade: MyFrame.__init__
         self.tabs_factory = kwargs.pop('tabs_factory', [])
-        wx.Frame.__init__(self, None, wx.ID_ANY, 
+        wx.Frame.__init__(self, None, wx.ID_ANY,
                           "Embroidery Params"
                           )
         self.notebook = wx.Notebook(self, wx.ID_ANY)
@@ -397,10 +397,10 @@ class SettingsFrame(wx.Frame):
 
 
     def _load_preset(self, preset_name):
-        preset = self.check_and_load_preset(preset_name)         
+        preset = self.check_and_load_preset(preset_name)
         if not preset:
             return
-        
+
         for tab in self.tabs:
             tab.load_preset(preset)
 
@@ -420,11 +420,11 @@ class SettingsFrame(wx.Frame):
         if not preset_name:
             return
 
-        preset = self.check_and_load_preset(preset_name)         
+        preset = self.check_and_load_preset(preset_name)
         if not preset:
             return
 
-        delete_preset(preset_name)        
+        delete_preset(preset_name)
         self.update_preset_list()
         self.preset_chooser.SetValue("")
 
@@ -521,7 +521,7 @@ class EmbroiderParams(inkex.Effect):
         else:
             getter = 'get_param'
 
-        values = filter(lambda item: item is not None, 
+        values = filter(lambda item: item is not None,
                         (getattr(node, getter)(param.name, param.default) for node in nodes))
 
         return values
-- 
cgit v1.2.3


From 61ed1da1cfb39f6350156bf56ce969efa8899891 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 30 Dec 2017 16:05:21 -0500
Subject: params simulate window

when you change params, a simulate window opens to preview the results right
away
---
 embroider_params.py | 86 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 80 insertions(+), 6 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 8754f273..7d76c9d9 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -5,6 +5,7 @@ import os
 import sys
 import json
 import traceback
+from copy import copy
 from cStringIO import StringIO
 import wx
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -13,7 +14,7 @@ import inkex
 from embroider import Param, EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn, descendants
 from functools import partial
 from itertools import groupby
-
+from embroider_simulate import EmbroiderySimulator
 
 def presets_path():
     try:
@@ -128,8 +129,14 @@ class ParamsTab(ScrolledPanel):
     def set_parent_tab(self, tab):
         self.parent_tab = tab
 
+    def is_dependent_tab(self):
+        return self.parent_tab is not None
+
+    def enabled(self):
+        return self.toggle_checkbox.IsChecked()
+
     def update_toggle_state(self, event=None, notify_pair=True):
-        enable = self.toggle_checkbox.IsChecked()
+        enable = self.enabled()
         # print self.name, "update_toggle_state", enable
         for child in self.settings_grid.GetChildren():
             widget = child.GetWindow()
@@ -137,7 +144,7 @@ class ParamsTab(ScrolledPanel):
                 child.GetWindow().Enable(enable)
 
         if notify_pair and self.paired_tab:
-            self.paired_tab.pair_changed(self.toggle_checkbox.IsChecked())
+            self.paired_tab.pair_changed(enable)
 
         for tab in self.dependent_tabs:
             tab.dependent_enable(enable)
@@ -149,7 +156,7 @@ class ParamsTab(ScrolledPanel):
         # print self.name, "pair_changed", value
         new_value = not value
 
-        if self.toggle_checkbox.IsChecked() != new_value:
+        if self.enabled() != new_value:
             self.set_toggle_state(not value)
             self.toggle_checkbox.changed = True
             self.update_toggle_state(notify_pair=False)
@@ -170,7 +177,7 @@ class ParamsTab(ScrolledPanel):
         values = {}
 
         if self.toggle:
-            checked = self.toggle_checkbox.IsChecked()
+            checked = self.enabled()
             if self.toggle_checkbox in self.changed_inputs and not self.toggle.inverse:
                 values[self.toggle.name] = checked
 
@@ -192,10 +199,16 @@ class ParamsTab(ScrolledPanel):
             for name, value in values.iteritems():
                 node.set_param(name, value)
 
+    def on_change(self, callable):
+        self.on_change_hook = callable
+
     def changed(self, event):
         self.changed_inputs.add(event.GetEventObject())
         event.Skip()
 
+        if self.on_change_hook:
+            self.on_change_hook(self)
+
     def load_preset(self, preset):
         preset_data = preset.get(self.name, {})
 
@@ -311,6 +324,11 @@ class SettingsFrame(wx.Frame):
         self.notebook = wx.Notebook(self, wx.ID_ANY)
         self.tabs = self.tabs_factory(self.notebook)
 
+        for tab in self.tabs:
+            tab.on_change(self.params_changed)
+
+        self.simulate_window = None
+
         self.presets_box = wx.StaticBox(self, wx.ID_ANY, label="Presets")
 
         self.preset_chooser = wx.ComboBox(self, wx.ID_ANY)
@@ -341,6 +359,56 @@ class SettingsFrame(wx.Frame):
         self.__do_layout()
         # end wxGlade
 
+    def params_changed(self, tab):
+        patches = self.generate_patches()
+
+        if not patches:
+            return
+
+        if self.simulate_window:
+            self.simulate_window.stop()
+            self.simulate_window.load(patches=patches)
+        else:
+            my_rect = self.GetRect()
+            simulator_pos = my_rect.GetTopRight()
+            simulator_pos.x += 5
+
+            try:
+                self.simulate_window = EmbroiderySimulator(None, -1, "Embroidery Simulator", simulator_pos, size=(300, 300), patches=patches, on_close=self.simulate_window_closed)
+            except:
+                with open('/tmp/params_debug.log', 'a') as log:
+                    print >> log, traceback.format_exc()
+                    log.flush()
+
+            self.simulate_window.Show()
+            wx.CallLater(10, self.Raise)
+
+        wx.CallAfter(self.simulate_window.go)
+
+    def simulate_window_closed(self):
+        self.simulate_window = None
+
+    def generate_patches(self):
+        patches = []
+
+        for tab in self.tabs:
+            tab.apply()
+
+            try:
+                if tab.enabled() and not tab.is_dependent_tab():
+                    for node in tab.nodes:
+                        # Making a copy of the embroidery element is an easy
+                        # way to drop the cache in the @cache decorators used
+                        # for many params in embroider.py.
+
+                        patches.extend(copy(node).to_patches(None))
+            except:
+                # Ignore errors.  This can be things like incorrect paths for
+                # satins or division by zero caused by incorrect param values.
+                pass
+
+        return patches
+
     def update_preset_list(self):
         preset_names = load_presets().keys()
         preset_names = [preset for preset in preset_names if preset != "__LAST__"]
@@ -430,10 +498,12 @@ class SettingsFrame(wx.Frame):
 
         event.Skip()
 
-    def apply(self, event):
+    def _apply(self):
         for tab in self.tabs:
             tab.apply()
 
+    def apply(self, event):
+        self._apply()
         save_preset("__LAST__", self.get_preset_data())
         self.Close()
 
@@ -442,6 +512,10 @@ class SettingsFrame(wx.Frame):
         self.apply(event)
 
     def close(self, event):
+        if self.simulate_window:
+            self.simulate_window.stop()
+            self.simulate_window.Close()
+
         self.Close()
 
     def __set_properties(self):
-- 
cgit v1.2.3


From 7152caa14d9c0ec912b5326fde58c0c410e45391 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 30 Dec 2017 20:54:35 -0500
Subject: render in a background thread

The problem with this approach is that sometimes the SystemExit happens down
inside shapely and it complains bitterly (on stderr).  May have to rethink.
---
 embroider_params.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 7d76c9d9..58feafcb 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -5,6 +5,8 @@ import os
 import sys
 import json
 import traceback
+import time
+from threading import Thread
 from copy import copy
 from cStringIO import StringIO
 import wx
@@ -16,6 +18,40 @@ from functools import partial
 from itertools import groupby
 from embroider_simulate import EmbroiderySimulator
 
+class KillableThread(Thread):
+  """A subclass of threading.Thread, with a kill() method."""
+  def __init__(self, *args, **keywords):
+    Thread.__init__(self, *args, **keywords)
+    self.killed = False
+
+  def start(self):
+    """Start the thread."""
+    self.__run_backup = self.run
+    self.run = self.__run      # Force the Thread to install our trace.
+    Thread.start(self)
+
+  def __run(self):
+    """Hacked run function, which installs the trace."""
+    sys.settrace(self.globaltrace)
+    self.__run_backup()
+    self.run = self.__run_backup
+
+  def globaltrace(self, frame, why, arg):
+    if why == 'call':
+      return self.localtrace
+    else:
+      return None
+
+  def localtrace(self, frame, why, arg):
+    if self.killed:
+      if why == 'line':
+        raise SystemExit()
+    return self.localtrace
+
+  def kill(self):
+    self.killed = True
+
+
 def presets_path():
     try:
         import appdirs
@@ -328,6 +364,8 @@ class SettingsFrame(wx.Frame):
             tab.on_change(self.params_changed)
 
         self.simulate_window = None
+        self.simulate_thread = None
+        self.thread_num = 0
 
         self.presets_box = wx.StaticBox(self, wx.ID_ANY, label="Presets")
 
@@ -360,11 +398,24 @@ class SettingsFrame(wx.Frame):
         # end wxGlade
 
     def params_changed(self, tab):
+        if self.simulate_window:
+            self.simulate_window.stop()
+            self.simulate_window.clear()
+
+        if self.simulate_thread and self.simulate_thread.is_alive():
+            self.simulate_thread.kill()
+
+        self.simulate_thread = KillableThread(target=self.update_patches, name="Simulate%d" % self.thread_num)
+        self.simulate_thread.start()
+        self.thread_num += 1
+
+    def update_patches(self):
         patches = self.generate_patches()
 
-        if not patches:
-            return
+        if patches:
+            wx.CallAfter(self.update_simulator, patches)
 
+    def update_simulator(self, patches):
         if self.simulate_window:
             self.simulate_window.stop()
             self.simulate_window.load(patches=patches)
@@ -402,6 +453,8 @@ class SettingsFrame(wx.Frame):
                         # for many params in embroider.py.
 
                         patches.extend(copy(node).to_patches(None))
+            except SystemExit:
+                raise
             except:
                 # Ignore errors.  This can be things like incorrect paths for
                 # satins or division by zero caused by incorrect param values.
-- 
cgit v1.2.3


From cb6df397738c3a926a55c6d2e96c32787c46f4c4 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 30 Dec 2017 21:15:34 -0500
Subject: get rid of thread killing

Switching to a cooperative model.  This has the downside that a long
patch computation will cause the simulate window to take longer to
update, but in practice the longest this will be is a couple of
seconds (for a very complicated autofill region).
---
 embroider_params.py | 58 ++++++++++++++++-------------------------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 58feafcb..fc472d36 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -6,7 +6,7 @@ import sys
 import json
 import traceback
 import time
-from threading import Thread
+from threading import Thread, Event
 from copy import copy
 from cStringIO import StringIO
 import wx
@@ -18,40 +18,6 @@ from functools import partial
 from itertools import groupby
 from embroider_simulate import EmbroiderySimulator
 
-class KillableThread(Thread):
-  """A subclass of threading.Thread, with a kill() method."""
-  def __init__(self, *args, **keywords):
-    Thread.__init__(self, *args, **keywords)
-    self.killed = False
-
-  def start(self):
-    """Start the thread."""
-    self.__run_backup = self.run
-    self.run = self.__run      # Force the Thread to install our trace.
-    Thread.start(self)
-
-  def __run(self):
-    """Hacked run function, which installs the trace."""
-    sys.settrace(self.globaltrace)
-    self.__run_backup()
-    self.run = self.__run_backup
-
-  def globaltrace(self, frame, why, arg):
-    if why == 'call':
-      return self.localtrace
-    else:
-      return None
-
-  def localtrace(self, frame, why, arg):
-    if self.killed:
-      if why == 'line':
-        raise SystemExit()
-    return self.localtrace
-
-  def kill(self):
-    self.killed = True
-
-
 def presets_path():
     try:
         import appdirs
@@ -365,7 +331,7 @@ class SettingsFrame(wx.Frame):
 
         self.simulate_window = None
         self.simulate_thread = None
-        self.thread_num = 0
+        self.simulate_refresh_needed = Event()
 
         self.presets_box = wx.StaticBox(self, wx.ID_ANY, label="Presets")
 
@@ -402,12 +368,18 @@ class SettingsFrame(wx.Frame):
             self.simulate_window.stop()
             self.simulate_window.clear()
 
-        if self.simulate_thread and self.simulate_thread.is_alive():
-            self.simulate_thread.kill()
+        if not self.simulate_thread or not self.simulate_thread.is_alive():
+            self.simulate_thread = Thread(target=self.simulate_worker)
+            self.simulate_thread.daemon = True
+            self.simulate_thread.start()
 
-        self.simulate_thread = KillableThread(target=self.update_patches, name="Simulate%d" % self.thread_num)
-        self.simulate_thread.start()
-        self.thread_num += 1
+        self.simulate_refresh_needed.set()
+
+    def simulate_worker(self):
+        while True:
+            self.simulate_refresh_needed.wait()
+            self.simulate_refresh_needed.clear()
+            self.update_patches()
 
     def update_patches(self):
         patches = self.generate_patches()
@@ -448,6 +420,10 @@ class SettingsFrame(wx.Frame):
             try:
                 if tab.enabled() and not tab.is_dependent_tab():
                     for node in tab.nodes:
+                        if self.simulate_refresh_needed.is_set():
+                            # cancel, we need to start over
+                            return []
+
                         # Making a copy of the embroidery element is an easy
                         # way to drop the cache in the @cache decorators used
                         # for many params in embroider.py.
-- 
cgit v1.2.3


From 85aafccf25621224426c9893610d581d7a6a24bb Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 30 Dec 2017 21:30:53 -0500
Subject: cancel should not output the SVG

also sped up simulation
---
 embroider_params.py | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index fc472d36..f8ebdfcb 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -320,6 +320,7 @@ class SettingsFrame(wx.Frame):
     def __init__(self, *args, **kwargs):
         # begin wxGlade: MyFrame.__init__
         self.tabs_factory = kwargs.pop('tabs_factory', [])
+        self.cancel_hook = kwargs.pop('on_cancel', None)
         wx.Frame.__init__(self, None, wx.ID_ANY,
                           "Embroidery Params"
                           )
@@ -351,7 +352,8 @@ class SettingsFrame(wx.Frame):
         self.delete_preset_button.Bind(wx.EVT_BUTTON, self.delete_preset)
 
         self.cancel_button = wx.Button(self, wx.ID_ANY, "Cancel")
-        self.cancel_button.Bind(wx.EVT_BUTTON, self.close)
+        self.cancel_button.Bind(wx.EVT_BUTTON, self.cancel)
+        self.Bind(wx.EVT_CLOSE, self.cancel)
 
         self.use_last_button = wx.Button(self, wx.ID_ANY, "Use Last Settings")
         self.use_last_button.Bind(wx.EVT_BUTTON, self.use_last)
@@ -397,7 +399,7 @@ class SettingsFrame(wx.Frame):
             simulator_pos.x += 5
 
             try:
-                self.simulate_window = EmbroiderySimulator(None, -1, "Embroidery Simulator", simulator_pos, size=(300, 300), patches=patches, on_close=self.simulate_window_closed)
+                self.simulate_window = EmbroiderySimulator(None, -1, "Embroidery Simulator", simulator_pos, size=(300, 300), patches=patches, on_close=self.simulate_window_closed, stitches_per_frame=10)
             except:
                 with open('/tmp/params_debug.log', 'a') as log:
                     print >> log, traceback.format_exc()
@@ -534,18 +536,24 @@ class SettingsFrame(wx.Frame):
     def apply(self, event):
         self._apply()
         save_preset("__LAST__", self.get_preset_data())
-        self.Close()
+        self.close()
 
     def use_last(self, event):
         self._load_preset("__LAST__")
         self.apply(event)
 
-    def close(self, event):
+    def close(self):
         if self.simulate_window:
             self.simulate_window.stop()
             self.simulate_window.Close()
 
-        self.Close()
+        self.Destroy()
+
+    def cancel(self, event):
+        if self.cancel_hook:
+            self.cancel_hook()
+
+        self.close()
 
     def __set_properties(self):
         # begin wxGlade: MyFrame.__set_properties
@@ -579,6 +587,10 @@ class SettingsFrame(wx.Frame):
         # end wxGlade
 
 class EmbroiderParams(inkex.Effect):
+    def __init__(self, *args, **kwargs):
+        self.cancelled = False
+        inkex.Effect.__init__(self, *args, **kwargs)
+
     def get_nodes(self):
         if self.selected:
             nodes = []
@@ -690,12 +702,20 @@ class EmbroiderParams(inkex.Effect):
         return tabs
 
 
+    def cancel(self):
+        self.cancelled = True
+
     def effect(self):
         app = wx.App()
-        frame = SettingsFrame(tabs_factory=self.create_tabs)
+        frame = SettingsFrame(tabs_factory=self.create_tabs, on_cancel=self.cancel)
         frame.Show()
         app.MainLoop()
 
+        if self.cancelled:
+            # This prevents the superclass from outputting the SVG, because we
+            # may have modified the DOM.
+            sys.exit(0)
+
 
 def save_stderr():
     # GTK likes to spam stderr, which inkscape will show in a dialog.
@@ -719,6 +739,8 @@ if __name__ == "__main__":
     try:
         e = EmbroiderParams()
         e.affect()
+    except SystemExit:
+        raise
     except:
         traceback.print_exc()
 
-- 
cgit v1.2.3


From 82fe2b7144a9b2a845a542304be11a407f18478d Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 31 Dec 2017 22:10:10 -0500
Subject: show simulate window at start

---
 embroider_params.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index f8ebdfcb..1be10881 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -328,12 +328,14 @@ class SettingsFrame(wx.Frame):
         self.tabs = self.tabs_factory(self.notebook)
 
         for tab in self.tabs:
-            tab.on_change(self.params_changed)
+            tab.on_change(self.update_simulator)
 
         self.simulate_window = None
         self.simulate_thread = None
         self.simulate_refresh_needed = Event()
 
+        wx.CallLater(1000, self.update_simulator)
+
         self.presets_box = wx.StaticBox(self, wx.ID_ANY, label="Presets")
 
         self.preset_chooser = wx.ComboBox(self, wx.ID_ANY)
@@ -365,7 +367,7 @@ class SettingsFrame(wx.Frame):
         self.__do_layout()
         # end wxGlade
 
-    def params_changed(self, tab):
+    def update_simulator(self, tab=None):
         if self.simulate_window:
             self.simulate_window.stop()
             self.simulate_window.clear()
@@ -387,9 +389,9 @@ class SettingsFrame(wx.Frame):
         patches = self.generate_patches()
 
         if patches:
-            wx.CallAfter(self.update_simulator, patches)
+            wx.CallAfter(self.refresh_simulator, patches)
 
-    def update_simulator(self, patches):
+    def refresh_simulator(self, patches):
         if self.simulate_window:
             self.simulate_window.stop()
             self.simulate_window.load(patches=patches)
-- 
cgit v1.2.3


From c2388a53a66be19199f84d332cfb9f613512db4a Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 31 Dec 2017 22:24:18 -0500
Subject: adjust default simulation speed to always take ~5 seconds

---
 embroider_params.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 1be10881..8300cbc2 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -401,7 +401,7 @@ class SettingsFrame(wx.Frame):
             simulator_pos.x += 5
 
             try:
-                self.simulate_window = EmbroiderySimulator(None, -1, "Embroidery Simulator", simulator_pos, size=(300, 300), patches=patches, on_close=self.simulate_window_closed, stitches_per_frame=10)
+                self.simulate_window = EmbroiderySimulator(None, -1, "Embroidery Simulator", simulator_pos, size=(300, 300), patches=patches, on_close=self.simulate_window_closed, target_duration=5)
             except:
                 with open('/tmp/params_debug.log', 'a') as log:
                     print >> log, traceback.format_exc()
-- 
cgit v1.2.3


From fd4d19bf8dd04a978a6cad4d89949f3c08a1cd78 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 31 Dec 2017 22:28:43 -0500
Subject: don't start outdated simulation

---
 embroider_params.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 8300cbc2..ffd9d53a 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -388,7 +388,7 @@ class SettingsFrame(wx.Frame):
     def update_patches(self):
         patches = self.generate_patches()
 
-        if patches:
+        if patches and not self.simulate_refresh_needed.is_set():
             wx.CallAfter(self.refresh_simulator, patches)
 
     def refresh_simulator(self, patches):
-- 
cgit v1.2.3


From 3cb4427fe6a5bdc83e08bc4e1c970598609a5f49 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 31 Dec 2017 22:53:29 -0500
Subject: make debugging slightly easier by popping up traceback

---
 embroider_params.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index ffd9d53a..289f0d8e 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -403,9 +403,16 @@ class SettingsFrame(wx.Frame):
             try:
                 self.simulate_window = EmbroiderySimulator(None, -1, "Embroidery Simulator", simulator_pos, size=(300, 300), patches=patches, on_close=self.simulate_window_closed, target_duration=5)
             except:
-                with open('/tmp/params_debug.log', 'a') as log:
-                    print >> log, traceback.format_exc()
-                    log.flush()
+                error = traceback.format_exc()
+
+                try:
+                    # a window may have been created, so we need to destroy it
+                    # or the app will never exit
+                    wx.Window.FindWindowByName("Embroidery Simulator").Destroy()
+                except:
+                    pass
+
+                info_dialog(self, error, "Internal Error")
 
             self.simulate_window.Show()
             wx.CallLater(10, self.Raise)
@@ -731,7 +738,7 @@ def save_stderr():
 def restore_stderr():
     os.dup2(sys.stderr_dup, 2)
     sys.stderr_backup.write(sys.stderr.getvalue())
-    sys.sys.stderr = stderr_backup
+    sys.stderr = stderr_backup
 
 
 # end of class MyFrame
-- 
cgit v1.2.3


From e9bddedf36e91f33b13a22997872812e849b2157 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 1 Jan 2018 14:56:27 -0500
Subject: render objects in the correct order

---
 embroider_params.py | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

(limited to 'embroider_params.py')

diff --git a/embroider_params.py b/embroider_params.py
index 289f0d8e..88d5772c 100644
--- a/embroider_params.py
+++ b/embroider_params.py
@@ -424,28 +424,34 @@ class SettingsFrame(wx.Frame):
 
     def generate_patches(self):
         patches = []
+        nodes = []
 
         for tab in self.tabs:
             tab.apply()
 
-            try:
-                if tab.enabled() and not tab.is_dependent_tab():
-                    for node in tab.nodes:
-                        if self.simulate_refresh_needed.is_set():
-                            # cancel, we need to start over
-                            return []
-
-                        # Making a copy of the embroidery element is an easy
-                        # way to drop the cache in the @cache decorators used
-                        # for many params in embroider.py.
-
-                        patches.extend(copy(node).to_patches(None))
-            except SystemExit:
-                raise
-            except:
-                # Ignore errors.  This can be things like incorrect paths for
-                # satins or division by zero caused by incorrect param values.
-                pass
+            if tab.enabled() and not tab.is_dependent_tab():
+                nodes.extend(tab.nodes)
+
+        # sort nodes into the proper stacking order
+        nodes.sort(key=lambda node: node.order)
+
+        try:
+            for node in nodes:
+                if self.simulate_refresh_needed.is_set():
+                    # cancel; params were updated and we need to start over
+                    return []
+
+                # Making a copy of the embroidery element is an easy
+                # way to drop the cache in the @cache decorators used
+                # for many params in embroider.py.
+
+                patches.extend(copy(node).to_patches(None))
+        except SystemExit:
+            raise
+        except:
+            # Ignore errors.  This can be things like incorrect paths for
+            # satins or division by zero caused by incorrect param values.
+            pass
 
         return patches
 
@@ -631,9 +637,11 @@ class EmbroiderParams(inkex.Effect):
         nodes = self.get_nodes()
         nodes_by_class = defaultdict(list)
 
-        for node in self.get_nodes():
+        for z, node in enumerate(self.get_nodes()):
             for cls in self.embroidery_classes(node):
-                nodes_by_class[cls].append(node)
+                element = cls(node)
+                element.order = z
+                nodes_by_class[cls].append(element)
 
         return sorted(nodes_by_class.items(), key=lambda (cls, nodes): cls.__name__)
 
@@ -659,7 +667,6 @@ class EmbroiderParams(inkex.Effect):
     def create_tabs(self, parent):
         tabs = []
         for cls, nodes in self.get_nodes_by_class():
-            nodes = [cls(node) for node in nodes]
             params = cls.get_params()
 
             for param in params:
-- 
cgit v1.2.3