[ff-cvs] libvob/vob color/spaces.py demo/lava/color.py u...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/09/01 10:03:36

Modified files:
        vob/color      : spaces.py 
        vob/demo/lava  : color.py 
        vob/usertest   : fillet2.py 
Added files:
        vob/usertest   : color3.py 

Log message:
        start another color test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/color/spaces.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/lava/color.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/usertest/color3.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/usertest/fillet2.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/vob/color/spaces.py
diff -u libvob/vob/color/spaces.py:1.1 libvob/vob/color/spaces.py:1.2
--- libvob/vob/color/spaces.py:1.1      Thu Apr 10 10:00:18 2003
+++ libvob/vob/color/spaces.py  Mon Sep  1 10:03:36 2003
@@ -153,7 +153,7 @@
 Wg = 0.715160
 Wb = 0.072169
 
-Wr,Wg,Wb = 0.3, 0.59, 0.11
+#Wr,Wg,Wb = 0.3, 0.59, 0.11
 
 # Gamma correction used with the perceptual non-linearity in YtoL and LtoY
 # conversion functions.
Index: libvob/vob/demo/lava/color.py
diff -u libvob/vob/demo/lava/color.py:1.2 libvob/vob/demo/lava/color.py:1.3
--- libvob/vob/demo/lava/color.py:1.2   Mon Sep  1 09:11:17 2003
+++ libvob/vob/demo/lava/color.py       Mon Sep  1 10:03:36 2003
@@ -58,7 +58,7 @@
 
 
 def getcol(l, x, y):
-    col = YSTtoRGB( (.4, .44 * x, .44 * y) )
+    col = YSTtoRGB( (l,  x, y) )
     col = map(lambda x: x**(1./gamma), col)
 
     return col
@@ -89,7 +89,7 @@
             x = math.cos(a)
             y = math.sin(a)
 
-            col = getcol(.4, .44 * x, .44 * y)
+            col = getcol(.4, .41 * x, .41 * y)
 
             for i in range(0,3):
                 if col[i] < min[i]: min[i] = col[i]
Index: libvob/vob/usertest/fillet2.py
diff -u libvob/vob/usertest/fillet2.py:1.2 libvob/vob/usertest/fillet2.py:1.3
--- libvob/vob/usertest/fillet2.py:1.2  Wed Aug 27 08:38:33 2003
+++ libvob/vob/usertest/fillet2.py      Mon Sep  1 10:03:36 2003
@@ -93,18 +93,18 @@
 
        timeScrub()
 
-       renderOnly(vs1)
+       #renderOnly(vs1)
 
         warn = ""
-        t1 = java.lang.System.currentTimeMillis()
-        t = 1500 - (t1 - t0)
-        if t > 0:
-            Thread.sleep(t)
-        else:
-            warn += "A%d" % (-t,)
-            print "Warning: did not get any sleep"
+        #t1 = java.lang.System.currentTimeMillis()
+        #t = 1500 - (t1 - t0)
+        #if t > 0:
+        #    Thread.sleep(t)
+        #else:
+        #    warn += "A%d" % (-t,)
+        #    print "Warning: did not get any sleep"
 
-        swapBuffers()
+        #swapBuffers()
 
         t0 = java.lang.System.currentTimeMillis()
         renderOnly(vs2)
@@ -117,8 +117,10 @@
             print "Warning: did not get any sleep"
 
         swapBuffers()
-       (key, msec) = waitkey()
+        Thread.sleep(200)
+        
        render(vs0)
+       (key, msec) = waitkey()
         t0 = java.lang.System.currentTimeMillis()
 
         if key == "Print":