de-circularized imports

samizdatco · samizdatco · commit 67f1b1371ef6 · 2014-11-15T15:53:51.000-05:00
diff --git a/plotdevice/gfx/atoms.py b/plotdevice/gfx/atoms.py
@@ -9,6 +9,7 @@
 from ..util import _copy_attrs, _copy_attr, _flatten, trim_zeroes, numlike
 from .colors import Color
 from .geometry import Transform, Dimension, Region, Pair
+from .effects import Effect
 
 _ctx = None
 __all__ = [
@@ -112,7 +113,6 @@ class EffectsMixin(Grob):
     opts = ('alpha','blend','shadow')
 
     def __init__(self, **kwargs):
-        from .effects import Effect
         super(EffectsMixin, self).__init__(**kwargs)
         for attr in EffectsMixin.opts:
             if attr in kwargs:
diff --git a/plotdevice/gfx/effects.py b/plotdevice/gfx/effects.py
@@ -8,7 +8,6 @@
 from ..util import _copy_attr, _copy_attrs, numlike
 from .colors import Color
 from .geometry import Point
-from .image import ciFilter
 from . import _cg_context, _cg_layer, _cg_port
 
 _ctx = None
@@ -344,3 +343,48 @@ def applied(self):
 
 class ClippingPath(Stencil):
     pass # NodeBox compat...
+
+
+### core-image filters for channel separation and inversion ###
+
+def ciFilter(opt, img):
+    _filt = _inversionFilter if isinstance(opt, bool) else _channelFilter
+    return _filt(opt, img)
+
+def _channelFilter(channel, img):
+    """Generate a greyscale image by isolating a single r/g/b/a channel"""
+
+    rgb = ('red', 'green', 'blue')
+    if channel=='alpha':
+        transmat = [(0, 0, 0, 1)] * 3
+        transmat += [ (0,0,0,0), (0,0,0,1) ]
+    elif channel in rgb:
+        rgb_row = [0,0,0]
+        rgb_row.insert(rgb.index(channel), 1.0)
+        transmat = [tuple(rgb_row)] * 3
+        transmat += [ (0,0,0,0), (0,0,0,1) ]
+    elif channel in ('black', 'white'):
+        transmat = [(.333, .333, .333, 0)] * 3
+        transmat += [ (0,0,0,0), (0,0,0,1) ]
+    return _matrixFilter(transmat, img)
+
+def _inversionFilter(identity, img):
+    """Conditionally turn black to white and up to down"""
+
+    # set up a matrix that's either identity or an r/g/b inversion
+    polarity = -1.0 if not identity else 1.0
+    bias = 0 if polarity>0 else 1
+    transmat = [(polarity, 0, 0, 0), (0, polarity, 0, 0), (0, 0, polarity, 0),
+                (0, 0, 0, 0), (bias, bias, bias, 1)]
+    return _matrixFilter(transmat, img)
+
+def _matrixFilter(matrix, img):
+    """Apply a color transform to a CIImage and return the filtered result"""
+
+    vectors = ("inputRVector", "inputGVector", "inputBVector", "inputAVector", "inputBiasVector")
+    opts = {k:CIVector.vectorWithX_Y_Z_W_(*v) for k,v in zip(vectors, matrix)}
+    opts[kCIInputImageKey] = img
+    remap = CIFilter.filterWithName_("CIColorMatrix")
+    for k,v in opts.items():
+        remap.setValue_forKey_(v, k)
+    return remap.valueForKey_("outputImage")
diff --git a/plotdevice/gfx/image.py b/plotdevice/gfx/image.py
@@ -247,50 +247,6 @@ def _draw(self):
                 # NB: the nodebox source warns about quartz bugs triggered by drawing
                 # EPSs to other origin points. no clue whether this still applies...
 
-### core-image filters for channel separation and inversion ###
-
-def ciFilter(opt, img):
-    _filt = _inversionFilter if isinstance(opt, bool) else _channelFilter
-    return _filt(opt, img)
-
-def _channelFilter(channel, img):
-    """Generate a greyscale image by isolating a single r/g/b/a channel"""
-
-    rgb = ('red', 'green', 'blue')
-    if channel=='alpha':
-        transmat = [(0, 0, 0, 1)] * 3
-        transmat += [ (0,0,0,0), (0,0,0,1) ]
-    elif channel in rgb:
-        rgb_row = [0,0,0]
-        rgb_row.insert(rgb.index(channel), 1.0)
-        transmat = [tuple(rgb_row)] * 3
-        transmat += [ (0,0,0,0), (0,0,0,1) ]
-    elif channel in ('black', 'white'):
-        transmat = [(.333, .333, .333, 0)] * 3
-        transmat += [ (0,0,0,0), (0,0,0,1) ]
-    return _matrixFilter(transmat, img)
-
-def _inversionFilter(identity, img):
-    """Conditionally turn black to white and up to down"""
-
-    # set up a matrix that's either identity or an r/g/b inversion
-    polarity = -1.0 if not identity else 1.0
-    bias = 0 if polarity>0 else 1
-    transmat = [(polarity, 0, 0, 0), (0, polarity, 0, 0), (0, 0, polarity, 0),
-                (0, 0, 0, 0), (bias, bias, bias, 1)]
-    return _matrixFilter(transmat, img)
-
-def _matrixFilter(matrix, img):
-    """Apply a color transform to a CIImage and return the filtered result"""
-
-    vectors = ("inputRVector", "inputGVector", "inputBVector", "inputAVector", "inputBiasVector")
-    opts = {k:CIVector.vectorWithX_Y_Z_W_(*v) for k,v in zip(vectors, matrix)}
-    opts[kCIInputImageKey] = img
-    remap = CIFilter.filterWithName_("CIColorMatrix")
-    for k,v in opts.items():
-        remap.setValue_forKey_(v, k)
-    return remap.valueForKey_("outputImage")
-
 
 ### context manager for calls to `with export(...)` ###
 
