Changeset 23

Timestamp:

09/24/07 15:52:23 (1 year ago)

Author:

steve

Message:

Will not die if opening a non-image.
Q now exits.
New baseline imaegs which work.
New baseline image selection.
Clustering code.

Files:

• baseline/b1.jpg (modified) (previous)
• baseline/b2.jpg (modified) (previous)
• baseline/b3.jpg (added)
• baseline/b4.jpg (added)
• baseline/b5.jpg (added)
• baseline/b6.jpg (added)
• baseline/b7.jpg (added)
• config.py (modified) (1 diff)
• mactorii.py (modified) (9 diffs)
• wavelet.py (modified) (1 diff)

config.py

@@ -20 +20 @@
-trash_dir = ".mactorii-trash"
-text_yoffset = 3
-
+
+
-
-def main():

mactorii.py

@@ -28 +28 @@
-win = None
-images = dict()
+baselines = []
+
-renderables = None
-
-yoffset = 0
-xoffset = 0
+xmotion = 0
+
-rows = 1
-
+
-        
-clickx = 0
@@ -93 +97 @@
-        global last_deleted
-        global fps_display
-
+
-        if symbol == key.LEFT:
-                xmotion = 10
@@ -123 +127 @@
-                else:
-                        fps_display = clock.ClockDisplay()              
+                        
+        if symbol == key.C:
+                cluster_renderables()
+                
+        if symbol == key.Q:
+                exit(0)
+                
-def strip_width():
-        """returns the width of the strip in pixels"""
@@ -133 +144 @@
-        global xoffset
-        global rows
-
+
+
-        p = xoffset/strip_width()
-        
-        rows = int(height/config.crop_size) 
+        cols = math.floor(len(files)/rows)+1
-        
-        yoffset = (height - rows * config.crop_size)/2
@@ -143 +156 @@
-        # compute the new xoffset
-        xoffset = p * strip_width()
+
+def signature_compare(sig1, sig2):
+        score=[]
+        for b in xrange(3):
+                score.append(config.weights[b]*len(sig1[b].intersection(sig2[b])))
+                
+        return sum(score)
+        
+def cluster_func(item):
+        global cols
+        global rows
+        
+        item_sig = item[1][2]
+        
+        mul = 113
+        score = 0
+        for sig in baselines:
+                score += signature_compare(sig, item_sig)
+                score*=mul
+                
+        return score
+        
+def cluster_renderables():
+        """cluster renderables by their score against the 2 base lines"""
+        global images
+        global renderables
+        
+        renderables = images.items()
+        
+        # sort the renderables
+        renderables.sort(key=cluster_func)
+        
+        #for i, r in enumerate(renderables):
+                
-        
-def update_renderables():
@@ -153 +200 @@
-        if selected != None:
-                renderables.sort(key=sort_func)
-
-
-
+
-def sort_func(item):
-        assert selected != None
@@ -162 +207 @@
-        item_sig = item[1][2]
-        
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-def load_file(file):
-        """loads the files given in the command line"""
@@ -252 +303 @@
-        global yoffset
-        global rows
+        global cols
-        global files
-        global win
@@ -264 +316 @@
-        global fps_display
-        
+        for baseline in config.baselines:
+                load_baseline(baseline)
+                
-        files = sys.argv[1:]
-        for file in files:
-                load_file(file)
-        
-
+
+
-        win = window_setup()
-        ft = font_setup()
+        trash_setup()   
-        
-        assert win != None
-        assert ft != None
-        
-        trash_setup()
-        
-        image_pattern = pyglet_image.SolidColorImagePattern((0,0,0,1))
-        
-        clock.set_fps_limit(30)
-        
-        renderables = update_renderables()
-        
-        while not win.has_exit:

wavelet.py

@@ -82 +82 @@
-                        # sort the values to determine upper and lower cut offs for significance
-                        tmp.sort()
-
-
+
+
+
+
+
+
+
-                
-                        # keep up to config.taps number of significant values, storing only their