[Gzz-commits] gzz gzz/vob/CalendarVob.java gfx/demo/calendarv...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/10/30 10:07:03

Modified files:
        gzz/vob        : CalendarVob.java 
        gfx/demo       : calendarvobtest.py 

Log message:
        good test - waiting tomorrow and font scaleing.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/CalendarVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/calendarvobtest.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/calendarvobtest.py
diff -u gzz/gfx/demo/calendarvobtest.py:1.3 gzz/gfx/demo/calendarvobtest.py:1.4
--- gzz/gfx/demo/calendarvobtest.py:1.3 Wed Oct 30 09:09:32 2002
+++ gzz/gfx/demo/calendarvobtest.py     Wed Oct 30 10:07:03 2002
@@ -7,9 +7,9 @@
 
 class ViewScene:
     def __init__(self):
-        self.scale = 1;
-        self.ty = 1;
-        self.tx = 1;
+        self.scale = 0.10;
+        self.ty = -3000;
+        self.tx = 50;
 
     def scene(self, vs):
         size = vs.getSize()
@@ -18,30 +18,33 @@
        self.bgcolor = (0.6, 0.7, 0.8)
         putnoc(vs, background(self.bgcolor))
 
-        #for i in range(1, 12):
-        #    cs_cal = vs.coords.affineCoordsys(0, 0, w/2 - ((w/3 + self.tx)  * 
(self.scale -1) ) ,
-        #                                      ((h/6) *i) - ((h/3.5 + self.ty) 
*(self.scale-1)),
-        #                                      w/7*0.2* self.scale, 0, 0, 
((h/12)/5) * self.scale)
-            #print 'w: ', w,' h: ', h 
-
-        #    vs.matcher.add(cs_cal, "cs_cal")
-        #    gzz.vob.CalendarVob.setStatics(style_date, style_n, 5)
-        #    gzz.vob.CalendarVob.setBounds(0.7, 0.5, 1.0)
-        #    vs.map.put(gzz.vob.CalendarVob(2002, i), cs_cal)
-
-        cs_cal = vs.coords.affineCoordsys(0, 0, w/2 - ((w/3 + self.tx)  * 
(self.scale -1) ) ,
-                                          h/2 - ((h/3.5 + self.ty) 
*(self.scale-1)),
-                                          w/6 * self.scale, 0, 0, h/5 * 
self.scale)
-        print 'w: ', w,' h: ', h 
-            
-        vs.matcher.add(cs_cal, "cs_cal")
+        cs_home = vs.coords.affineCoordsys(0,0,
+                                        w/2 + self.tx*self.scale,
+                                        h/2 + self.ty*self.scale,
+                                        w*self.scale, 0,0, h*self.scale);
+        vs.matcher.add(cs_home, "cs_koti")
 
         # these don't efect
-        gzz.vob.CalendarVob.setStatics(style_date, style_n, 5)
+        gzz.vob.CalendarVob.setStatics(style_date, style_n, 3)
 
         # week number width, weekday height, month name height
         gzz.vob.CalendarVob.setBounds(0.9, 1.1, 0.8)
-        vs.map.put(gzz.vob.CalendarVob(2002, 12), cs_cal)
+
+        # annual calendar
+        for i in range(1, 13):
+            cs_cal = vs.coords.affineCoordsys(cs_home , 0, 0 , i*10,  1,0,0,1)
+            vs.matcher.add(cs_cal, "cs_cal"+str(i))
+            vs.map.put(gzz.vob.CalendarVob(2002, i), cs_cal)
+
+
+        # one test vob 
+        #cs_cal = vs.coords.affineCoordsys(0, 0, w/2 - ((w/3 + self.tx)  * 
(self.scale -1) ) ,
+        #                                  h/2 - ((h/3.5 + self.ty) 
*(self.scale-1)),
+        #                                  w/6 * self.scale, 0, 0, h/5 * 
self.scale)
+        #vs.matcher.add(cs_cal, "cs_cal")
+        #gzz.vob.CalendarVob.setBounds(0.9, 1.1, 0.8)
+        #vs.map.put(gzz.vob.CalendarVob(2002, 12), cs_cal)
+
 
 
         # help text
