summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/extensions/params.py41
-rw-r--r--lib/stitch_plan/lock_stitch.py5
-rw-r--r--lib/tiles.py9
-rw-r--r--lib/utils/param.py5
4 files changed, 34 insertions, 26 deletions
diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 4b6780ee..6c0f12c5 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -78,8 +78,7 @@ class ParamsTab(ScrolledPanel):
self.param_change_indicators = {}
self.settings_grid = wx.FlexGridSizer(rows=0, cols=4, hgap=10, vgap=15)
- self.settings_grid.AddGrowableCol(1, 2)
- self.settings_grid.SetFlexibleDirection(wx.HORIZONTAL)
+ self.settings_grid.AddGrowableCol(2, 1)
self.pencil_icon = wx.Image(os.path.join(get_resource_dir(
"icons"), "pencil_20x20.png")).ConvertToBitmap()
@@ -348,24 +347,21 @@ class ParamsTab(ScrolledPanel):
# just to add space around the settings
box = wx.BoxSizer(wx.VERTICAL)
- summary_box = wx.StaticBox(
- self, wx.ID_ANY, label=_("Inkscape objects"))
+ summary_box = wx.StaticBox(self, wx.ID_ANY, label=_("Inkscape objects"))
sizer = wx.StaticBoxSizer(summary_box, wx.HORIZONTAL)
self.description = wx.StaticText(self)
self.update_description()
self.description.SetLabel(self.description_text)
self.description_container = box
self.Bind(wx.EVT_SIZE, self.resized)
- sizer.Add(self.description, proportion=0,
- flag=wx.EXPAND | wx.ALL, border=5)
+ sizer.Add(self.description, proportion=0, flag=wx.EXPAND | wx.ALL, border=5)
box.Add(sizer, proportion=0, flag=wx.ALL, border=5)
if self.toggle:
toggle_sizer = wx.BoxSizer(wx.HORIZONTAL)
toggle_sizer.Add(self.create_change_indicator(
self.toggle.name), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, border=5)
- toggle_sizer.Add(self.toggle_checkbox, proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL)
+ toggle_sizer.Add(self.toggle_checkbox, proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
box.Add(toggle_sizer, proportion=0, flag=wx.BOTTOM, border=10)
for param in self.params:
@@ -378,11 +374,9 @@ class ParamsTab(ScrolledPanel):
description.Hide()
for item in param.select_items:
self.choice_widgets[item].extend([col1, description])
- # else:
- self.settings_grid.Add(
- col1, proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.settings_grid.Add(description, proportion=1, flag=wx.EXPAND |
- wx.RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.TOP, border=5)
+
+ self.settings_grid.Add(col1, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.settings_grid.Add(description, flag=wx.RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.TOP, border=5)
if param.type == 'boolean':
if len(param.values) > 1:
@@ -402,11 +396,18 @@ class ParamsTab(ScrolledPanel):
self.dict_of_choices[param.name] = {
"param": param, "widget": input, "last_initialized_choice": 1}
elif param.type == 'combo':
- input = wx.ComboBox(self, wx.ID_ANY, choices=[], style=wx.CB_READONLY)
+ input = wx.adv.BitmapComboBox(self, wx.ID_ANY, choices=[], style=wx.CB_READONLY)
for option in param.options:
- input.Append(option.name, option)
+ if option.preview_image:
+ image = wx.Image(option.preview_image)
+ image.Rescale(60, 60, quality=wx.IMAGE_QUALITY_HIGH)
+ image = wx.Bitmap(image)
+ else:
+ image = wx.NullBitmap
+ input.Append(option.name, image, option)
if not param.options:
input.Append(_('No options available'), ParamOption('not_available'))
+
value = self.get_combo_value_index(param.values[0], param.options)
input.SetSelection(value)
input.Bind(wx.EVT_COMBOBOX, self.changed)
@@ -437,15 +438,13 @@ class ParamsTab(ScrolledPanel):
col4.Hide()
for item in param.select_items:
self.choice_widgets[item].extend([input, col4])
- # else:
- self.settings_grid.Add(
- input, proportion=1, flag=wx.ALIGN_CENTER_VERTICAL | wx.EXPAND | wx.LEFT, border=40)
- self.settings_grid.Add(
- col4, proportion=1, flag=wx.ALIGN_CENTER_VERTICAL)
+
+ self.settings_grid.Add(input, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.EXPAND, border=40)
+ self.settings_grid.Add(col4, flag=wx.ALIGN_CENTER_VERTICAL)
self.inputs_to_params = {v: k for k, v in self.param_inputs.items()}
- box.Add(self.settings_grid, proportion=1, flag=wx.ALL, border=10)
+ box.Add(self.settings_grid, proportion=1, flag=wx.ALL | wx.EXPAND, border=10)
self.SetSizer(box)
self.update_choice_widgets()
diff --git a/lib/stitch_plan/lock_stitch.py b/lib/stitch_plan/lock_stitch.py
index fec75653..4e1d347b 100644
--- a/lib/stitch_plan/lock_stitch.py
+++ b/lib/stitch_plan/lock_stitch.py
@@ -11,13 +11,14 @@ from .stitch import Stitch
class LockStitchDefinition:
- def __init__(self, lock_id=None, name=None, path=None):
+ def __init__(self, lock_id=None, name=None, path=None, preview_image=None):
self.id: str = lock_id
self.name: str = name
self._path: str = path
+ self.preview_image: str = None
def __repr__(self):
- return "LockStitchDefinition(%s, %s, %s)" % (self.id, self.name, self.path)
+ return "LockStitchDefinition(%s, %s, %s, %s)" % (self.id, self.name, self._path, self.preview_image)
def stitches(self):
raise NotImplementedError(f"{self.__class__.__name__} must implement stitches()")
diff --git a/lib/tiles.py b/lib/tiles.py
index 683804a6..686d5a6d 100644
--- a/lib/tiles.py
+++ b/lib/tiles.py
@@ -21,6 +21,7 @@ class Tile:
def _load_tile(self, tile_path):
self.tile_svg = inkex.load_svg(os.path.join(tile_path, "tile.svg"))
+ self.preview_image = self._load_preview(tile_path)
self._load_metadata(tile_path)
self.tile = None
self.width = None
@@ -32,10 +33,16 @@ class Tile:
return self.name < other.name
def __repr__(self):
- return f"Tile({self.name}, {self.id})"
+ return f"Tile({self.name}, {self.id}, {self.preview_image})"
__str__ = __repr__
+ def _load_preview(self, tile_path):
+ image_path = os.path.join(tile_path, "preview.png")
+ if os.path.isfile(image_path):
+ return image_path
+ return None
+
def _load_metadata(self, tile_path):
with open(os.path.join(tile_path, "tile.json"), "rb") as tile_json:
tile_metadata = json.load(tile_json)
diff --git a/lib/utils/param.py b/lib/utils/param.py
index c7dfdab0..19a369e1 100644
--- a/lib/utils/param.py
+++ b/lib/utils/param.py
@@ -1,8 +1,9 @@
class ParamOption:
- def __init__(self, param_id=None, name=None, legacy=None):
+ def __init__(self, param_id=None, name=None, legacy=None, preview_image=None):
self.id: str = param_id
self.name: str = name
self.legacy: int = legacy
+ self.preview_image: str = None
def __repr__(self):
- return "ParamOption(%s, %s, %s)" % (self.id, self.name, self.legacy)
+ return "ParamOption(%s, %s, %s, %s)" % (self.id, self.name, self.legacy, self.preview_image)
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 03:57:19 +0000