[Gzz-commits] fenfire/org/fenfire demo/fenpdfcontext.py modul...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/14 03:32:55

Modified files:
        org/fenfire/demo: fenpdfcontext.py 
        org/fenfire/modules/pp: PPActionsImpl.java 
        org/fenfire/view: PageSpanLayout.java 
        org/fenfire/view/buoy: AbstractMainNode2D.java 

Log message:
        Naming again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.41&tr2=1.42&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.32 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.33
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.32      Thu Aug 14 01:38:07 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Thu Aug 14 03:32:55 2003
@@ -213,11 +213,18 @@
 
     class Transclude(Action):
        def run(self):
-           node = self.states.selection.getMainNode()
+           pdfMainNode = self.states.selection.getMainNode()
            area = self.states.selection.getArea()
            obj = node.getView2D().getSelectedObject(
                    node.getPlane(), *area)
            print "Transclude selected: ",node.getPlane(), area, obj
+           canvasMainNode = self.states.buoymanager.getLastMain()
+           plane = Nodes.toString(canvasMainNode.getPlane())
+           # Check (this method is only in PPActionsImpl XXX)
+           if not self.states.ppActions.isPaper(plane):
+               print "NOT A CANVAS!"
+           
+
 
     def __init__(self, states):
         self.states = states
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.34 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.35
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.34      Wed Aug 13 
09:29:16 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Thu Aug 14 03:32:55 2003
@@ -46,7 +46,7 @@
  *  UnicastRemoteObject' for now. -benja
  */
 public class PPActionsImpl /*extends UnicastRemoteObject*/ implements 
PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.34 2003/08/13 
13:29:16 tjl Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.35 2003/08/14 
07:32:55 tjl Exp $";
     public static boolean dbg = false;
     protected static void p(String s) { System.out.println("PPActionsImpl: 
"+s); }
 
@@ -65,6 +65,11 @@
        setFen(fen);
     }
 
+    // --- Utilities
+    public boolean isPaper(String paperURI) {
+       return RDFUtil.isNodeType(fen.graph, Nodes.get(paperURI), 
+                                   CANVAS2D.Canvas);
+    }
 
 
     // --- implement PPActions
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.22 
fenfire/org/fenfire/view/PageSpanLayout.java:1.23
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.22   Thu Aug 14 02:34:41 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java        Thu Aug 14 03:32:55 2003
@@ -217,7 +217,8 @@
     /** Place this layout strictly fitted into the given
      * box.
      * Note that this won't interpolate nicely to
-     * "place".
+     * this layout placed with the
+     * "place" method.
      */
     public void placeBoxed(VobScene vs, int into) {
        int unit = vs.unitSqCS(into, "PSPCV.UNIT");
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.41 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.42
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.41  Wed Aug 13 
04:47:44 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Thu Aug 14 
03:32:55 2003
@@ -168,6 +168,8 @@
        }
     }
 
+    /** Get the xy coordinates in the view2D coordinate system
+     */
     public float[] getXYHit(VobScene oldVobScene, float x, float y) {
        float[] pt = new float[] { x, y, 0 };
        if (dbg) p("P1: "+pt[0]+" "+pt[1]+" "+pt[2]);