diff options
Diffstat (limited to 'lib/gui')
| -rw-r--r-- | lib/gui/simulator/drawing_panel.py | 2 | ||||
| -rw-r--r-- | lib/gui/simulator/view_panel.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/gui/simulator/drawing_panel.py b/lib/gui/simulator/drawing_panel.py index 6954f17d..1ffdfaa4 100644 --- a/lib/gui/simulator/drawing_panel.py +++ b/lib/gui/simulator/drawing_panel.py @@ -200,7 +200,7 @@ class DrawingPanel(wx.Panel): last_stitch = stitches[-1] break - if last_stitch: + if last_stitch and self.view_panel.btnCursor.GetValue(): self.draw_crosshair(last_stitch[0], last_stitch[1], canvas, transform) canvas.EndLayer() diff --git a/lib/gui/simulator/view_panel.py b/lib/gui/simulator/view_panel.py index c18c75b2..b73d6a4c 100644 --- a/lib/gui/simulator/view_panel.py +++ b/lib/gui/simulator/view_panel.py @@ -33,6 +33,7 @@ class ViewPanel(ScrolledPanel): self.stop_button_status = global_settings['stop_button_status'] self.color_change_button_status = global_settings['color_change_button_status'] self.toggle_page_button_status = global_settings['toggle_page_button_status'] + self.display_crosshair_status = global_settings['display_crosshair'] self.btnNpp = wx.BitmapToggleButton(self, -1, style=self.button_style) self.btnNpp.SetBitmap(self.control_panel.load_icon('npp')) @@ -77,6 +78,12 @@ class ViewPanel(ScrolledPanel): self.btnBackgroundColor.SetToolTip(_("Change background color")) self.btnBackgroundColor.Bind(wx.EVT_COLOURPICKER_CHANGED, self.on_update_background_color) + self.btnCursor = wx.BitmapToggleButton(self, -1, style=self.button_style) + self.btnCursor.SetToolTip(_('Show crosshair')) + self.btnCursor.SetBitmap(self.control_panel.load_icon('cursor')) + self.btnCursor.SetValue(self.display_crosshair_status) + self.btnCursor.Bind(wx.EVT_TOGGLEBUTTON, self.on_cursor_button) + if not self.detach_callback: self.btnPage = wx.BitmapToggleButton(self, -1, style=self.button_style) self.btnPage.Bind(wx.EVT_TOGGLEBUTTON, self.toggle_page) @@ -122,6 +129,7 @@ class ViewPanel(ScrolledPanel): settings_sizer = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Settings")), wx.VERTICAL) settings_inner_sizer = wx.BoxSizer(wx.VERTICAL) settings_inner_sizer.Add(self.btnBackgroundColor, 0, wx.EXPAND | wx.ALL, 2) + settings_inner_sizer.Add(self.btnCursor, 0, wx.EXPAND | wx.ALL, 2) if not self.detach_callback: settings_inner_sizer.Add(self.btnPage, 0, wx.EXPAND | wx.ALL, 2) settings_inner_sizer.Add(self.btnSettings, 0, wx.EXPAND | wx.ALL, 2) @@ -152,6 +160,10 @@ class ViewPanel(ScrolledPanel): self.drawing_panel.Refresh() global_settings['npp_button_status'] = self.btnNpp.GetValue() + def on_cursor_button(self, event): + self.drawing_panel.Refresh() + global_settings['display_crosshair'] = self.btnCursor.GetValue() + def toggle_page(self, event): debug.log("toggle page") value = self.btnPage.GetValue() |