@@ -49,7 +52,8 @@
         tscale = min(size.width*1.0, size.height*4.0/3) / colchars
        cs1 = vs.coords.affineCoordsys(0, 10, 0, 0, tscale, 0, 0, tscale)
         vs.matcher.add(cs1, "1")
-        putText(vs, cs1, 'Use keys: +, -, Left, Right, Up and Down', 
color=(0,0,0), h=4, y = 2)
+        putText(vs, cs1, '  Use keys: +, -, Left, Right, Up, Down,', 
color=(0,0,0), h=4, y = 3)
+        putText(vs, cs1, '       PageUp, and PageDown', color=(0,0,0), h=4, y 
= 6)
 
         
     def key(self, k):
@@ -57,10 +61,11 @@
             self.scale *= 1.5
         if k == "-":
             self.scale *= 0.5
-        if k == "Up": self.ty -= 50 / self.scale
-        if k == "Down": self.ty += 50 / self.scale
-        if k == "Left": self.tx -= 50 / self.scale
-        if k == "Right": self.tx += 50 / self.scale
+        if k == "Up": self.ty += 50 / self.scale
+        if k == "Down": self.ty -= 50 / self.scale
+        if k == "Left": self.tx += 50 / self.scale
+        if k == "Next": self.ty -= 500 / self.scale
+        if k == "Prior": self.ty += 500 / self.scale
 
 
 
Index: gzz/gzz/vob/CalendarVob.java
diff -u gzz/gzz/vob/CalendarVob.java:1.3 gzz/gzz/vob/CalendarVob.java:1.4
--- gzz/gzz/vob/CalendarVob.java:1.3    Wed Oct 30 09:02:55 2002
+++ gzz/gzz/vob/CalendarVob.java        Wed Oct 30 10:07:03 2002
@@ -11,8 +11,8 @@
 import java.util.*;
 
 public class CalendarVob extends Vob {
-public static final String rcsid = "$Id: CalendarVob.java,v 1.3 2002/10/30 
14:02:55 mudyc Exp $";
-    public static boolean dbg = true; //false;
+public static final String rcsid = "$Id: CalendarVob.java,v 1.4 2002/10/30 
15:07:03 mudyc Exp $";
+    public static boolean dbg = false;
     static final void p(String s) { if(dbg) System.out.println(s); }
     static final void pa(String s) { System.out.println(s); }
 
@@ -72,9 +72,9 @@
        first_week_number = calendar.get(Calendar.WEEK_OF_YEAR);
 
        // print month
-       p("\n" + monthStr(calendar.get(Calendar.MONTH)) +
-         " " + (calendar.get(Calendar.MONTH)+1) +
-         "\n   ");
+       if (dbg) p("\n" + monthStr(calendar.get(Calendar.MONTH)) +
+                  " " + (calendar.get(Calendar.MONTH)+1) +
+                  "\n   ");
            
        // count empty day at the beginning of the month.
        if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
@@ -85,7 +85,7 @@
        }
 
        for (int i=0; i< empty_before_first_day; i++) {
-           System.out.print("    ");
+           if (dbg) System.out.print("      ");
        }
        
        // generate one month a day by day
@@ -99,8 +99,10 @@
                break; 
            }
 
-           System.out.print(dayStr(calendar.get(Calendar.DAY_OF_WEEK)) + " " + 
day+ ", " );
-           if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) p("");
+           if (dbg) {
+               System.out.print(dayStr(calendar.get(Calendar.DAY_OF_WEEK)) + " 
" + day+ ", " );
+               if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) 
p("");
+           }
        }
     }
 
@@ -131,8 +133,9 @@
        case 2: ret = "Maalis"; break;
        case 3: ret = "Huhti"; break;
        case 4: ret = "Touko"; break;
-       case 5: ret = "Kesä";  break;
-       case 6: ret = "Heinä"; break;
+       case 5: ret = "Kesa";  break;
+           //case 5: ret = "Kesä";  break;
+       case 6: ret = "Heina"; break;
        case 7: ret = "Elo"; break;
        case 8: ret = "Syys"; break;
        case 9: ret = "Loka"; break;