kopia lustrzana https://github.com/inkstitch/inkstitch
Simulator: make colors visible on background (#3010)
* simulator: color visible on background * add design dimension info to simulator statusbar * update preview when apply font size filter * add info box * preferences: check if stitch_plan is loadedpull/3020/head dev-build-kaalleen-png-export
Kaalleen
GitHub
rodzic
75a9ea2e1d
commit
850958b5bc
Plik binarny nie jest wyświetlany.
|
Po Szerokość: | Wysokość: | Rozmiar: 2.0 KiB |
|
|
@ -0,0 +1,204 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="256"
|
||||
height="256"
|
||||
viewBox="0 0 256 256"
|
||||
id="svg8375"
|
||||
version="1.1"
|
||||
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
|
||||
sodipodi:docname="info.svg"
|
||||
inkscape:export-filename="info_dark.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<defs
|
||||
id="defs8377">
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect6"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1"
|
||||
radius="5"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect11"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1"
|
||||
radius="5"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect8"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,4.0553823,0,1 @ F,0,0,1,0,3.332855,0,1 @ F,0,0,1,0,9.7388927,0,1"
|
||||
radius="0"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect5"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,5,0,1 @ F,0,0,1,0,2.8335924,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1"
|
||||
radius="5"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect1"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1"
|
||||
radius="5"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect4"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,5,0,1 @ F,0,0,1,0,2.8125752,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,2.8437239,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1"
|
||||
radius="5"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect4-0"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1 @ F,0,0,1,0,5,0,1"
|
||||
radius="5"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect8-9"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,4.0553823,0,1 @ F,0,0,1,0,3.332855,0,1 @ F,0,0,1,0,9.7388927,0,1"
|
||||
radius="0"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.8718847"
|
||||
inkscape:cx="150.91741"
|
||||
inkscape:cy="174.42314"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="mm"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1011"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="32"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1" />
|
||||
<metadata
|
||||
id="metadata8380">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<path
|
||||
style="font-weight:900;font-size:240px;line-height:0.8;font-family:Barlow;-inkscape-font-specification:'Barlow Heavy';letter-spacing:0px;word-spacing:0px;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;fill:#000000;fill-opacity:1"
|
||||
d="M 128.12,83.960004 Q 118.28,83.960004 111.8,77.720004 105.56,71.240004 105.56,61.400004 105.56,51.320004 111.8,45.080004 118.28,38.840004 128.12,38.840004 137.96,38.840004 144.2,45.080004 150.68,51.320004 150.68,61.400004 150.68,71.000004 144.2,77.480004 137.96,83.960004 128.12,83.960004 Z M 108.92,217.16 Q 107.24,217.16 106.28,216.2 105.32,215.24 105.32,213.56 V 95.960004 Q 105.32,94.280004 106.28,93.320004 107.24,92.360004 108.92,92.360004 H 146.84 Q 148.52,92.360004 149.48,93.320004 150.44,94.280004 150.44,95.960004 V 213.56 Q 150.44,215.24 149.48,216.2 148.52,217.16 146.84,217.16 Z"
|
||||
id="text1"
|
||||
aria-label="i" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Po Szerokość: | Wysokość: | Rozmiar: 7.0 KiB |
Plik binarny nie jest wyświetlany.
|
Po Szerokość: | Wysokość: | Rozmiar: 1.9 KiB |
|
|
@ -266,6 +266,7 @@ class LetteringPanel(wx.Panel):
|
|||
elif filter_size != 0:
|
||||
self.options_panel.scale_spinner.SetValue(int(filter_size / font.size * 100))
|
||||
self.settings['scale'] = self.options_panel.scale_spinner.GetValue()
|
||||
self.update_preview()
|
||||
|
||||
def resize(self, event=None):
|
||||
description = self.options_panel.font_description.GetLabel().replace("\n", " ")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# Copyright (c) 2024 Authors
|
||||
# Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details.
|
||||
|
||||
from .design_info import DesignInfoDialog
|
||||
from .simulator_preferences import SimulatorPreferenceDialog
|
||||
from .simulator_slider import SimulatorSlider
|
||||
from .control_panel import ControlPanel
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
# Authors: see git history
|
||||
#
|
||||
# Copyright (c) 2024 Authors
|
||||
# Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details.
|
||||
|
||||
import wx
|
||||
|
||||
from ...i18n import _
|
||||
|
||||
|
||||
class DesignInfoDialog(wx.Dialog):
|
||||
"""A dialog to show design info
|
||||
"""
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(DesignInfoDialog, self).__init__(*args, **kwargs)
|
||||
self.SetWindowStyle(wx.FRAME_FLOAT_ON_PARENT | wx.DEFAULT_FRAME_STYLE)
|
||||
|
||||
self.view_panel = self.GetParent()
|
||||
self.drawing_panel = self.view_panel.drawing_panel
|
||||
|
||||
sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
info_sizer = wx.FlexGridSizer(6, 2, 5, 5)
|
||||
|
||||
dimensions_label = wx.StaticText(self, label=_("Design dimensions (mm)"))
|
||||
self.dimensions = wx.StaticText(self)
|
||||
|
||||
num_stitches_label = wx.StaticText(self, label=_('# Stitches'))
|
||||
self.num_stitches = wx.StaticText(self)
|
||||
|
||||
num_color_changes_label = wx.StaticText(self, label=_("# Color Changes"))
|
||||
self.num_color_changes = wx.StaticText(self)
|
||||
|
||||
num_jumps_label = wx.StaticText(self, label=_("# Jumps"))
|
||||
self.num_jumps = wx.StaticText(self)
|
||||
|
||||
num_trims_label = wx.StaticText(self, label=_("# Trims"))
|
||||
self.num_trims = wx.StaticText(self)
|
||||
|
||||
num_stops_label = wx.StaticText(self, label=_("# Stops"))
|
||||
self.num_stops = wx.StaticText(self)
|
||||
|
||||
info_sizer.Add(dimensions_label, 0, wx.ALL, 10)
|
||||
info_sizer.Add(self.dimensions, 0, wx.EXPAND | wx.ALL, 10)
|
||||
info_sizer.Add(num_stitches_label, 0, wx.ALL, 10)
|
||||
info_sizer.Add(self.num_stitches, 0, wx.EXPAND | wx.ALL, 10)
|
||||
info_sizer.Add(num_color_changes_label, 0, wx.ALL, 10)
|
||||
info_sizer.Add(self.num_color_changes, 0, wx.EXPAND | wx.ALL, 10)
|
||||
info_sizer.Add(num_jumps_label, 0, wx.ALL, 10)
|
||||
info_sizer.Add(self.num_jumps, 0, wx.EXPAND | wx.ALL, 10)
|
||||
info_sizer.Add(num_trims_label, 0, wx.ALL, 10)
|
||||
info_sizer.Add(self.num_trims, 0, wx.EXPAND | wx.ALL, 10)
|
||||
info_sizer.Add(num_stops_label, 0, wx.ALL, 10)
|
||||
info_sizer.Add(self.num_stops, 0, wx.EXPAND | wx.ALL, 10)
|
||||
|
||||
sizer.Add(info_sizer, 1, wx.ALL, 10)
|
||||
self.SetSizerAndFit(sizer)
|
||||
self.update()
|
||||
|
||||
def update(self):
|
||||
if not self.drawing_panel.loaded:
|
||||
return
|
||||
self.dimensions.SetLabel("{:.2f} x {:.2f}".format(self.drawing_panel.dimensions_mm[0], self.drawing_panel.dimensions_mm[1]))
|
||||
self.num_stitches.SetLabel(f"{self.drawing_panel.num_stitches}")
|
||||
self.num_color_changes.SetLabel(f"{self.drawing_panel.num_color_changes}")
|
||||
self.num_jumps.SetLabel(f"{self.drawing_panel.num_jumps}")
|
||||
self.num_trims.SetLabel(f"{self.drawing_panel.num_trims}")
|
||||
self.num_stops.SetLabel(f"{self.drawing_panel.num_stops}")
|
||||
self.Fit()
|
||||
|
|
@ -230,12 +230,27 @@ class DrawingPanel(wx.Panel):
|
|||
self.minx, self.miny, self.maxx, self.maxy = stitch_plan.bounding_box
|
||||
self.width = self.maxx - self.minx
|
||||
self.height = self.maxy - self.miny
|
||||
self.dimensions_mm = stitch_plan.dimensions_mm
|
||||
self.num_stitches = stitch_plan.num_stitches
|
||||
self.num_trims = stitch_plan.num_trims
|
||||
self.num_color_changes = stitch_plan.num_color_blocks - 1
|
||||
self.num_stops = stitch_plan.num_stops
|
||||
self.num_jumps = stitch_plan.num_jumps - 1
|
||||
self.parse_stitch_plan(stitch_plan)
|
||||
self.choose_zoom_and_pan()
|
||||
self.set_current_stitch(0)
|
||||
statusbar = self.GetTopLevelParent().statusbar
|
||||
statusbar.SetStatusText(
|
||||
_("Dimensions: {:.2f} x {:.2f}").format(
|
||||
stitch_plan.dimensions_mm[0],
|
||||
stitch_plan.dimensions_mm[1]
|
||||
),
|
||||
1
|
||||
)
|
||||
self.loaded = True
|
||||
self.go()
|
||||
if hasattr(self.view_panel, 'info_panel'):
|
||||
self.view_panel.info_panel.update()
|
||||
|
||||
def choose_zoom_and_pan(self, event=None):
|
||||
# ignore if EVT_SIZE fired before we load the stitch plan
|
||||
|
|
@ -268,7 +283,8 @@ class DrawingPanel(wx.Panel):
|
|||
|
||||
def color_to_pen(self, color):
|
||||
line_width = global_settings['simulator_line_width'] * PIXELS_PER_MM * self.PIXEL_DENSITY
|
||||
return wx.Pen(list(map(int, color.visible_on_white.rgb)), int(line_width))
|
||||
background_color = self.GetBackgroundColour().GetAsString()
|
||||
return wx.Pen(list(map(int, color.visible_on_background(background_color).rgb)), int(line_width))
|
||||
|
||||
def update_pen_size(self):
|
||||
line_width = global_settings['simulator_line_width'] * PIXELS_PER_MM * self.PIXEL_DENSITY
|
||||
|
|
@ -339,7 +355,7 @@ class DrawingPanel(wx.Panel):
|
|||
command = self.commands[self.current_stitch]
|
||||
self.control_panel.on_current_stitch(self.current_stitch, command)
|
||||
statusbar = self.GetTopLevelParent().statusbar
|
||||
statusbar.SetStatusText(_("Command: %s") % COMMAND_NAMES[command], 1)
|
||||
statusbar.SetStatusText(_("Command: %s") % COMMAND_NAMES[command], 2)
|
||||
self.stop_if_at_end()
|
||||
self.Refresh()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Authors: see git history
|
||||
#
|
||||
# Copyright (c) 2010 Authors
|
||||
# Copyright (c) 2024 Authors
|
||||
# Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details.
|
||||
|
||||
import wx
|
||||
|
|
@ -54,7 +54,7 @@ class SimulatorPreferenceDialog(wx.Dialog):
|
|||
|
||||
def on_change(self, attribute, event):
|
||||
global_settings[attribute] = event.EventObject.GetValue()
|
||||
if attribute == 'simulator_line_width':
|
||||
if self.drawing_panel.loaded and attribute == 'simulator_line_width':
|
||||
self.drawing_panel.update_pen_size()
|
||||
self.drawing_panel.Refresh()
|
||||
|
||||
|
|
@ -66,6 +66,7 @@ class SimulatorPreferenceDialog(wx.Dialog):
|
|||
def on_cancel(self, event):
|
||||
global_settings['simulator_line_width'] = self.line_width_value
|
||||
global_settings['simulator_npp_size'] = self.npp_size_value
|
||||
self.drawing_panel.update_pen_size()
|
||||
self.drawing_panel.Refresh()
|
||||
if self.drawing_panel.loaded:
|
||||
self.drawing_panel.update_pen_size()
|
||||
self.drawing_panel.Refresh()
|
||||
self.Destroy()
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ class SimulatorWindow(wx.Frame):
|
|||
|
||||
self.sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
|
||||
self.statusbar = self.CreateStatusBar(2)
|
||||
self.statusbar.SetStatusWidths((0, -1))
|
||||
self.statusbar = self.CreateStatusBar(3)
|
||||
self.statusbar.SetStatusWidths((0, -1, -1))
|
||||
|
||||
if panel and parent:
|
||||
self.is_child = True
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ class SplitSimulatorWindow(wx.Frame):
|
|||
|
||||
self.SetWindowStyle(wx.FRAME_FLOAT_ON_PARENT | wx.DEFAULT_FRAME_STYLE)
|
||||
|
||||
self.statusbar = self.CreateStatusBar(2)
|
||||
self.statusbar = self.CreateStatusBar(3)
|
||||
|
||||
self.detached_simulator_frame = None
|
||||
self.splitter = wx.SplitterWindow(self, style=wx.SP_LIVE_UPDATE)
|
||||
|
|
@ -56,13 +56,13 @@ class SplitSimulatorWindow(wx.Frame):
|
|||
self.detach_simulator()
|
||||
|
||||
def splitter_resize(self, event):
|
||||
self.statusbar.SetStatusWidths((self.simulator_panel.GetScreenPosition()[0], -1))
|
||||
self.statusbar.SetStatusWidths((self.simulator_panel.GetScreenPosition()[0], -1, -1))
|
||||
|
||||
def set_sash_position(self):
|
||||
settings_panel_min_size = self.settings_panel.GetSizer().CalcMin()
|
||||
debug.log(f"{settings_panel_min_size=}")
|
||||
self.splitter.SetSashPosition(settings_panel_min_size.width)
|
||||
self.statusbar.SetStatusWidths((settings_panel_min_size.width, -1))
|
||||
self.statusbar.SetStatusWidths((settings_panel_min_size.width, -1, -1))
|
||||
|
||||
def cancel(self, event=None):
|
||||
if self.cancel_hook:
|
||||
|
|
@ -86,7 +86,7 @@ class SplitSimulatorWindow(wx.Frame):
|
|||
self.simulator_panel.Reparent(self.splitter)
|
||||
self.splitter.SplitVertically(self.settings_panel, self.simulator_panel)
|
||||
|
||||
self.GetStatusBar().SetStatusText(self.detached_simulator_frame.GetStatusBar().GetStatusText(1), 1)
|
||||
self.GetStatusBar().SetStatusText(self.detached_simulator_frame.GetStatusBar().GetStatusText(1), 2)
|
||||
|
||||
self.detached_simulator_frame.Destroy()
|
||||
self.detached_simulator_frame = None
|
||||
|
|
@ -114,7 +114,7 @@ class SplitSimulatorWindow(wx.Frame):
|
|||
self.detached_simulator_frame.SetSize((screen_rect.width - settings_panel_size.width, screen_rect.height))
|
||||
self.detached_simulator_frame.SetPosition((settings_panel_size.width, screen_rect.top))
|
||||
|
||||
self.detached_simulator_frame.GetStatusBar().SetStatusText(self.GetStatusBar().GetStatusText(1), 1)
|
||||
self.detached_simulator_frame.GetStatusBar().SetStatusText(self.GetStatusBar().GetStatusText(1), 2)
|
||||
self.GetStatusBar().SetStatusText("", 1)
|
||||
|
||||
self.detached_simulator_frame.Show()
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from wx.lib.scrolledpanel import ScrolledPanel
|
|||
from ...debug.debug import debug
|
||||
from ...i18n import _
|
||||
from . import SimulatorPreferenceDialog
|
||||
from . import DesignInfoDialog
|
||||
|
||||
|
||||
class ViewPanel(ScrolledPanel):
|
||||
|
|
@ -46,6 +47,11 @@ class ViewPanel(ScrolledPanel):
|
|||
self.btnColorChange.SetBitmap(self.control_panel.load_icon('color_change'))
|
||||
self.btnColorChange.Bind(wx.EVT_TOGGLEBUTTON, lambda event: self.on_marker_button('color_change', event))
|
||||
|
||||
self.btnInfo = wx.BitmapButton(self, -1, style=self.button_style)
|
||||
self.btnInfo.SetToolTip(_('Open info dialog'))
|
||||
self.btnInfo.SetBitmap(self.control_panel.load_icon('info'))
|
||||
self.btnInfo.Bind(wx.EVT_BUTTON, self.on_info_button)
|
||||
|
||||
self.btnBackgroundColor = wx.ColourPickerCtrl(self, -1, colour='white', size=((40, -1)))
|
||||
self.btnBackgroundColor.SetToolTip(_("Change background color"))
|
||||
self.btnBackgroundColor.Bind(wx.EVT_COLOURPICKER_CHANGED, self.on_update_background_color)
|
||||
|
|
@ -73,7 +79,16 @@ class ViewPanel(ScrolledPanel):
|
|||
show_sizer.Add(0, 2, 0)
|
||||
show_sizer.Add(show_inner_sizer, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 2)
|
||||
show_sizer.Add(0, 2, 0)
|
||||
outer_sizer.Add(show_sizer)
|
||||
outer_sizer.Add(show_sizer, 0, wx.EXPAND)
|
||||
outer_sizer.Add(0, 10, 0)
|
||||
|
||||
info_sizer = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Info")), wx.VERTICAL)
|
||||
info_inner_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
info_inner_sizer.Add(self.btnInfo, 0, wx.EXPAND | wx.ALL, 2)
|
||||
info_sizer.Add(0, 2, 0)
|
||||
info_sizer.Add(info_inner_sizer, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 2)
|
||||
info_sizer.Add(0, 2, 0)
|
||||
outer_sizer.Add(info_sizer, 0, wx.EXPAND)
|
||||
outer_sizer.Add(0, 10, 0)
|
||||
|
||||
settings_sizer = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Settings")), wx.VERTICAL)
|
||||
|
|
@ -85,7 +100,7 @@ class ViewPanel(ScrolledPanel):
|
|||
settings_sizer.Add(0, 2, 0)
|
||||
settings_sizer.Add(settings_inner_sizer, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 2)
|
||||
settings_sizer.Add(0, 2, 0)
|
||||
outer_sizer.Add(settings_sizer)
|
||||
outer_sizer.Add(settings_sizer, 0, wx.EXPAND)
|
||||
|
||||
self.SetSizerAndFit(outer_sizer)
|
||||
|
||||
|
|
@ -113,5 +128,9 @@ class ViewPanel(ScrolledPanel):
|
|||
self.drawing_panel.Refresh()
|
||||
|
||||
def on_settings_button(self, event):
|
||||
simulator_panel = SimulatorPreferenceDialog(self, title=_('Simulator Preferences'))
|
||||
simulator_panel.Show()
|
||||
settings_panel = SimulatorPreferenceDialog(self, title=_('Simulator Preferences'))
|
||||
settings_panel.Show()
|
||||
|
||||
def on_info_button(self, event):
|
||||
self.info_panel = DesignInfoDialog(self, title=_('Design Info'))
|
||||
self.info_panel.Show()
|
||||
|
|
|
|||
|
|
@ -138,6 +138,34 @@ class ThreadColor(object):
|
|||
|
||||
return ThreadColor(color, name=self.name, number=self.number, manufacturer=self.manufacturer, description=self.description, chart=self.chart)
|
||||
|
||||
def visible_on_background(self, background_color):
|
||||
"""A ThreadColor similar to this one but visible on given background color.
|
||||
|
||||
Choose a color that's as close as possible to the actual thread color but is still at least
|
||||
somewhat visible on given background.
|
||||
"""
|
||||
hls = list(colorsys.rgb_to_hls(*self.rgb_normalized))
|
||||
background = ThreadColor(background_color)
|
||||
background_hls = list(colorsys.rgb_to_hls(*background.rgb_normalized))
|
||||
|
||||
difference = hls[1] - background_hls[1]
|
||||
|
||||
if abs(difference) < 0.1:
|
||||
if hls[1] > 0.5:
|
||||
hls[1] -= 0.1
|
||||
else:
|
||||
hls[1] += 0.1
|
||||
|
||||
color = colorsys.hls_to_rgb(*hls)
|
||||
|
||||
# convert back to values in the range of 0-255
|
||||
color = tuple(value * 255 for value in color)
|
||||
|
||||
return ThreadColor(color, name=self.name, number=self.number, manufacturer=self.manufacturer,
|
||||
description=self.description, chart=self.chart)
|
||||
|
||||
return self
|
||||
|
||||
@property
|
||||
def darker(self):
|
||||
hls = list(colorsys.rgb_to_hls(*self.rgb_normalized))
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue