Border modifier is deprecated.

2 files changed, 78 insertions, 26 deletions

diff --git a/model_constraintpool.py b/model_constraintpool.py
index 2e0534a..e7e4e6d 100644
--- a/model_constraintpool.py
+++ b/model_constraintpool.py
@@ -35,6 +35,7 @@ class ConstraintPool(object):
     def __init__(self):
         self._overwrite = {}
         self._my_defaults()
+        self._depricated = ['border', ]
 
     @staticmethod
     def get_pool():
@@ -74,6 +75,7 @@ class ConstraintPool(object):
                 result = self._search_constraint(caller.base_cdef, attribute_key)
 #        print '>> cdef', primary_key, result
         if result is not None:
+            result = [x for x in result if x not in self._depricated]
             self._add_key(primary_key)
         return result
 
@@ -149,6 +151,7 @@ class ConstraintPool(object):
 #        self.set('*', 'modifiertypeconstraint', ['border', ])
 #        self.set('*', 'modifiertypeconstraint', ['rectangulartile', ])
 
+#        self.set('*', 'stamptypeconstraint', ['disk',])
 #        self.set('*', 'stamptypeconstraint', ['filledcyclic',])
 #        self.set('*', 'stamptypeconstraint', ['svg',])
 #        self.set('*', 'stamptypeconstraint', ['glyph',])
diff --git a/test_enumerator.py b/test_enumerator.py
index 2e6ca1d..1f41e15 100644
--- a/test_enumerator.py
+++ b/test_enumerator.py
@@ -26,6 +26,8 @@ import ka_extensionpoint
 import ep_merger_combine
 import model_protozoon
 import model_constraintpool
+import ka_task
+import time
 
 class VariantEnumerator(object):
     
@@ -36,59 +38,105 @@ class VariantEnumerator(object):
         model_random.set_flurry(9)
         cpool = model_constraintpool.ConstraintPool.get_pool()
  
+#        for layer_key in ka_factory.get_factory('layer').keys():
+#            for sampler_key in ka_factory.get_factory('sampler').keys():
+#                for stamp_key in ka_factory.get_factory('stamp').keys():
+#                    cpool.clear_all()
+#                    cpool.set('*', 'colorconstraint', ['colorconstraint_none', ])
+#                    cpool.set('*', 'layernumberofconstraint', [1, 3])
+#                    cpool.set('*', 'layertypeconstraint', [layer_key])
+#                    cpool.set('*', 'modifiertypeconstraint', ['border'])
+#                    cpool.set('*', 'stamptypeconstraint', [stamp_key])
+#                    cpool.set('*', 'samplertypeconstraint', [sampler_key])
+#                    cpool.set('*', 'operatorconstraint', [cairo.OPERATOR_OVER])
+#                    self._render_protozon(layer_key, 'border', sampler_key, stamp_key)
+
+        for layer_key in ka_factory.get_factory('layer').keys():
+            for sampler_key in ka_factory.get_factory('sampler').keys():
+                for stamp_key in ka_factory.get_factory('stamp').keys():
+                    cpool.clear_all()
+                    cpool.set('*', 'colorconstraint', ['colorconstraint_none', ])
+                    cpool.set('*', 'layernumberofconstraint', (1, 3))
+                    cpool.set('*', 'layertypeconstraint', [layer_key])
+                    cpool.set('*', 'modifiertypeconstraint', ['flip', 'mask', 'rectangulartile', ])
+                    cpool.set('*', 'stamptypeconstraint', [stamp_key])
+                    cpool.set('*', 'samplertypeconstraint', [sampler_key])
+                    cpool.set('*', 'operatorconstraint', [cairo.OPERATOR_OVER])
+                    self._render_protozon(layer_key, 'noborder', sampler_key, stamp_key)
+
         for layer_key in ka_factory.get_factory('layer').keys():
             for modifier_key in ka_factory.get_factory('modifier').keys():
