summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/simulator.py11
-rw-r--r--messages.po40
2 files changed, 25 insertions, 26 deletions
diff --git a/lib/simulator.py b/lib/simulator.py
index 2565e42f..37747b10 100644
--- a/lib/simulator.py
+++ b/lib/simulator.py
@@ -229,7 +229,7 @@ class DrawingPanel(wx.Panel):
self.last_frame_duration = 0
self.direction = 1
self.current_stitch = 0
- self.black_pen = self.create_pen((0, 0, 0))
+ self.black_pen = wx.Pen((128, 128, 128))
self.width = 0
self.height = 0
self.loaded = False
@@ -312,7 +312,9 @@ class DrawingPanel(wx.Panel):
if last_stitch:
x = last_stitch[0]
y = last_stitch[1]
- crosshair_radius = 10 / self.zoom * self.PIXEL_DENSITY
+ x, y = transform.TransformPoint(float(x), float(y))
+ canvas.SetTransform(canvas.CreateMatrix())
+ crosshair_radius = 10
canvas.SetPen(self.black_pen)
canvas.DrawLines(((x - crosshair_radius, y), (x + crosshair_radius, y)))
canvas.DrawLines(((x, y - crosshair_radius), (x, y + crosshair_radius)))
@@ -364,11 +366,8 @@ class DrawingPanel(wx.Panel):
self.animate()
self.control_panel.on_start()
- def create_pen(self, rgb):
- return wx.Pen(rgb, width=int(0.4 * self.PIXEL_DENSITY))
-
def color_to_pen(self, color):
- return self.create_pen(color.visible_on_white.rgb)
+ return wx.Pen(color.visible_on_white.rgb, width=int(0.4 * self.PIXEL_DENSITY))
def parse_stitch_plan(self, stitch_plan):
self.pens = []
diff --git a/messages.po b/messages.po
index 0cdb527c..86f93f36 100644
--- a/messages.po
+++ b/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-26 16:14-0400\n"
+"POT-Creation-Date: 2018-08-26 16:41-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -674,79 +674,79 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/simulator.py:541
+#: lib/simulator.py:540
msgid "<<"
msgstr ""
-#: lib/simulator.py:541
+#: lib/simulator.py:540
msgid "Play reverse (arrow left)"
msgstr ""
-#: lib/simulator.py:542
+#: lib/simulator.py:541
msgid "-"
msgstr ""
-#: lib/simulator.py:542
+#: lib/simulator.py:541
msgid "Play one frame backward (+)"
msgstr ""
-#: lib/simulator.py:543
+#: lib/simulator.py:542
msgid "+"
msgstr ""
-#: lib/simulator.py:543
+#: lib/simulator.py:542
msgid "Play one frame forward (+)"
msgstr ""
-#: lib/simulator.py:544
+#: lib/simulator.py:543
msgid ">>"
msgstr ""
-#: lib/simulator.py:544
+#: lib/simulator.py:543
msgid "Play forward (arrow right)"
msgstr ""
-#: lib/simulator.py:545
+#: lib/simulator.py:544
msgid "^"
msgstr ""
-#: lib/simulator.py:545
+#: lib/simulator.py:544
msgid "Speed up (arrow up)"
msgstr ""
-#: lib/simulator.py:546
+#: lib/simulator.py:545
msgid "v"
msgstr ""
-#: lib/simulator.py:546
+#: lib/simulator.py:545
msgid "Slow down (arrow down)"
msgstr ""
-#: lib/simulator.py:547
+#: lib/simulator.py:546
msgid "Pause"
msgstr ""
-#: lib/simulator.py:547
+#: lib/simulator.py:546
msgid "Pause (P)"
msgstr ""
-#: lib/simulator.py:548
+#: lib/simulator.py:547
msgid "Restart"
msgstr ""
-#: lib/simulator.py:548
+#: lib/simulator.py:547
msgid "Restart (R)"
msgstr ""
-#: lib/simulator.py:549
+#: lib/simulator.py:548
msgid "Quit"
msgstr ""
-#: lib/simulator.py:549
+#: lib/simulator.py:548
msgid "Close (Q)"
msgstr ""
-#: lib/simulator.py:727
+#: lib/simulator.py:726
msgid "Stitch # "
msgstr ""