[Gzz-commits] fenfire/org/fenfire/modules/pp PPCanvasCursor.j...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/23 10:40:50

Modified files:
        org/fenfire/modules/pp: PPCanvasCursor.java Pp.java 

Log message:
        use buoyoing.py rules

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.20 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.21
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.20     Tue Apr 22 
08:14:32 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Wed Apr 23 10:40:50 2003
@@ -22,7 +22,7 @@
 /** PPCanvas which has been selected/created to be the focus one.
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.20 
2003/04/22 12:14:32 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.21 
2003/04/23 14:40:50 mudyc Exp $";  
     public static boolean dbg = false;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
@@ -257,11 +257,11 @@
            if (GraphicsAPI.getInstance() instanceof GLAPI) {
                
                // We must transform into Frame, and then the C2F coordinate 
system
-               int mainctrCS = 
((DefaultVobMatcher)oldVobScene.matcher).getCS(0, "FocusCtr");
+               int mainctrCS = 
((DefaultVobMatcher)oldVobScene.matcher).getCS(0, "FocusCenter");
                //pa("mainctr"+ mainctrCS);
                
-               //int frame = 
((DefaultVobMatcher)oldVobScene.matcher).getCS(mainctrCS, "MAINVP");
-               int frame = focusFrame;
+               int frame = 
((DefaultVobMatcher)oldVobScene.matcher).getCS(mainctrCS, "FocusFrame");
+               //int frame = focusFrame;
                int c2f = ((DefaultVobMatcher)oldVobScene.matcher).getCS(frame, 
"C2F");
                if (c2f < 0) c2f = c2fCS;
                if(frame < 0 || c2f < 0)
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.28 
fenfire/org/fenfire/modules/pp/Pp.java:1.29
--- fenfire/org/fenfire/modules/pp/Pp.java:1.28 Tue Apr 22 08:14:32 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Wed Apr 23 10:40:50 2003
@@ -28,7 +28,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.28 2003/04/22 12:14:32 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.29 2003/04/23 14:40:50 
mudyc Exp $";
     public static final boolean dbg = false;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -228,7 +228,7 @@
 
        int frameCS;
        if (GraphicsAPI.getInstance() instanceof GLAPI) {
-           int focusCtr = vs.translateCS(0, "FocusCtr", ctrX,ctrY);
+           int focusCtr = vs.translateCS(0, "FocusCenter", ctrX,ctrY);
            frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 200, 
                                    -width/2, -height/2, 1, 1, 
                                    width, height);