[Gzz-commits] gzz/gzz/modules/pp PPView2.java vob/VobCSGenera...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/29 13:49:01

Modified files:
        gzz/modules/pp : PPView2.java 
        gzz/modules/pp/vob: VobCSGenerator.java 

Log message:
        removed some crap.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/VobCSGenerator.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.20 
gzz/gzz/modules/pp/PPView2.java:1.21
--- gzz/gzz/modules/pp/PPView2.java:1.20        Fri Nov 29 13:31:04 2002
+++ gzz/gzz/modules/pp/PPView2.java     Fri Nov 29 13:49:01 2002
@@ -435,12 +435,10 @@
                    fr = vs.orthoBoxCS(ctr, "frame", 10, 
                                       -leftPanelRealWidth/2, 
-leftPanelRealHeight/2,
                                       1, 1, leftPanelRealWidth, 
leftPanelRealHeight);
-                   pa("y:"+ y +" x: "+ x);
                }
                else {
                    ctr = cs_gen.getNextCS(0);
                    fr = cs_gen.getNextCS(1);
-                   pa("ctr: "+ ctr +" fr: "+fr);
                }
 
                vs.matcher.add(ctr, new Pair(p, null));
Index: gzz/gzz/modules/pp/vob/VobCSGenerator.java
diff -u gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.1 
gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.2
--- gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.1      Fri Nov 29 13:31:04 2002
+++ gzz/gzz/modules/pp/vob/VobCSGenerator.java  Fri Nov 29 13:49:01 2002
@@ -37,21 +37,13 @@
        float [] trans = new float[6];
 
        glc.transformPoints3(cs_into, coords, trans);
-       for (int i=0; i<trans.length; i++) {
-           pa("foo: "+trans[i]);
-           //pa("c1 "+ i +": ("+points[i].x + "; "+ points[i].y+")");
-       }
-
        float x_diff = trans[3] - trans[0]; 
        float y_diff = trans[4] - trans[1];
 
-
        final int fake_count = 2 + vob_count;
        final int fake_focus = focus_index + 2;
 
-
        float [] rations = new float[vob_count];
-
        float[] sigs = countSigmund(fake_focus);
        for (int i=focus_index; i>=0; i--) {
            rations[i] = sigs[focus_index-i];
@@ -94,15 +86,16 @@
            vob_cs[i][0] = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
                                                                    x_center, 
y_tmp + muutos/2,  
                                                                    1, 0, 0, 1);
-           pa("xy: ("+x_center+":"+(y_tmp+ muutos/2)+")");
-           float vob_width2 = y_d;
+           //float vob_width2 = y_d;
            vob_cs[i][1] = vs.orthoBoxCS(vob_cs[i][0], "frame", 10, 
-                                        -vob_width2/2, -y_d/2,
-                                        1, 1, vob_width2, y_d);
+                                        -vob_width/2, -y_d/2,
+                                        1, 1, vob_width, y_d);
 
-           if (i == focus_index) pa("y_tmp: "+ y_tmp +" y_cent: " 
+(y-muutos/2) +
-                                    " y: "+y +" koko: "+(y-y_tmp)+ " FOCUS");
-           else pa("y_tmp: "+ y_tmp +" y_cent: " +(y-muutos/2) +" y: "+y +" 
koko: "+(y-y_tmp));
+           if (dbg) {
+               if (i == focus_index) pa("y_tmp: "+ y_tmp +" y_cent: " 
+(y-muutos/2) +
+                                        " y: "+y +" koko: "+(y-y_tmp)+ " 
FOCUS");
+               else pa("y_tmp: "+ y_tmp +" y_cent: " +(y-muutos/2) +" y: "+y 
+" koko: "+(y-y_tmp));
+           }
            
            y_tmp = y;
        }
@@ -132,7 +125,7 @@
        float I = 10.0f;
        float sigm = I*(float)Math.PI;
        float start = 3.0f*(float)Math.PI;
-       pa("ratio: " + ratio);
+
        if (ratio < 5) start = 6.5f*(float)Math.PI;
        else if (ratio < 10) start = 5.0f*(float) Math.PI;
        if (ratio > 50) start = 1.2f*(float)Math.PI;
@@ -142,7 +135,7 @@
        for (int i=0; i<ratio; i++) {
            retArray[i] = (float)  (1/(1+Math.exp(-(start - i*dx))));
 
-           pa(i+"Sigm:" +retArray[i]);
+           if (dbg) pa(i+"Sigm:" +retArray[i]);
        }
        return retArray;
     }
@@ -159,25 +152,13 @@
 
        if (dbg) pa("ideal: "+ ideal_ratio + " this ratio: "+ (sum/arr[focus]) 
);
 
-       // normally just 
+       // normally just make things smaller
        if (ideal_ratio < (sum/arr[focus]) ) {
            for (int i=0; i<arr.length; i++) {
                if (arr[i] == 1.0f) continue;
                arr[i] *= 0.9f;
            }
            if (dbg) pa("smaller recursive");
-           proportion(arr, focus, ideal_ratio); 
-           return;
-       }
-       else if (ideal_ratio - 0.2 > (sum/arr[focus]) ) {
-           for (int i=0; i<arr.length; i++) {
-               if (arr[i] == 1.0f) continue;
-
-               if (arr[i] > 1) arr[i] *= 1.3;
-               else arr [i] = 2 - arr[i];
-               //arr[i] *= 1.3;
-           }
-           if (dbg) pa("bigger recursive");
            proportion(arr, focus, ideal_ratio); 
            return;
        }