[Gzz-commits] gzz/gzz/modules/pp EventHandling.java PPMouseEv...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/01 05:33:28

Modified files:
        gzz/modules/pp : EventHandling.java PPMouseEvents.java 
                         PPView2.java demotest.py 
        gzz/modules/pp/vob: VobCSGenerator.java 

Log message:
        fix buoy drag

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/EventHandling.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/VobCSGenerator.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/EventHandling.java
diff -u gzz/gzz/modules/pp/EventHandling.java:1.7 
gzz/gzz/modules/pp/EventHandling.java:1.8
--- gzz/gzz/modules/pp/EventHandling.java:1.7   Mon Dec 30 08:49:48 2002
+++ gzz/gzz/modules/pp/EventHandling.java       Wed Jan  1 05:33:27 2003
@@ -35,6 +35,7 @@
  * STATE: PROTOTYPE
  */
 public class EventHandling {
+public static final String rcsid = "$Id: EventHandling.java,v 1.8 2003/01/01 
10:33:27 mudyc Exp $";
     public boolean dbg = false;
     private void pa(String s) { System.out.println(s); }
     
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.10 
gzz/gzz/modules/pp/PPMouseEvents.java:1.11
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.10  Mon Dec 23 11:10:40 2002
+++ gzz/gzz/modules/pp/PPMouseEvents.java       Wed Jan  1 05:33:27 2003
@@ -24,6 +24,7 @@
 /** Event handling, event objects.. 
  */
 public class PPMouseEvents {
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.11 2003/01/01 
10:33:27 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
 
@@ -58,6 +59,7 @@
        // Link paper
        EventHandling.i().assign("Link CLICK", new LinkPaper() );
        EventHandling.i().assign("Assoc link", new AssocLink() );
+       EventHandling.i().assign("Drag buoy", new BuoyDrag() );
        
        // Main paper
        EventHandling.i().assign("Click MAINVP", new SetCursorToMain() );
@@ -309,6 +311,20 @@
 
            ppv.setZoomPan(vs);
            
+           AbstractUpdateManager.setNoAnimation();
+           AbstractUpdateManager.chg();
+       }
+    }
+
+    public class BuoyDrag implements EventHandling.EventMouseObj {
+       public void event(MouseEvent ev, EventHandling.MousePressState p_state, 
Object[] obs) {
+           // set pan
+           context.setAccursed(context.getAccursed().h(ppv.d.contains));
+
+           ppv.panx = m_ev.last_panx - (ev.getX() - p_state.getX())/ppv.zoom;
+           ppv.pany = m_ev.last_pany - (ev.getY() - p_state.getY())/ppv.zoom;
+
+           ppv.setZoomPan(vs);
            AbstractUpdateManager.setNoAnimation();
            AbstractUpdateManager.chg();
        }
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.30 
gzz/gzz/modules/pp/PPView2.java:1.31
--- gzz/gzz/modules/pp/PPView2.java:1.30        Mon Dec 23 09:00:11 2002
+++ gzz/gzz/modules/pp/PPView2.java     Wed Jan  1 05:33:27 2003
@@ -36,6 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
+public static final String rcsid = "$Id: PPView2.java,v 1.31 2003/01/01 
10:33:27 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -293,6 +294,7 @@
            vs.activate(frameCS);
            ev_handler.onClick(frameCS, "Link CLICK",
                               new Object[]{ c, connectedFrom});
+           ev_handler.onDrag(frameCS, "Drag buoy");
 
            // XXX Pan
            int[] pan = getCoords(c);
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.33 gzz/gzz/modules/pp/demotest.py:1.34
--- gzz/gzz/modules/pp/demotest.py:1.33 Fri Dec 20 13:23:57 2002
+++ gzz/gzz/modules/pp/demotest.py      Wed Jan  1 05:33:27 2003
@@ -84,7 +84,7 @@
            self.vs.dump()
            print self.vs.matcher.interpList(self.vs.matcher)
         if key == "Ctrl-X":
-            print 'Saveing scene'
+            print 'Save...'
             # Next, the mediaserver we'll save to.
             ms = gzz.mediaserver.SimpleMediaserver(
                 gzz.mediaserver.storage.TransientStorer())
Index: gzz/gzz/modules/pp/vob/VobCSGenerator.java
diff -u gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.7 
gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.8
--- gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.7      Mon Dec 23 11:10:40 2002
+++ gzz/gzz/modules/pp/vob/VobCSGenerator.java  Wed Jan  1 05:33:28 2003
@@ -27,6 +27,7 @@
 import gzz.gfx.gl.*;
 
 public class VobCSGenerator {
+public static final String rcsid = "$Id: VobCSGenerator.java,v 1.8 2003/01/01 
10:33:28 mudyc Exp $";
     static public boolean dbg=false;
     static public void p(String s) { System.out.print(s); }
     static public void pa(String s) { System.out.println(s); }