Skip to content

Commit 4ac29c6

Browse files
committed
modified explorer to apply rotation then scale factors
1 parent 9fa0b77 commit 4ac29c6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

tiling-explorer.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ def _(mo):
2828
show_prototile = mo.ui.switch(value=False)
2929
show_reg_prototile = mo.ui.switch(value=False)
3030
tile_rotate = mo.ui.slider(start=0, stop=90, step=5, value=0)
31-
aspect = mo.ui.slider(start=1, stop=4, step=0.1, value=1)
31+
aspect = mo.ui.slider(start=0.3, stop=3, step=0.01, value=1)
3232
palette = mo.ui.dropdown(options=["Spectral", "tab10", "tab20"], value="Spectral")
3333

3434
mo.md("\n".join(["### General settings",
35-
f"#### Rotate tile unit by {tile_rotate}  Aspect ratio {aspect}",
35+
f"#### Rotate tile unit by {tile_rotate}  Width/height {aspect}",
3636
f"#### Tile inset {t_inset}  Prototile inset {p_inset}",
3737
f"#### Set radius {radius}  Show base tile {show_prototile}  Show repeat unit {show_reg_prototile} Palette {palette}"]))
3838
return (
@@ -90,8 +90,8 @@ def _(
9090
tile_rotate,
9191
):
9292
colourings = TileUnit(tiling_type=hex_or_square.value, n = n_cols.value) \
93-
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
9493
.transform_rotate(tile_rotate.value) \
94+
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
9595
.inset_tiles(t_inset.value) \
9696
.inset_prototile(p_inset.value)
9797
plot_tiles(colourings)
@@ -159,8 +159,8 @@ def _(
159159
):
160160
slices = TileUnit(tiling_type=hex_or_square_slice.value,
161161
n=n_slices.value, offset=offset_slices.value) \
162-
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
163162
.transform_rotate(tile_rotate.value) \
163+
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
164164
.inset_tiles(t_inset.value) \
165165
.inset_prototile(p_inset.value)
166166
plot_tiles(slices)
@@ -218,8 +218,8 @@ def _(
218218
):
219219
pieces = TileUnit(tiling_type="hex-dissection",
220220
n=n_pieces.value, offset=0 if dissection_offset.value else 1) \
221-
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
222221
.transform_rotate(tile_rotate.value) \
222+
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
223223
.inset_tiles(t_inset.value) \
224224
.inset_prototile(p_inset.value)
225225
plot_tiles(pieces)
@@ -275,8 +275,8 @@ def _(
275275
):
276276
laves_or_arch_tiles = TileUnit(tiling_type=laves_or_arch.value,
277277
code=tiling_code.value) \
278-
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
279278
.transform_rotate(tile_rotate.value) \
279+
.transform_scale(math.sqrt(aspect.value), 1/math.sqrt(aspect.value)) \
280280
.inset_tiles(t_inset.value) \
281281
.inset_prototile(p_inset.value)
282282
plot_tiles(laves_or_arch_tiles)

0 commit comments

Comments
 (0)