-                cpool.clear_all()
-                cpool.set('*', 'colorconstraint', ['colorconstraint_none', ])
-                cpool.set('*', 'layernumberofconstraint', [1, 3])
-                cpool.set('*', 'layertypeconstraint',
-                                               ['letterpress', 'markovchain'])
-                cpool.set('*', 'layertypeconstraint', layer_key)
-                cpool.set('*', 'modifiertypeconstraint', modifier_key)
-                cpool.set('*', 'operatorconstraint', [cairo.OPERATOR_OVER])
-                self._explain_protozon(layer_key, modifier_key)
+                for stamp_key in ka_factory.get_factory('stamp').keys():
+                    cpool.clear_all()
+                    cpool.set('*', 'colorconstraint', ['colorconstraint_none', ])
+                    cpool.set('*', 'layernumberofconstraint', (1, 3))
+                    cpool.set('*', 'layertypeconstraint',
+                                                   ['letterpress', 'markovchain'])
+                    cpool.set('*', 'layertypeconstraint', [layer_key])
+                    cpool.set('*', 'modifiertypeconstraint', [modifier_key])
+                    cpool.set('*', 'stamptypeconstraint', [stamp_key])
+                    cpool.set('*', 'operatorconstraint', [cairo.OPERATOR_OVER])
+                    self._render_protozon(layer_key, modifier_key, stamp_key)
 
         for operator_key in ep_merger_combine.CombineMerger.OPERATORS:
             for merger_key in ka_factory.get_factory('merger').keys():
                 cpool.clear_all()
                 cpool.set('*', 'colorconstraint', ['colorconstraint_none', ])
-                cpool.set('*', 'layernumberofconstraint', [3, 3])
+                cpool.set('*', 'layernumberofconstraint', (3, 3))
                 cpool.set('*', 'layertypeconstraint',
                                                ['letterpress', 'markovchain'])
                 cpool.set('*', 'operatorconstraint', [operator_key])
-                cpool.set('*', 'mergertypeconstraint', merger_key)
-                self._explain_protozon(
+                cpool.set('*', 'mergertypeconstraint', [merger_key])
+                self._render_protozon(
                     ep_merger_combine.CombineMerger.OPERATOR_NAMES[operator_key], merger_key)
 
         for layer_key in ka_factory.get_factory('layer').keys():
             for merger_key in ka_factory.get_factory('merger').keys():
                 cpool.clear_all()
                 cpool.set('*', 'colorconstraint', ['colorconstraint_none', ])
-                cpool.set('*', 'layernumberofconstraint', [3, 2])
-                cpool.set('*', 'layertypeconstraint', layer_key)
-                cpool.set('*', 'mergertypeconstraint', merger_key)
+                cpool.set('*', 'layernumberofconstraint', (3, 2))
+                cpool.set('*', 'layertypeconstraint', [layer_key])
+                cpool.set('*', 'mergertypeconstraint', [merger_key])
                 cpool.set('*', 'operatorconstraint', [cairo.OPERATOR_OVER])
-                self._explain_protozon(layer_key, merger_key)
+                self._render_protozon(layer_key, merger_key)
 
-    def _explain_protozon(self, key1, key2):
+    def _explain_protozon(self, a_protozoon, formater):
+            class DummyTask:
+                def __init__(self):
+                    self.quit = False
+            a_protozoon.explain(DummyTask(), formater)
+            file_path = formater.get_absolutename('html')
+            formater.write_html_file(file_path)
+            return formater.get_pathname()
+
+    def _zoom_protozon(self, a_protozoon, width, height, path_name):
+        export_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+        ctx = cairo.Context(export_surface)
+        class DummyTask:
+            def __init__(self):
+                self.quit = False
+        a_protozoon.render(DummyTask(), ctx, width, height)
+        export_path = path_name + '/_' + str(width) + 'x' + str(height)
+        export_surface.write_to_png(export_path)
+
+    def _render_protozon(self, *keys):
         try:
+            base_name = 'index'
+            base_folder = '/dev/shm/'
+            explain_id = '_'.join(keys)
+
             a_protozoon = model_protozoon.Protozoon()
             a_protozoon.randomize()
     
-            base_name = 'index'
-            base_folder = '/dev/shm/'
-            explain_id = '_' + key1 + '_' + key2
             ep_list = ka_extensionpoint.list_extensions('formater')
             formater = ka_extensionpoint.create(ep_list[0],
                                                 base_name, 
                                                 explain_id,
                                                 base_folder)
-            class DummyTask:
-                def __init__(self):
-                    self.quit = False
-            a_protozoon.explain(DummyTask(), formater)
-            file_path = formater.get_absolutename('html')
-            formater.write_html_file(file_path)
+            path_name = self._explain_protozon(a_protozoon, formater)
+            self._zoom_protozon(a_protozoon, 100, 100, path_name)
+            self._zoom_protozon(a_protozoon, 800, 800, path_name)
+            
         except:
             self.exception_counter += 1
             ka_debug.err('failed rendering [%s] [%s] [%s]' % \
@@ -98,6 +146,7 @@ class VariantEnumerator(object):
 def explain():
     vae = VariantEnumerator()
     vae.explain_permutation()
+    time.sleep(10)
     return vae.exception_counter
 
 if __name__ == '__main__':