cortesi/scurve
1
Fork 0
mirror of https://github.com/cortesi/scurve.git synced 2025-06-18 16:55:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a factory method for creating curves through the common fromSize interface.

Browse Source
This commit is contained in:
Aldo Cortesi 2010-01-07 15:12:12 +13:00
parent 0def355ae0
commit 6c7287b77c
5 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
colorswatch
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python
import os.path, math
from scurve import hilbert, progress, zigzag, zorder, natural
import scurve
from scurve import progress
import Image, ImageDraw
def sortedPixels(csource, img, quiet):
@ -67,28 +68,8 @@ def main():
if len(args) != 2:
parser.error("Please specify output file.")
if options.colorsource == "hilbert":
csource = hilbert.Hilbert.fromSize(3, 256**3)
elif options.colorsource == "zigzag":
csource = zigzag.ZigZag.fromSize(3, 256**3)
elif options.colorsource == "zorder":
csource = zorder.ZOrder.fromSize(3, 256**3)
elif options.colorsource == "natural":
csource = natural.Natural.fromSize(3, 256**3)
else:
parser.error("Unknown color source.")
if options.map == "hilbert":
map = hilbert.Hilbert.fromSize(2, options.size*options.size)
elif options.map == "zigzag":
map = zigzag.ZigZag.fromSize(2, options.size*options.size)
elif options.map == "zorder":
map = zorder.ZOrder.fromSize(2, options.size*options.size)
elif options.map == "natural":
map = natural.Natural.fromSize(2, options.size*options.size)
else:
parser.error("Unknown map.")
csource = scurve.fromSize(options.colorsource, 3, 256**3)
map = scurve.fromSize(options.map, 2, options.size**2)
p = sortedPixels(csource, args[0], options.quiet)
drawmap(map, p, args[1], options.quiet)

18
scurve/__init__.py
View File

@ -0,0 +1,18 @@
import hilbert, zigzag, zorder, natural
curveMap = {
"hilbert": hilbert.Hilbert,
"zigzag": zigzag.ZigZag,
"zorder": zorder.ZOrder,
"natural": natural.Natural,
}
curves = curveMap.keys()
def fromSize(curve, dimension, size):
"""
A convenience function for creating a specified curve by specifying
size and dimension. All curves implement this common interface.
"""
return curveMap[curve].fromSize(dimension, size)

2
scurve/natural.py
View File

@ -10,7 +10,7 @@ class Natural:
dimension: Number of dimensions
size: The size in each dimension
"""
self.dimension, self.size = dimension, size
self.dimension, self.size = int(dimension), int(size)
@classmethod
def fromSize(self, dimension, size):

2
scurve/zigzag.py
View File

@ -11,7 +11,7 @@ class ZigZag:
dimension: Number of dimensions
size: The size in each dimension
"""
self.dimension, self.size = dimension, size
self.dimension, self.size = int(dimension), int(size)
@classmethod
def fromSize(self, dimension, size):

25
testpattern
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python
import os.path, math
from scurve import hilbert, progress, zigzag, zorder
import scurve
from scurve import progress
import Image, ImageDraw
@ -46,27 +47,9 @@ def main():
if len(args) != 1:
parser.error("Please specify output file.")
if options.colorsource == "hilbert":
csource = hilbert.Hilbert.fromSize(3, 256**3)
elif options.colorsource == "zigzag":
csource = zigzag.ZigZag.fromSize(3, 256**3)
elif options.colorsource == "zorder":
csource = zorder.ZOrder.fromSize(3, 256**3)
else:
parser.error("Unknown color source.")
if options.map == "hilbert":
map = hilbert.Hilbert.fromSize(2, options.size*options.size)
elif options.map == "zigzag":
map = zigzag.ZigZag.fromSize(2, options.size*options.size)
elif options.map == "zorder":
map = zorder.ZOrder.fromSize(2, options.size*options.size)
else:
parser.error("Unknown map.")
csource = scurve.fromSize(options.colorsource, 3, 256**3)
map = scurve.fromSize(options.map, 2, options.size**2)
drawmap(map, csource, args[0], options.quiet)
main()