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

[Tuomas J. Lukka]

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

Modified files:
        org/fenfire/demo: fenpdfcontext.py 
        org/fenfire/view/buoy: AbstractMainNode2D.java 

Log message:
        TRANSCLUDING WORKS

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.34 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.35
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.34      Thu Aug 14 03:35:06 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Thu Aug 14 03:45:38 2003
@@ -208,15 +208,23 @@
        def run(self):
            pdfMainNode = self.states.selection.getMainNode()
            area = self.states.selection.getArea()
-           obj = node.getView2D().getSelectedObject(
-                   node.getPlane(), *area)
-           print "Transclude selected: ",node.getPlane(), area, obj
+           obj = pdfMainNode.getView2D().getSelectedObject(
+                   pdfMainNode.getPlane(), *area)
+           print "Transclude selected: ",pdfMainNode.getPlane(), area, obj
+           if obj == None:
+               print "Null??"
+               return
            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!"
-           
+           # XXX Use oldvs to get location where mouse was clicked
+           focus = canvasMainNode.getFocus()
+           node = Nodes.get(self.states.ppActions.newNote(plane,
+                               focus.getPanX(), focus.getPanY(), ""))
+           self.states.fen.txt.set(node, obj)
+                   
 
 
     def __init__(self, states):
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.42 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.43
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.42  Thu Aug 14 
03:32:55 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Thu Aug 14 
03:45:39 2003
@@ -168,7 +168,8 @@
        }
     }
 
-    /** Get the xy coordinates in the view2D coordinate system
+    /** Get the xy coordinates in the view2D coordinate system.
+     * Does not check if it was really a hit.
      */
     public float[] getXYHit(VobScene oldVobScene, float x, float y) {
        float[] pt = new float[] { x, y, 0 };